feat scan callback

dengwei
1 parent eb7b1af0
Showing 7 changed files with 41 additions and 18 deletions
cashier-mall/src/main/java/com/diligrp/cashier/mall/api/RtMallScanOrderApi.java
cashier-mall/src/main/java/com/diligrp/cashier/mall/dao/MallBizPaymentDao.java
cashier-mall/src/main/java/com/diligrp/cashier/mall/model/MallBizOrderItem.java
cashier-mall/src/main/java/com/diligrp/cashier/mall/model/MallBizRefund.java
cashier-mall/src/main/java/com/diligrp/cashier/mall/service/biz/impl/MallBizPaymentServiceImpl.java
cashier-mall/src/main/resources/com/diligrp/cashier/dao/mapper/MallBizOrderItemDao.xml
cashier-mall/src/main/resources/com/diligrp/cashier/dao/mapper/MallBizPaymentDao.xml
@@ -68,12 +68,10 @@ public class RtMallScanOrderApi {
     @PostMapping("/order/v1/callback")
     @ParamLogPrint(outPrint = true)
     @Sign(sign = RtMallSign.class)
-    @RepeatSubmit(prefix = "payment_allocate_callback:", value = {
-            "#req['trade_list'].![trade_id].![#root + #this]",}, duplicationSubmit = SpelDuplicationSubmit.class)
     public RtMarkMessage<?> handlePaymentAllocate(@Valid @RequestBody Object req) {
-        PaymentAllocateCO allocateCO = JsonUtils.convertValue(req, PaymentAllocateCO.class);
-        RtMallValidateUtils.valid(allocateCO);
-        mallBizPaymentService.handlePaymentAllocate(allocateCO);
+        PaymentAllocateCO allocateCo = JsonUtils.convertValue(req, PaymentAllocateCO.class);
+        RtMallValidateUtils.valid(allocateCo);
+        mallBizPaymentService.handlePaymentAllocate(allocateCo);
         return RtMarkMessage.success();
     }
  
@@ -24,5 +24,5 @@ public interface MallBizPaymentDao extends MybatisMapperSupport {
  
     MallBizPayment getByPayTradeId(@Param("tradeId") String tradeId);
  
-    MallBizPayment findByOrderIdAndTradeId(String orderId, String tradeId);
+    MallBizPayment findByOrderIdAndTradeId(@Param("orderId") String orderId, @Param("tradeId") String tradeId);
 }
@@ -19,6 +19,11 @@ public class MallBizOrderItem extends BaseDO {
     private String orderId;
  
     /**
+     * 交易id
+     */
+    private String tradeId;
+
+    /**
      * 业务侧子订单号
      */
     private Long subOrderId;
@@ -99,6 +104,14 @@ public class MallBizOrderItem extends BaseDO {
         this.orderId = orderId == null ? null : orderId.trim();
     }
  
+    public String getTradeId() {
+        return tradeId;
+    }
+
+    public void setTradeId(String tradeId) {
+        this.tradeId = tradeId;
+    }
+
     public Long getSubOrderId() {
         return subOrderId;
     }
@@ -366,7 +366,7 @@ public class MallBizRefund extends BaseDO {
         mallBizRefund.setPayTradeNo(mallBizPaymentOrder.getPayTradeNo());
         mallBizRefund.setPayTradeId(mallBizPaymentOrder.getPayTradeId());
         mallBizRefund.setCreaterName(refundCo.getUserCode());
-        mallBizRefund.setRefundFee(ObjectUtils.defaultIfNull(refundCo.getRefundFee(), mallBizRefund.getRefundFee()));
+        mallBizRefund.setRefundFee(ObjectUtils.defaultIfNull(refundCo.getRefundFee(), mallBizPaymentOrder.getPayFee()));
  
         // 回调地址
         RtMallDynamicProperty rtMallDynamicProperty = SpringContextUtils.getBean(RtMallDynamicProperty.class);
@@ -295,20 +295,21 @@ public class MallBizPaymentServiceImpl implements MallBizPaymentService {
         }
  
         //查询订单
-        MallBizOrder order = mallBizOrderDao.findByOrderIdAndTradeId(trade.getOrderId(), trade.getTradeId());
-        if (order == null) {
+        MallBizPaymentOrder mallBizPaymentOrder = mallBizPaymentOrderDao.getMallBizPaymentOrder(new MallBizPaymentOrder(trade.getOrderId(), trade.getTradeId()));
+        if (mallBizPaymentOrder == null) {
             LOG.error("找不到订单: order_id={}, trade_id={}", trade.getOrderId(), trade.getTradeId());
             throw new RtMartMallException(RtMarkErrorCode.E5000);
         }
  
-        //更新订单状态
-        updateOrderState(order, orderDetail);
+        // 更新订单状态
+        // updateOrderState(mallBizPaymentOrder, orderDetail);
  
-        //更新支付记录
-        updatePaymentInfo(trade.getOrderId(), trade.getTradeId(), orderDetail);
+        // 更新支付记录
+        // updatePaymentInfo(trade.getOrderId(), trade.getTradeId(), orderDetail);
  
-        //插入商品明细
-        insertOrderItems(order, orderDetail.getItemList());
+        // 插入商品明细
+        MallBizOrder mallBizOrder = mallBizOrderDao.selectByPrimaryKey(mallBizPaymentOrder.getBizOrderId());
+        insertOrderItems(mallBizOrder, orderDetail);
  
         LOG.info("支付分摊处理成功: trade_id={}, item_count={}", trade.getTradeId(), orderDetail.getItemList().size());
     }
@@ -364,14 +365,15 @@ public class MallBizPaymentServiceImpl implements MallBizPaymentService {
     /**
      * 插入商品明细
      */
-    private void insertOrderItems(MallBizOrder order, List<OrderDetailResponseVO.OrderItem> items) {
+    private void insertOrderItems(MallBizOrder order, OrderDetailResponseVO.OrderDetailData orderDetailData) {
         List<MallBizOrderItem> orderItems = new ArrayList<>();
  
-        for (OrderDetailResponseVO.OrderItem item : items) {
+        for (OrderDetailResponseVO.OrderItem item : orderDetailData.getItemList()) {
             MallBizOrderItem orderItem = new MallBizOrderItem();
             orderItem.setId(mallSnowflakeKeyManager.nextId(SnowflakeKey.MALL_BIZ_ORDER_ID));
             orderItem.setBizOrderId(order.getId());
-            orderItem.setOrderId(order.getOrderId());
+            orderItem.setOrderId(orderDetailData.getOrderId());
+            orderItem.setTradeId(orderDetailData.getTradeId());
             orderItem.setSubOrderId(item.getSubOrderId() != null ? Long.parseLong(item.getSubOrderId()) : null);
             orderItem.setShopCode(order.getShopCode());
             orderItem.setShopName(order.getShopName());
@@ -217,6 +217,7 @@
         id,
         biz_order_id,
         order_id,
+        trade_id,
         sub_order_id,
         shop_code,
         shop_name,
@@ -235,6 +236,7 @@
         (#{item.id,jdbcType=BIGINT},
         #{item.bizOrderId,jdbcType=BIGINT},
         #{item.orderId,jdbcType=VARCHAR},
+        #{item.tradeId,jdbcType=VARCHAR},
         #{item.subOrderId,jdbcType=VARCHAR},
         #{item.shopCode,jdbcType=VARCHAR},
         #{item.shopName,jdbcType=VARCHAR},
@@ -311,4 +311,12 @@
         where pay_trade_id = #{tradeId,jdbcType=VARCHAR}
     </select>
  
+    <select id="findByOrderIdAndTradeId" resultType="com.diligrp.cashier.mall.model.MallBizPayment">
+        select
+        <include refid="Base_Column_List" />
+        from mall_biz_payment
+        where order_id = #{orderId,jdbcType=VARCHAR}
+        and trade_id = #{tradeId,jdbcType=VARCHAR}
+    </select>
+
 </mapper>