feat scan order

dengwei
1 parent aab77929
Showing 8 changed files with 112 additions and 26 deletions
cashier-mall/src/main/java/com/diligrp/cashier/mall/domain/rtmall/co/OrderCO.java
cashier-mall/src/main/java/com/diligrp/cashier/mall/domain/rtmall/co/RefundCO.java
cashier-mall/src/main/java/com/diligrp/cashier/mall/model/MallBizPayment.java
cashier-mall/src/main/java/com/diligrp/cashier/mall/service/biz/impl/MallBizOrderServiceImpl.java
cashier-mall/src/main/java/com/diligrp/cashier/mall/service/paychannel/AbstractPayChannel.java
cashier-mall/src/main/java/com/diligrp/cashier/mall/service/paychannel/CardPayChannel.java
cashier-mall/src/main/java/com/diligrp/cashier/mall/service/paychannel/RcbPayChannel.java
cashier-mall/src/main/java/com/diligrp/cashier/mall/service/paychannel/WeChatPayChannel.java
@@ -39,7 +39,7 @@ public class OrderCO extends RtMarkBaseCO {
     @NotNull(message = "total_amount is required")
     private Long totalAmount;
-    @NotNull(message = "freight_fee is required")
+    // @NotNull(message = "freight_fee is required")
     private Long freightFee;
     private Long discountFee;
@@ -28,7 +28,7 @@ public class RefundCO extends RtMarkBaseCO {
     /**
      * 业务侧退款单号
      */
-    @NotBlank(message = "refund bn is required")
+//    @NotBlank(message = "refund bn is required")
     private String refundBn;
     /**
@@ -40,7 +40,7 @@ public class RefundCO extends RtMarkBaseCO {
     /**
      * 退款金额
      */
-    @NotNull(message = "refund fee is required")
+//    @NotNull(message = "refund fee is required")
     private Long refundFee;
     /**
 package com.diligrp.cashier.mall.model;
+import com.diligrp.cashier.mall.context.MallInitializeContext;
 import com.diligrp.cashier.mall.domain.rtmall.vo.OrderPaymentVO;
 import com.diligrp.cashier.mall.property.RtMallDynamicProperty;
 import com.diligrp.cashier.mall.type.OrderType;
@@ -376,11 +377,8 @@ public class MallBizPayment extends BaseDO {
     public void payCallBack(PaymentResultBO event) {
         this.setPayState(event.getState());
         this.setPayTime(event.getWhen());
-        // TODO 2026/1/6: 先固定
-        this.setUsername("人工");
         this.setExt(event.getPayerId());
         this.setChannelId(event.getOutPayType());
-
-        // TODO 2026/1/6: 其它信息
+        MallInitializeContext.getByPayChannel(this.getChannelId()).fill(this, event);
     }
 }
@@ -19,7 +19,7 @@ import com.diligrp.cashier.mall.service.biz.MallBizPaymentService;
 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.shared.exception.PlatformServiceException;
+import com.diligrp.cashier.shared.domain.BaseDO;
 import com.diligrp.cashier.shared.spi.ICashierDeskManager;
 import com.diligrp.cashier.shared.spi.domain.CashierOrderBO;
 import com.diligrp.cashier.shared.spi.domain.PaymentUrlBO;
@@ -35,8 +35,10 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import java.util.List;
+import java.util.Map;
 import java.util.Objects;
 import java.util.Optional;
+import java.util.stream.Collectors;
 /**
  * @ClassName MallBizOrderServiceImpl.java
@@ -156,24 +158,24 @@ public class MallBizOrderServiceImpl implements MallBizOrderService {
         batchUpdate(mallBizOrders, existOrders);
         // mall_biz_order_item
-        List<MallBizOrderItem> orderItems = mallBizOrders.stream().flatMap(vo -> vo.getMallBizOrderItems().stream()).toList();
-        Optional.of(orderItems)
-                .ifPresent(mallBizOrderItems -> {
-                    mallBizOrderItemDao.batchInsert(mallBizOrderItems);
-                });
+        List<MallBizOrderItem> orderItems = mallBizOrders.stream()
+                .filter(vo -> CollectionUtils.isNotEmpty(vo.getMallBizOrderItems()))
+                .flatMap(vo -> vo.getMallBizOrderItems().stream()).toList();
+        if (CollectionUtils.isNotEmpty(orderItems)) {
+            mallBizOrderItemDao.batchInsert(orderItems);
+        }
         // mall_biz_payment
         Optional.ofNullable(mallBizPayment).ifPresent(mallBizPaymentService::save);
         // mall_biz_payment_order
         List<MallBizPaymentOrder> bizPaymentOrders = mallBizOrders.stream().flatMap(vo -> vo.getMallBizPaymentOrders().stream()).toList();
-        Optional.of(bizPaymentOrders)
-                .ifPresent(paymentOrders -> {
-                    paymentOrders.forEach(vo -> {
-                        vo.setPayTradeId(mallBizPayment.getPayTradeId());
-                    });
-                    mallBizPaymentOrderDao.batchInsert(paymentOrders);
-                });
+        if (CollectionUtils.isNotEmpty(bizPaymentOrders)) {
+            bizPaymentOrders.forEach(vo -> {
+                vo.setPayTradeId(mallBizPayment.getPayTradeId());
+            });
+            mallBizPaymentOrderDao.batchInsert(bizPaymentOrders);
+        }
     }
     /**
@@ -210,11 +212,13 @@ public class MallBizOrderServiceImpl implements MallBizOrderService {
             mallBizOrderDao.batchInsert(saveOrders);
             // mall_biz_order_address
-            List<MallBizOrderAddress> mallBizOrderAddresses = mallBizOrders.stream().map(MallBizOrder::getMallBizOrderAddress).toList();
-            Optional.of(mallBizOrderAddresses)
-                    .ifPresent(mallBizOrderAddress -> {
-                        mallBizOrderAddressDao.batchInsert(mallBizOrderAddress);
-                    });
+            List<MallBizOrderAddress> mallBizOrderAddresses = mallBizOrders.stream()
+                    .map(MallBizOrder::getMallBizOrderAddress)
+                    .filter(Objects::nonNull)
+                    .toList();
+            if (CollectionUtils.isNotEmpty(mallBizOrderAddresses)) {
+                mallBizOrderAddressDao.batchInsert(mallBizOrderAddresses);
+            }
         }
     }
@@ -223,8 +227,17 @@ public class MallBizOrderServiceImpl implements MallBizOrderService {
      */
     private void batchUpdate(final List<MallBizOrder> mallBizOrders,
                              final List<MallBizOrder> existOrders) {
+        if (CollectionUtils.isEmpty(existOrders)) {
+            return;
+        }
+
+        Map<String, Long> orderIdMap = existOrders.stream().collect(Collectors.toMap(MallBizOrder::getOrderId, BaseDO::getId));
         List<String> existOrderIds = existOrders.stream().map(MallBizOrder::getOrderId).toList();
+        // 还原id
+        mallBizOrders.forEach(vo -> {
+            vo.setId(orderIdMap.getOrDefault(vo.getOrderId(), vo.getId()));
+        });
         List<MallBizOrder> updateOrders = mallBizOrders.stream().filter(vo -> existOrderIds.contains(vo.getOrderId())).toList();
         if (CollectionUtils.isNotEmpty(updateOrders)) {
             mallBizOrderDao.batchUpdate(updateOrders, mallBizOrders.getFirst().getSource());
@@ -248,7 +261,7 @@ public class MallBizOrderServiceImpl implements MallBizOrderService {
         cashierOrderBO.setSource(mallBizOrders.getFirst().getSource());
         cashierOrderBO.setGoods(
                 SourceType.getName(mallBizOrders.getFirst().getSource()) +
-                        OrderType.getDescription(mallBizOrders.getFirst().getOrderType()) + "支付！"
+                        OrderType.getDescription(mallBizOrders.getFirst().getOrderType()) + "支付"
         );
         cashierOrderBO.setDescription(cashierOrderBO.getGoods());
         cashierOrderBO.setAttach(cashierOrderBO.getGoods());
 package com.diligrp.cashier.mall.service.paychannel;
+import com.diligrp.cashier.mall.model.MallBizPayment;
+import com.diligrp.cashier.shared.spi.domain.PaymentResultBO;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -14,4 +16,6 @@ public abstract class AbstractPayChannel {
     protected final Logger LOG = LoggerFactory.getLogger(getClass());
     public abstract Integer getPayChannel();
+
+    public abstract void fill(MallBizPayment mallBizPayment, PaymentResultBO event);
 }
 package com.diligrp.cashier.mall.service.paychannel;
+import com.diligrp.cashier.mall.model.MallBizPayment;
 import com.diligrp.cashier.pipeline.type.ChannelType;
+import com.diligrp.cashier.shared.spi.domain.PaymentResultBO;
+import com.diligrp.cashier.shared.util.JsonUtils;
+import com.fasterxml.jackson.core.type.TypeReference;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Component;
+import java.util.Map;
+import java.util.Optional;
+
 /**
  * @ClassName CardPayChannel.java
  * @author dengwei
@@ -12,6 +21,25 @@ import org.springframework.stereotype.Component;
  */
 @Component
 public class CardPayChannel extends AbstractPayChannel {
+    protected final Logger LOG = LoggerFactory.getLogger(getClass());
+
+    @Override
+    public void fill(MallBizPayment mallBizPayment, PaymentResultBO event) {
+        String payerId = event.getPayerId();
+        try {
+            Map<String, Object> payer = JsonUtils.fromJsonString(payerId, new TypeReference<>() {
+            });
+            Optional.ofNullable(payer).ifPresent(user -> {
+                mallBizPayment.setCardNo((String) user.get("cardNo"));
+                mallBizPayment.setUsername((String) user.get("name"));
+                mallBizPayment.setUserId((Long) user.get("customerId"));
+                mallBizPayment.setAccountId((Long) user.get("accountId"));
+            });
+        } catch (Exception e) {
+            LOG.warn("parse payerId json error, tradeId={} outTradeNo={}", event.getTradeId(), event.getOutTradeNo(), e);
+        }
+    }
+
     @Override
     public Integer getPayChannel() {
         return ChannelType.DILIPAY.getCode();
+package com.diligrp.cashier.mall.service.paychannel;
+
+import com.diligrp.cashier.mall.model.MallBizPayment;
+import com.diligrp.cashier.pipeline.type.ChannelType;
+import com.diligrp.cashier.shared.spi.domain.PaymentResultBO;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.stereotype.Component;
+
+/**
+ * @ClassName RcbPayChannel.java
+ * @author dengwei
+ * @version 1.0.0
+ * @Description RcbPayChannel
+ * 农商行支付渠道
+ */
+@Component
+public class RcbPayChannel extends AbstractPayChannel {
+    protected final Logger LOG = LoggerFactory.getLogger(getClass());
+
+    @Override
+    public void fill(MallBizPayment mallBizPayment, PaymentResultBO event) {
+        mallBizPayment.setOpenId(event.getPayerId());
+        mallBizPayment.setUsername(event.getPayerId());
+    }
+
+    @Override
+    public Integer getPayChannel() {
+        return ChannelType.RCB.getCode();
+    }
+}
 package com.diligrp.cashier.mall.service.paychannel;
+import com.diligrp.cashier.mall.model.MallBizPayment;
 import com.diligrp.cashier.pipeline.type.ChannelType;
+import com.diligrp.cashier.shared.spi.domain.PaymentResultBO;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Component;
 /**
@@ -12,6 +16,14 @@ import org.springframework.stereotype.Component;
  */
 @Component
 public class WeChatPayChannel extends AbstractPayChannel {
+    protected final Logger LOG = LoggerFactory.getLogger(getClass());
+
+    @Override
+    public void fill(MallBizPayment mallBizPayment, PaymentResultBO event) {
+        mallBizPayment.setOpenId(event.getPayerId());
+        mallBizPayment.setUsername(event.getPayerId());
+    }
+
     @Override
     public Integer getPayChannel() {
         return ChannelType.WXPAY.getCode();