Merge branch 'main' of git3.nong12.com:cashierdesk/dili-cashier

huanggang
2 parents 05f0cda4 1c8a3651
Showing 7 changed files with 26 additions and 15 deletions
cashier-mall/src/main/java/com/diligrp/cashier/mall/api/RtMallOrderRefundApi.java
cashier-mall/src/main/java/com/diligrp/cashier/mall/api/RtMallScanOrderRefundApi.java
cashier-mall/src/main/java/com/diligrp/cashier/mall/dao/MallBizRefundDao.java
cashier-mall/src/main/java/com/diligrp/cashier/mall/service/biz/MallBizRefundService.java
cashier-mall/src/main/java/com/diligrp/cashier/mall/service/biz/impl/MallBizRefundServiceImpl.java
cashier-mall/src/main/java/com/diligrp/cashier/mall/service/sourcechannel/AbstractSourceChannel.java
cashier-mall/src/main/resources/com/diligrp/cashier/dao/mapper/MallBizRefundDao.xml
@@ -41,7 +41,12 @@ public class RtMallOrderRefundApi {
     @PostMapping("/refund/v1")
     @ParamLogPrint(outPrint = true)
     @Sign(sign = RtMallSign.class)
-    @RepeatSubmit(prefix = "refund:", value = {"#req['order_id']", "#req['trade_id']"}, duplicationSubmit = SpelDuplicationSubmit.class)
+    @RepeatSubmit(
+            prefix = "refund:",
+            waitTime = 5,
+            leaseTime = 10,
+            value = {"#req['order_id']", "#req['trade_id']"},
+            duplicationSubmit = SpelDuplicationSubmit.class)
     public RtMarkMessage<RefundSuccessVO> refund(@RequestBody Object req) {
         RefundCO refundCo = JsonUtils.convertValue(req, RefundCO.class);
         RtMallValidateUtils.valid(refundCo);
@@ -41,7 +41,12 @@ public class RtMallScanOrderRefundApi {
     @PostMapping("/refund/v1")
     @ParamLogPrint(outPrint = true)
     @Sign(sign = RtMallSign.class)
-    @RepeatSubmit(prefix = "refund:", value = {"#req['order_id']", "#req['trade_id']"}, duplicationSubmit = SpelDuplicationSubmit.class)
+    @RepeatSubmit(
+            prefix = "refund:",
+            waitTime = 5,
+            leaseTime = 10,
+            value = {"#req['order_id']", "#req['trade_id']"},
+            duplicationSubmit = SpelDuplicationSubmit.class)
     public RtMarkMessage<RefundSuccessVO> refund(@RequestBody Object req) {
         RefundCO refundCo = JsonUtils.convertValue(req, RefundCO.class);
         RtMallValidateUtils.valid(refundCo);
@@ -22,5 +22,5 @@ public interface MallBizRefundDao extends MybatisMapperSupport {
     MallBizRefund getByRefundTradeId(@Param("refundTradeId") String refundTradeId);
-    int countRefund(@Param("bizOrderId") Long bizOrderId);
+    long sumRefundFee(@Param("bizOrderId") Long bizOrderId);
 }
@@ -19,7 +19,7 @@ public interface MallBizRefundService {
     MallBizRefund getByRefundTradeId(String refundId);
-    int countRefund(Long bizOrderId);
+    long sumRefundFee(Long bizOrderId);
     void updateByPay(MallBizRefund mallBizRefund);
 }
@@ -63,10 +63,11 @@ public class MallBizRefundServiceImpl implements MallBizRefundService {
     @Override
     @Transactional(rollbackFor = {Exception.class})
     public RefundSuccessVO refund(RefundCO refundCo) {
-        MallBizRefund mallBizRefund = mallBizRefundDao.getMallBizRefund(new MallBizRefund(refundCo.getOrderId(), refundCo.getTradeId()));
-        if (Objects.nonNull(mallBizRefund)) {
-            throw new RtMartMallException(RtMarkErrorCode.E5006);
-        }
+        // 允许重复退款
+//        MallBizRefund mallBizRefund = mallBizRefundDao.getMallBizRefund(new MallBizRefund(refundCo.getOrderId(), refundCo.getTradeId()));
+//        if (Objects.nonNull(mallBizRefund)) {
+//            throw new RtMartMallException(RtMarkErrorCode.E5006);
+//        }
         MallBizOrder mallBizOrder = mallBizOrderDao.getByOrderId(refundCo.getOrderId());
         if (Objects.isNull(mallBizOrder)) {
@@ -167,8 +168,8 @@ public class MallBizRefundServiceImpl implements MallBizRefundService {
      * countNoRefund
      */
     @Override
-    public int countRefund(Long bizOrderId) {
-        return mallBizRefundDao.countRefund(bizOrderId);
+    public long sumRefundFee(Long bizOrderId) {
+        return mallBizRefundDao.sumRefundFee(bizOrderId);
     }
     @Override
@@ -14,7 +14,6 @@ import com.diligrp.cashier.mall.property.RtMallDynamicProperty;
 import com.diligrp.cashier.mall.service.biz.MallBizPaymentService;
 import com.diligrp.cashier.mall.service.biz.MallBizRefundService;
 import com.diligrp.cashier.mall.type.OrderState;
-import com.diligrp.cashier.mall.type.OrderType;
 import com.diligrp.cashier.mall.type.RtMarkErrorCode;
 import com.diligrp.cashier.pipeline.type.PaymentState;
 import com.diligrp.cashier.shared.spi.domain.PaymentResultBO;
@@ -129,8 +128,8 @@ public abstract class AbstractSourceChannel {
         List<MallBizPaymentOrder> paymentOrderList = mallBizPaymentService.listPaymentOrderByBizOrderId(mallBizRefund.getBizOrderId());
         boolean success = paymentOrderList.stream().allMatch(vo -> Objects.equals(vo.getPayState(), PaymentState.SUCCESS.getCode()));
         if (success) {
-            long count = mallBizRefundService.countRefund(mallBizRefund.getBizOrderId());
-            if (paymentOrderList.size() == count) {
+            long sumRefundFee = mallBizRefundService.sumRefundFee(mallBizRefund.getBizOrderId());
+            if (paymentOrderList.stream().mapToLong(MallBizPaymentOrder::getPayFee).sum() == sumRefundFee) {
                 LOG.info("订单全部退款完成，orderId:{}", mallBizRefund.getBizOrderId());
                 mallBizOrderDao.updateByIds(List.of(mallBizRefund.getBizOrderId()), OrderState.PAYED_CANCEL.code);
             }
@@ -339,8 +339,9 @@
         where refund_trade_id = #{refundTradeId}
     </select>
-    <select id="countRefund" resultType="java.lang.Integer">
-        select count(*)
+    <select id="sumRefundFee" resultType="java.lang.Long">
+        select
+        sum(refund_fee) as refundFee
         from mall_biz_refund
         where biz_order_id = #{bizOrderId}
         and refund_state = 4