fix number convert

dengwei
1 parent 34d290d2
Showing 4 changed files with 26 additions and 13 deletions
cashier-mall/src/main/java/com/diligrp/cashier/mall/model/MallBizOrder.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/MallBizOrderServiceImpl.java
cashier-mall/src/main/java/com/diligrp/cashier/mall/service/paychannel/CardPayChannel.java
@@ -17,9 +17,8 @@ import org.apache.commons.lang3.math.NumberUtils;
 import org.springframework.beans.BeanUtils;
  
 import java.time.LocalDateTime;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Optional;
+import java.util.*;
+import java.util.stream.Collectors;
  
 /**
  * MallBizOrder
@@ -348,8 +347,13 @@ public class MallBizOrder extends BaseDO {
     /**
      * of
      */
-    public static List<MallBizOrder> of(final List<OrderCO> orderCos,
+    public static List<MallBizOrder> of(final List<MallBizOrder> existOrders,
+                                        final List<OrderCO> orderCos,
                                         final AuthLoginCO authLogin) {
+        Map<String, Long> existOrderMapId = Optional.ofNullable(existOrders).orElse(Collections.emptyList())
+                .stream()
+                .collect(Collectors.toMap(MallBizOrder::getOrderId, BaseDO::getId));
+
         MallSnowflakeKeyManager snowflakeKeyManager = SpringContextUtils.getBean(MallSnowflakeKeyManager.class);
         List<MallBizOrder> mallBizOrders = orderCos
                 .stream()
@@ -358,7 +362,8 @@ public class MallBizOrder extends BaseDO {
                     MallBizOrder mallBizOrder = new MallBizOrder();
                     BeanUtils.copyProperties(orderCo, mallBizOrder);
  
-                    mallBizOrder.setId(snowflakeKeyManager.nextId(SnowflakeKey.MALL_BIZ_ORDER_ID));
+                    Long id = existOrderMapId.getOrDefault(orderCo.getOrderId(), snowflakeKeyManager.nextId(SnowflakeKey.MALL_BIZ_ORDER_ID));
+                    mallBizOrder.setId(id);
                     mallBizOrder.setOrderNo(snowflakeKeyManager.nextId(SnowflakeKey.MALL_BIZ_ORDER_ID).toString());
                     mallBizOrder.setOrderExpire(Optional.ofNullable(orderCo.getOrderExpire()).orElse(10));
                     BeanUtils.copyProperties(authLogin, mallBizOrder);
@@ -9,6 +9,7 @@ import com.diligrp.cashier.shared.domain.BaseDO;
 import com.diligrp.cashier.shared.spi.domain.RefundResultBO;
 import com.diligrp.cashier.shared.util.SpringContextUtils;
 import com.diligrp.cashier.trade.type.SnowflakeKey;
+import org.apache.commons.lang3.ObjectUtils;
 import org.springframework.beans.BeanUtils;
  
 import java.time.LocalDateTime;
@@ -365,6 +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()));
  
         // 回调地址
         RtMallDynamicProperty rtMallDynamicProperty = SpringContextUtils.getBean(RtMallDynamicProperty.class);
@@ -73,8 +73,11 @@ public class MallBizOrderServiceImpl implements MallBizOrderService {
     public OrderSuccessVO createOrder(List<OrderCO> orderCos) {
         AuthLoginCO authLogin = getAuthLogin(orderCos.getFirst().getUserCode(), orderCos.getFirst().getOrderType());
  
+        // order - 扫码购存在相同订单重复扫码下单接口
+        List<MallBizOrder> existOrders = mallBizOrderDao.listByOrderIds(orderCos.stream().map(OrderCO::getOrderId).toList(), authLogin.getSource());
+
         // order
-        List<MallBizOrder> mallBizOrders = MallBizOrder.of(orderCos, authLogin);
+        List<MallBizOrder> mallBizOrders = MallBizOrder.of(existOrders, orderCos, authLogin);
  
         // payment
         MallBizPayment mallBizPayment = MallBizPayment.of(mallBizOrders);
@@ -83,7 +86,7 @@ public class MallBizOrderServiceImpl implements MallBizOrderService {
         submitOrder(mallBizPayment, mallBizOrders);
  
         // save
-        commonCreate(mallBizOrders, mallBizPayment);
+        commonCreate(existOrders, mallBizOrders, mallBizPayment);
         return new OrderSuccessVO(mallBizPayment.getPayTradeNo(), mallBizPayment.getCashierUrl());
     }
  
@@ -142,15 +145,13 @@ public class MallBizOrderServiceImpl implements MallBizOrderService {
     /**
      * commonCreate
      */
-    public void commonCreate(final List<MallBizOrder> mallBizOrders,
+    public void commonCreate(final List<MallBizOrder> existOrders,
+                             final List<MallBizOrder> mallBizOrders,
                              final MallBizPayment mallBizPayment) {
         if (CollectionUtils.isEmpty(mallBizOrders)) {
             return;
         }
  
-        // order - 扫码购存在相同订单重复扫码下单接口
-        List<MallBizOrder> existOrders = mallBizOrderDao.listByOrderIds(mallBizOrders.stream().map(MallBizOrder::getOrderId).toList(), mallBizOrders.getFirst().getSource());
-
         // save
         batchInsert(mallBizOrders, existOrders);
  
@@ -32,14 +32,19 @@ public class CardPayChannel extends AbstractPayChannel {
             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"));
+                mallBizPayment.setUserId(convertLong(user.get("customerId")));
+                mallBizPayment.setAccountId(convertLong(user.get("accountId")));
             });
         } catch (Exception e) {
             LOG.warn("parse payerId json error, tradeId={} outTradeNo={}", event.getTradeId(), event.getOutTradeNo(), e);
         }
     }
  
+
+    private Long convertLong(Object value) {
+        return value != null ? ((Number) value).longValue() : null;
+    }
+
     @Override
     public Integer getPayChannel() {
         return ChannelType.DILIPAY.getCode();