商品信息

src/main/java/com/fdkankan/ucenter/httpClient/param/PayGoods.java

@@ -0,0 +1,14 @@
+package com.fdkankan.ucenter.httpClient.param;
+
+import lombok.Data;
+
+@Data
+public class PayGoods {
+    private String name;
+    private Integer count;
+
+    public PayGoods(String name, Integer count) {
+        this.name = name;
+        this.count = count;
+    }
+}

src/main/java/com/fdkankan/ucenter/httpClient/param/PayOrderParam.java

@@ -12,9 +12,9 @@ public class PayOrderParam {
     private String orderType;
     private String userName;
     private String nickName;
-    private List<String> goodsInfo;
+    private List<PayGoods> goodsInfo;
 
-    public PayOrderParam(BigDecimal orderMoney, String orderType, String userName, String nickName, List<String> goodsInfo) {
+    public PayOrderParam(BigDecimal orderMoney, String orderType, String userName, String nickName, List<PayGoods> goodsInfo) {
         this.orderMoney = orderMoney;
         this.orderType = orderType;
         this.userName = userName;

src/main/java/com/fdkankan/ucenter/httpClient/service/PayService.java

@@ -7,6 +7,7 @@ import com.dtflys.forest.annotation.Post;
 import com.dtflys.forest.annotation.Var;
 import com.fdkankan.ucenter.common.ResultData;
 import com.fdkankan.ucenter.httpClient.client.PayClient;
+import com.fdkankan.ucenter.httpClient.param.PayGoods;
 import com.fdkankan.ucenter.httpClient.param.PayOrderParam;
 import com.fdkankan.ucenter.httpClient.vo.PayOrderVo;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -21,7 +22,7 @@ public class PayService {
     @Autowired
     PayClient payClient;
 
-    public PayOrderVo downOrder(BigDecimal money, String type, String userName, String nickName, List<String> goodsInfo){
+    public PayOrderVo downOrder(BigDecimal money, String type, String userName, String nickName, List<PayGoods> goodsInfo){
         PayOrderParam param = new PayOrderParam(money,type,userName,nickName,goodsInfo);
         ResultData resultData = payClient.downOrder(param);
         if(resultData.getCode() == 200 ){

src/main/java/com/fdkankan/ucenter/service/impl/DownloadOrderServiceImpl.java

@@ -12,6 +12,7 @@ import com.fdkankan.ucenter.constant.OrderConstant;
 import com.fdkankan.ucenter.entity.DownloadOrder;
 import com.fdkankan.ucenter.entity.Invoice;
 import com.fdkankan.ucenter.entity.User;
+import com.fdkankan.ucenter.httpClient.param.PayGoods;
 import com.fdkankan.ucenter.httpClient.service.PayService;
 import com.fdkankan.ucenter.httpClient.vo.PayOrderVo;
 import com.fdkankan.ucenter.mapper.IDownloadOrderMapper;
@@ -117,8 +118,8 @@ public class DownloadOrderServiceImpl extends ServiceImpl<IDownloadOrderMapper,
     @Override
     public DownloadOrder insertDownloadOrder(User user, DownNumParam param, BigDecimal price) {
         BigDecimal total = price.multiply(new BigDecimal(param.getCount()));
-
-        PayOrderVo payOrderVo = payService.downOrder(total, "downOrder",user.getUserName(),user.getNickName(), Arrays.asList(param.getSceneName()+"场景下载"));
+        PayGoods payGoods = new PayGoods(param.getSceneName() +"场景下载",param.getCount());
+        PayOrderVo payOrderVo = payService.downOrder(total, "downOrder",user.getUserName(),user.getNickName(), Arrays.asList(payGoods));
         if(payOrderVo == null){
             throw new BusinessException(OrderConstant.FAILURE_CODE_8005,OrderConstant.FAILURE_MSG_8005);
         }

src/main/java/com/fdkankan/ucenter/service/impl/IncrementOrderServiceImpl.java

@@ -14,6 +14,7 @@ import com.fdkankan.ucenter.constant.LoginConstant;
 import com.fdkankan.ucenter.constant.OrderConstant;
 import com.fdkankan.ucenter.entity.*;
 import com.fdkankan.ucenter.httpClient.client.PayClient;
+import com.fdkankan.ucenter.httpClient.param.PayGoods;
 import com.fdkankan.ucenter.httpClient.service.PayService;
 import com.fdkankan.ucenter.httpClient.vo.PayOrderVo;
 import com.fdkankan.ucenter.mapper.IIncrementOrderMapper;
@@ -160,7 +161,8 @@ public class IncrementOrderServiceImpl extends ServiceImpl<IIncrementOrderMapper
         }
 
         IncrementOrder incrementOrderEntity = new IncrementOrder();
-        PayOrderVo payOrderVo = payService.downOrder(total, "incrementOrder",user.getUserName(),user.getNickName(), Arrays.asList(incrementType.getName() +"/" +param.getMonthQy()+"个"));
+        PayGoods payGoods = new PayGoods(incrementType.getName(),param.getCount());
+        PayOrderVo payOrderVo = payService.downOrder(total, "incrementOrder",user.getUserName(),user.getNickName(), Arrays.asList(payGoods));
         if(payOrderVo == null){
             throw new BusinessException(OrderConstant.FAILURE_CODE_8005,OrderConstant.FAILURE_MSG_8005);
         }

src/main/java/com/fdkankan/ucenter/service/impl/OrderServiceImpl.java

@@ -13,6 +13,7 @@ import com.fdkankan.redis.util.RedisUtil;
 import com.fdkankan.ucenter.common.RedisKeyUtil;
 import com.fdkankan.ucenter.constant.*;
 import com.fdkankan.ucenter.entity.*;
+import com.fdkankan.ucenter.httpClient.param.PayGoods;
 import com.fdkankan.ucenter.httpClient.service.PayService;
 import com.fdkankan.ucenter.httpClient.vo.PayOrderVo;
 import com.fdkankan.ucenter.mapper.IOrderMapper;
@@ -141,7 +142,7 @@ public class OrderServiceImpl extends ServiceImpl<IOrderMapper, Order> implement
         OrderItem orderItemEntity = null;
         int goodsTotalCount = 0;
         BigDecimal goodsAmount = new BigDecimal(0);
-        List<String> goodsInfoList = new ArrayList<>();
+        List<PayGoods> goodsInfoList = new ArrayList<>();
         for(CartParam requestCart : param.getGoods()){
             goodsTotalCount += requestCart.getGoodsCount();
 
@@ -171,7 +172,8 @@ public class OrderServiceImpl extends ServiceImpl<IOrderMapper, Order> implement
             orderItemEntities.add(orderItemEntity);
 
             goodsAmount = goodsAmount.add(orderItemEntity.getGoodsPrice().multiply(new BigDecimal(orderItemEntity.getGoodsCount())));
-            goodsInfoList .add(orderItemEntity.getGoodsName() +"/" +orderItemEntity.getGoodsCount() +"个");
+            PayGoods payGoods = new PayGoods(orderItemEntity.getGoodsName(),orderItemEntity.getGoodsCount());
+            goodsInfoList.add(payGoods);
         }
 
         PayOrderVo payOrderVo = payService.downOrder(goodsAmount, "partOrder",user.getUserName(),user.getNickName(),goodsInfoList);