Merge branch 'autopay-0918' into test

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

@@ -11,7 +11,6 @@ public class PayGoods {
     private Integer goodsId;
     private Integer monthQy = 1;
     private String nameEn;
-    private Integer autoPay;
 
     public PayGoods(String name, String nameEn,Integer count,Integer type) {
         this.name = name;
@@ -20,12 +19,11 @@ public class PayGoods {
         this.type = type;
     }
 
-    public PayGoods(String name, Integer count,Integer type,Integer monthQy,Integer autoPay) {
+    public PayGoods(String name, Integer count,Integer type,Integer monthQy) {
         this.name = name;
         this.count = count;
         this.type = type;
         this.monthQy = monthQy;
-        this.autoPay = autoPay;
     }
 
     public PayGoods(String name, Integer count,String sceneNum,Integer type) {

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

@@ -1,5 +1,6 @@
 package com.fdkankan.ucenter.httpClient.param;
 
+import com.alibaba.nacos.shaded.org.checkerframework.checker.units.qual.A;
 import lombok.Data;
 
 import java.math.BigDecimal;
@@ -13,12 +14,14 @@ public class PayOrderParam {
     private String userName;
     private String nickName;
     private List<PayGoods> goodsInfo;
+    private Integer autoPay;
 
-    public PayOrderParam(BigDecimal orderMoney, String orderType, String userName, String nickName, List<PayGoods> goodsInfo) {
+    public PayOrderParam(BigDecimal orderMoney, String orderType, String userName, String nickName, List<PayGoods> goodsInfo,Integer autoPay) {
         this.orderMoney = orderMoney;
         this.orderType = orderType;
         this.userName = userName;
         this.nickName = nickName;
         this.goodsInfo = goodsInfo;
+        this.autoPay = autoPay;
     }
 }

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

@@ -22,8 +22,8 @@ public class PayService {
     @Autowired
     PayClient payClient;
 
-    public PayOrderVo downOrder(BigDecimal money, String type, String userName, String nickName, List<PayGoods> goodsInfo){
-        PayOrderParam param = new PayOrderParam(money,type,userName,nickName,goodsInfo);
+    public PayOrderVo downOrder(BigDecimal money, String type, String userName, String nickName, List<PayGoods> goodsInfo,Integer autoPay){
+        PayOrderParam param = new PayOrderParam(money,type,userName,nickName,goodsInfo,autoPay);
         ResultData resultData = payClient.downOrder(param);
         if(resultData.getCode() == 200 ){
             String orderStr = JSONObject.toJSONString(resultData.getData());

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

@@ -120,7 +120,7 @@ public class DownloadOrderServiceImpl extends ServiceImpl<IDownloadOrderMapper,
     public DownloadOrder insertDownloadOrder(User user, DownNumParam param, BigDecimal price) {
         BigDecimal total = price.multiply(new BigDecimal(param.getCount()));
         PayGoods payGoods = new PayGoods(param.getSceneName() ,param.getCount(),param.getSceneNum(),2);
-        PayOrderVo payOrderVo = payService.downOrder(total, "downOrder",user.getUserName(),user.getNickName(), Arrays.asList(payGoods));
+        PayOrderVo payOrderVo = payService.downOrder(total, "downOrder",user.getUserName(),user.getNickName(), Arrays.asList(payGoods),null);
         if(payOrderVo == null){
             throw new BusinessException(OrderConstant.FAILURE_CODE_8005,OrderConstant.FAILURE_MSG_8005);
         }

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

@@ -171,8 +171,8 @@ public class IncrementOrderServiceImpl extends ServiceImpl<IIncrementOrderMapper
         }
 
         IncrementOrder incrementOrderEntity = new IncrementOrder();
-        PayGoods payGoods = new PayGoods(incrementType.getName(),param.getCount(),incrementType.getValidTimeType(),param.getMonthQy(),param.getAutoPay());
-        PayOrderVo payOrderVo = payService.downOrder(total, "incrementOrder",user.getUserName(),user.getNickName(), Arrays.asList(payGoods));
+        PayGoods payGoods = new PayGoods(incrementType.getName(),param.getCount(),incrementType.getValidTimeType(),param.getMonthQy());
+        PayOrderVo payOrderVo = payService.downOrder(total, "incrementOrder",user.getUserName(),user.getNickName(), Arrays.asList(payGoods),param.getAutoPay());
         if(payOrderVo == null){
             throw new BusinessException(OrderConstant.FAILURE_CODE_8005,OrderConstant.FAILURE_MSG_8005);
         }

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

@@ -178,7 +178,7 @@ public class OrderServiceImpl extends ServiceImpl<IOrderMapper, Order> implement
             goodsInfoList.add(payGoods);
         }
 
-        PayOrderVo payOrderVo = payService.downOrder(goodsAmount, "partOrder",user.getUserName(),user.getNickName(),goodsInfoList);
+        PayOrderVo payOrderVo = payService.downOrder(goodsAmount, "partOrder",user.getUserName(),user.getNickName(),goodsInfoList,null);
         if(payOrderVo == null){
             throw new BusinessException(OrderConstant.FAILURE_CODE_8005,OrderConstant.FAILURE_MSG_8005);
         }