用户信息，和商品信息

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

@@ -3,15 +3,22 @@ package com.fdkankan.ucenter.httpClient.param;
 import lombok.Data;
 
 import java.math.BigDecimal;
+import java.util.List;
 
 @Data
 public class PayOrderParam {
     private String serveName = "ucenter";
     private BigDecimal orderMoney;
     private String orderType;
+    private String userName;
+    private String nickName;
+    private List<String> goodsInfo;
 
-    public PayOrderParam( BigDecimal orderMoney, String orderType) {
+    public PayOrderParam(BigDecimal orderMoney, String orderType, String userName, String nickName, List<String> goodsInfo) {
         this.orderMoney = orderMoney;
         this.orderType = orderType;
+        this.userName = userName;
+        this.nickName = nickName;
+        this.goodsInfo = goodsInfo;
     }
 }

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

@@ -13,6 +13,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.math.BigDecimal;
+import java.util.List;
 
 @Service
 public class PayService {
@@ -20,8 +21,8 @@ public class PayService {
     @Autowired
     PayClient payClient;
 
-    public PayOrderVo downOrder(BigDecimal money, String type){
-        PayOrderParam param = new PayOrderParam(money,type);
+    public PayOrderVo downOrder(BigDecimal money, String type, String userName, String nickName, List<String> goodsInfo){
+        PayOrderParam param = new PayOrderParam(money,type,userName,nickName,goodsInfo);
         ResultData resultData = payClient.downOrder(param);
         if(resultData.getCode() == 200 ){
             String orderStr = JSONObject.toJSONString(resultData.getData());

src/main/java/com/fdkankan/ucenter/service/IDownloadOrderService.java

@@ -3,6 +3,7 @@ package com.fdkankan.ucenter.service;
 import com.fdkankan.ucenter.common.PageInfo;
 import com.fdkankan.ucenter.entity.DownloadOrder;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.fdkankan.ucenter.entity.User;
 import com.fdkankan.ucenter.vo.request.DownNumParam;
 import com.fdkankan.ucenter.vo.request.IncrementOrderParam;
 
@@ -25,7 +26,7 @@ public interface IDownloadOrderService extends IService<DownloadOrder> {
 
     boolean paySuccessDownloadOrder(String orderSn, String tradeNo, int paymentTypeName);
 
-    DownloadOrder insertDownloadOrder(Long id, DownNumParam param, BigDecimal bigDecimal);
+    DownloadOrder insertDownloadOrder(User user, DownNumParam param, BigDecimal bigDecimal);
 
     DownloadOrder getByOrderSnNoPay(String orderSn);
 }

src/main/java/com/fdkankan/ucenter/service/IIncrementOrderService.java

@@ -4,6 +4,7 @@ import com.fdkankan.ucenter.common.PageInfo;
 import com.fdkankan.ucenter.entity.IncrementOrder;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.fdkankan.ucenter.entity.IncrementType;
+import com.fdkankan.ucenter.entity.User;
 import com.fdkankan.ucenter.vo.request.DownNumParam;
 import com.fdkankan.ucenter.vo.request.IncrementOrderParam;
 import com.fdkankan.ucenter.vo.request.OrderParam;
@@ -26,7 +27,7 @@ public interface IIncrementOrderService extends IService<IncrementOrder> {
 
     GoodsSkuVo getDownloadPrice(OrderParam param);
 
-    IncrementOrder insertIncrementOrder(Long userId, DownNumParam param, IncrementType incrementType);
+    IncrementOrder insertIncrementOrder(User user, DownNumParam param, IncrementType incrementType);
 
      DateTime getDateTime(IncrementType incrementType, Integer userIncrementId,Integer count) ;
 

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

@@ -31,6 +31,7 @@ import org.springframework.stereotype.Service;
 
 import java.math.BigDecimal;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Date;
 import java.util.List;
 
@@ -114,10 +115,10 @@ public class DownloadOrderServiceImpl extends ServiceImpl<IDownloadOrderMapper,
     PayService payService;
 
     @Override
-    public DownloadOrder insertDownloadOrder(Long userId, DownNumParam param, BigDecimal price) {
+    public DownloadOrder insertDownloadOrder(User user, DownNumParam param, BigDecimal price) {
         BigDecimal total = price.multiply(new BigDecimal(param.getCount()));
 
-        PayOrderVo payOrderVo = payService.downOrder(total, "downOrder");
+        PayOrderVo payOrderVo = payService.downOrder(total, "downOrder",user.getUserName(),user.getNickName(), Arrays.asList(param.getSceneName()+"场景下载"));
         if(payOrderVo == null){
             throw new BusinessException(OrderConstant.FAILURE_CODE_8005,OrderConstant.FAILURE_MSG_8005);
         }
@@ -127,7 +128,7 @@ public class DownloadOrderServiceImpl extends ServiceImpl<IDownloadOrderMapper,
         downloadOrderEntity.setAmount(total);
         downloadOrderEntity.setPayType(param.getPayType());
         downloadOrderEntity.setPayStatus(-1);
-        downloadOrderEntity.setUserId(userId);
+        downloadOrderEntity.setUserId(user.getId());
         downloadOrderEntity.setCount(param.getCount());
         downloadOrderEntity.setAbroad(param.getAbroad());
         downloadOrderEntity.setStatus(1);

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

@@ -34,6 +34,7 @@ import org.springframework.stereotype.Service;
 
 import java.math.BigDecimal;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Date;
 import java.util.List;
 
@@ -151,7 +152,7 @@ public class IncrementOrderServiceImpl extends ServiceImpl<IIncrementOrderMapper
     PayService payService;
 
     @Override
-    public IncrementOrder insertIncrementOrder(Long userId, DownNumParam param,IncrementType incrementType) {
+    public IncrementOrder insertIncrementOrder(User user, DownNumParam param,IncrementType incrementType) {
 
         BigDecimal total = incrementType.getPrice().multiply(new BigDecimal(param.getCount()));
         if(param.getMonthQy() != null){
@@ -159,7 +160,7 @@ public class IncrementOrderServiceImpl extends ServiceImpl<IIncrementOrderMapper
         }
 
         IncrementOrder incrementOrderEntity = new IncrementOrder();
-        PayOrderVo payOrderVo = payService.downOrder(total, "incrementOrder");
+        PayOrderVo payOrderVo = payService.downOrder(total, "incrementOrder",user.getUserName(),user.getNickName(), Arrays.asList(incrementType.getName() +"/" +param.getMonthQy()+"个"));
         if(payOrderVo == null){
             throw new BusinessException(OrderConstant.FAILURE_CODE_8005,OrderConstant.FAILURE_MSG_8005);
         }
@@ -167,7 +168,7 @@ public class IncrementOrderServiceImpl extends ServiceImpl<IIncrementOrderMapper
         incrementOrderEntity.setAmount(total);
         incrementOrderEntity.setPayType(param.getPayType());
         incrementOrderEntity.setPayStatus(-1);
-        incrementOrderEntity.setUserId(userId);
+        incrementOrderEntity.setUserId(user.getId());
         incrementOrderEntity.setCount(param.getCount());
         incrementOrderEntity.setAbroad(param.getAbroad());
         incrementOrderEntity.setStatus(param.getIncrementId() == null ? 1 : 2);

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

@@ -29,6 +29,7 @@ import com.fdkankan.ucenter.vo.request.OrderParam;
 import com.fdkankan.ucenter.vo.request.PlaceOrderParam;
 import com.fdkankan.ucenter.vo.response.GoodsSkuVo;
 import com.fdkankan.ucenter.vo.response.OrderVo;
+import com.google.common.collect.Ordering;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -140,7 +141,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<>();
         for(CartParam requestCart : param.getGoods()){
             goodsTotalCount += requestCart.getGoodsCount();
 
@@ -170,9 +171,10 @@ 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() +"个");
         }
 
-        PayOrderVo payOrderVo = payService.downOrder(goodsAmount, "partOrder");
+        PayOrderVo payOrderVo = payService.downOrder(goodsAmount, "partOrder",user.getUserName(),user.getNickName(),goodsInfoList);
         if(payOrderVo == null){
             throw new BusinessException(OrderConstant.FAILURE_CODE_8005,OrderConstant.FAILURE_MSG_8005);
         }
@@ -271,7 +273,7 @@ public class OrderServiceImpl extends ServiceImpl<IOrderMapper, Order> implement
             throw new BusinessException(OrderConstant.FAILURE_CODE_8004, OrderConstant.FAILURE_MSG_8004);
         }
 
-        return downloadOrderService.insertDownloadOrder(user.getId(),param,incrementType.getDownloadPrice());
+        return downloadOrderService.insertDownloadOrder(user,param,incrementType.getDownloadPrice());
     }
 
     @Override
@@ -288,7 +290,7 @@ public class OrderServiceImpl extends ServiceImpl<IOrderMapper, Order> implement
         if(incrementType == null){
             throw new BusinessException(OrderConstant.FAILURE_CODE_8004, OrderConstant.FAILURE_MSG_8004);
         }
-        return incrementOrderService.insertIncrementOrder(user.getId(), param,incrementType);
+        return incrementOrderService.insertIncrementOrder(user, param,incrementType);
     }
 
     @Override