feat update description

dengwei
1 parent 3ac3320d
Showing 3 changed files with 29 additions and 5 deletions
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-shared/src/main/java/com/diligrp/cashier/shared/type/SourceType.java
@@ -3,7 +3,6 @@ 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;
 import com.diligrp.cashier.mall.util.MallSnowflakeKeyManager;
 import com.diligrp.cashier.shared.domain.BaseDO;
 import com.diligrp.cashier.shared.spi.domain.PaymentResultBO;
@@ -12,7 +11,6 @@ import com.diligrp.cashier.trade.type.SnowflakeKey;
 import java.time.LocalDateTime;
 import java.util.List;
-import java.util.Objects;
 import java.util.stream.Collectors;
 /**
@@ -26,6 +26,7 @@ import com.diligrp.cashier.shared.spi.domain.CashierOrderBO;
 import com.diligrp.cashier.shared.spi.domain.PaymentUrlBO;
 import com.diligrp.cashier.shared.type.SourceType;
 import com.diligrp.cashier.shared.util.JsonUtils;
+import com.google.common.collect.Maps;
 import jakarta.annotation.Resource;
 import org.apache.commons.collections4.CollectionUtils;
 import org.slf4j.Logger;
@@ -265,8 +266,8 @@ public class MallBizOrderServiceImpl implements MallBizOrderService {
                 SourceType.getName(mallBizOrders.getFirst().getSource()) +
                         OrderType.getDescription(mallBizOrders.getFirst().getOrderType()) + "支付"
         );
-        cashierOrderBO.setDescription(cashierOrderBO.getGoods());
-        cashierOrderBO.setAttach(cashierOrderBO.getGoods());
+        cashierOrderBO.setDescription(description(mallBizPayment, mallBizOrders));
+        cashierOrderBO.setAttach(attach(mallBizOrders));
         LOG.info("submitOrder param: {}", JsonUtils.toJsonString(cashierOrderBO));
         PaymentUrlBO paymentUrlBO = cashierDeskManager.submitOrder(cashierOrderBO);
         Optional.ofNullable(paymentUrlBO).ifPresent(vo -> {
@@ -274,4 +275,29 @@ public class MallBizOrderServiceImpl implements MallBizOrderService {
             mallBizPayment.setPayTradeId(vo.tradeId());
         });
     }
+
+    /**
+     * description
+     */
+    private String description(final MallBizPayment mallBizPayment,
+                               final List<MallBizOrder> mallBizOrders) {
+        Integer source = mallBizOrders.getFirst().getSource();
+        Integer orderType = mallBizOrders.getFirst().getOrderType();
+        String desc = SourceType.getName(source) + OrderType.getDescription(orderType);
+        String tradeId = mallBizPayment.getTradeId();
+        if (Objects.equals(orderType, OrderType.MINI_PROGRAM.getCode())) {
+            tradeId = mallBizPayment.getOrderId();
+        }
+        return desc + "：" + tradeId;
+    }
+
+    /**
+     * attach
+     */
+    private String attach(final List<MallBizOrder> mallBizOrders) {
+        Map<String, Object> attachMap = Maps.newHashMapWithExpectedSize(4);
+        attachMap.put("shopId", mallBizOrders.getFirst().getShopCode());
+        attachMap.put("shopName", mallBizOrders.getFirst().getShopName());
+        return JsonUtils.toJsonString(attachMap);
+    }
 }
@@ -11,7 +11,7 @@ import java.util.stream.Stream;
  */
 public enum SourceType implements IEnumType {
-    RTMARK("大润发商城", 10);
+    RTMARK("大润发", 10);
     private final String name;
     private final int code;