feat rtmart payment

dengwei
1 parent 5037436e
Showing 5 changed files with 41 additions and 6 deletions
cashier-mall/src/main/java/com/diligrp/cashier/mall/dao/MallBizPaymentOrderDao.java
cashier-mall/src/main/java/com/diligrp/cashier/mall/service/biz/MallBizPaymentService.java
cashier-mall/src/main/java/com/diligrp/cashier/mall/service/biz/impl/MallBizPaymentServiceImpl.java
cashier-mall/src/main/java/com/diligrp/cashier/mall/service/sourcechannel/AbstractSourceChannel.java
cashier-mall/src/main/resources/com/diligrp/cashier/dao/mapper/MallBizPaymentOrderDao.xml
@@ -33,4 +33,6 @@ public interface MallBizPaymentOrderDao extends MybatisMapperSupport {
     void updateByPayment(MallBizPayment mallBizPayment);
  
     List<MallBizPaymentOrder> listPaymentOrderByBizOrderId(@Param("bizOrderId") Long bizOrderId);
+
+    List<MallBizPaymentOrder> listPaymentOrderByBizOrderIds(@Param("bizOrderIds") List<Long> bizOrderIds);
 }
@@ -45,4 +45,6 @@ public interface MallBizPaymentService {
     void cancel(MallBizPaymentOrder mallBizPaymentOrder);
  
     List<MallBizPaymentOrder> listPaymentOrderByBizOrderId(Long bizOrderId);
+
+    List<MallBizPaymentOrder> listPaymentOrderByBizOrderIds(List<Long> bizOrderIds);
 }
@@ -259,12 +259,11 @@ public class MallBizPaymentServiceImpl implements MallBizPaymentService {
      */
     @Override
     public void cancel(MallBizPaymentOrder mallBizPaymentOrder) {
-        mallBizPaymentOrder.cancel();
         mallBizPaymentOrderDao.updateByPrimaryKeySelective(mallBizPaymentOrder);
     }
  
     /**
-     * return List.of();
+     * listPaymentOrderByBizOrderId
      */
     @Override
     public List<MallBizPaymentOrder> listPaymentOrderByBizOrderId(Long bizOrderId) {
@@ -272,6 +271,15 @@ public class MallBizPaymentServiceImpl implements MallBizPaymentService {
     }
  
     /**
+     * listPaymentOrderByBizOrderIds
+     */
+    @Override
+    public List<MallBizPaymentOrder> listPaymentOrderByBizOrderIds(List<Long> bizOrderIds) {
+        return mallBizPaymentOrderDao.listPaymentOrderByBizOrderIds(bizOrderIds);
+    }
+
+
+    /**
      * 处理单个支付流水的分摊通知
      * 1. 调用大润发订单详情接口获取商品信息
      * 2. 更新订单状态
@@ -97,14 +97,13 @@ public abstract class AbstractSourceChannel {
     @Transactional(rollbackFor = {Exception.class})
     public void paymentOnEvent(PaymentResultBO event, MallBizPayment mallBizPayment) {
         LOG.info("paymentOnEvent event: {} mallBizPayment: {}", JsonUtils.toJsonString(event), JsonUtils.toJsonString(mallBizPayment));
-        // update mall_biz_order
-        List<Long> bizOrderIds = Arrays.stream(mallBizPayment.getBizOrderId().split(",")).map(Long::valueOf).toList();
-        mallBizOrderDao.updateByIds(bizOrderIds, OrderState.PAYED.code);
-
         // update mall_biz_payment
         mallBizPayment.payCallBack(event);
         mallBizPaymentService.updateByPay(mallBizPayment);
  
+        // check all refund state
+        updateOrder(mallBizPayment);
+
         // notify other channel
         payCallBack(event, mallBizPayment);
     }
@@ -138,6 +137,18 @@ public abstract class AbstractSourceChannel {
     }
  
     /**
+     * updateOrder
+     */
+    private void updateOrder(MallBizPayment mallBizPayment) {
+        List<Long> bizOrderIds = Arrays.stream(mallBizPayment.getBizOrderId().split(",")).map(Long::valueOf).toList();
+        List<MallBizPaymentOrder> paymentOrderList = mallBizPaymentService.listPaymentOrderByBizOrderIds(bizOrderIds);
+        boolean success = paymentOrderList.stream().allMatch(vo -> Objects.equals(vo.getPayState(), PaymentState.SUCCESS.getCode()));
+        if (success) {
+            mallBizOrderDao.updateByIds(bizOrderIds, OrderState.PAYED.code);
+        }
+    }
+
+    /**
      * 渠道
      */
     public abstract Integer source();
@@ -122,6 +122,9 @@
       <if test="payFee != null">
         pay_fee = #{payFee,jdbcType=BIGINT},
       </if>
+      <if test="payState != null">
+        pay_state = #{payState,jdbcType=INTEGER},
+      </if>
       <if test="payTime != null">
         pay_time = #{payTime,jdbcType=TIMESTAMP},
       </if>
@@ -189,4 +192,13 @@
         where biz_payment_id = #{id}
     </update>
  
+    <select id="listPaymentOrderByBizOrderIds" resultType="com.diligrp.cashier.mall.model.MallBizPaymentOrder">
+        select
+        <include refid="Base_Column_List" />
+        from mall_biz_payment_order
+        where biz_order_id in
+        <foreach collection="bizOrderIds" item="bizOrderId" index="index" open="(" close=")" separator=",">
+            #{bizOrderId}
+        </foreach>
+    </select>
 </mapper>