Merge branch 'autopay-0918' into test

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

@@ -0,0 +1,15 @@
+package com.fdkankan.ucenter.httpClient.param;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+
+@Data
+@AllArgsConstructor
+public class PayAutoPayVo {
+
+    private Integer autoPay;
+    /*
+    DAY,MONTH,YEAR
+ */
+    private String autoPayTime;
+}

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

@@ -15,13 +15,20 @@ public class PayOrderParam {
     private String nickName;
     private List<PayGoods> goodsInfo;
     private Integer autoPay;
+    /*
+        DAY,MONTH,YEAR
+     */
+    private String autoPayTime;
 
-    public PayOrderParam(BigDecimal orderMoney, String orderType, String userName, String nickName, List<PayGoods> goodsInfo,Integer autoPay) {
+    public PayOrderParam(BigDecimal orderMoney, String orderType, String userName, String nickName, List<PayGoods> goodsInfo,PayAutoPayVo autoPay) {
         this.orderMoney = orderMoney;
         this.orderType = orderType;
         this.userName = userName;
         this.nickName = nickName;
         this.goodsInfo = goodsInfo;
-        this.autoPay = autoPay;
+        if(autoPay != null){
+            this.autoPay = autoPay.getAutoPay();
+            this.autoPayTime = autoPay.getAutoPayTime();
+        }
     }
 }

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.PayAutoPayVo;
 import com.fdkankan.ucenter.httpClient.param.PayGoods;
 import com.fdkankan.ucenter.httpClient.param.PayOrderParam;
 import com.fdkankan.ucenter.httpClient.vo.PayOrderVo;
@@ -22,8 +23,8 @@ public class PayService {
     @Autowired
     PayClient payClient;
 
-    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);
+    public PayOrderVo downOrder(BigDecimal money, String type, String userName, String nickName, List<PayGoods> goodsInfo, PayAutoPayVo autoPayVo){
+        PayOrderParam   param = new PayOrderParam(money,type,userName,nickName,goodsInfo,autoPayVo);
         ResultData resultData = payClient.downOrder(param);
         if(resultData.getCode() == 200 ){
             String orderStr = JSONObject.toJSONString(resultData.getData());

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

@@ -15,6 +15,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.PayAutoPayVo;
 import com.fdkankan.ucenter.httpClient.param.PayGoods;
 import com.fdkankan.ucenter.httpClient.service.PayService;
 import com.fdkankan.ucenter.httpClient.vo.PayOrderVo;
@@ -171,8 +172,18 @@ public class IncrementOrderServiceImpl extends ServiceImpl<IIncrementOrderMapper
         }
 
         IncrementOrder incrementOrderEntity = new IncrementOrder();
+        PayAutoPayVo autoPayVo = null;
+        if(incrementType.getValidTimeType() == 0){
+            incrementOrderEntity.setMemberLevels("PR");
+            autoPayVo =new PayAutoPayVo(param.getAutoPay(),"YEAR");
+        }
+        if(incrementType.getValidTimeType() == 1){
+            incrementOrderEntity.setMemberLevels("SE");
+            autoPayVo = new PayAutoPayVo(param.getAutoPay(), "MONTH");
+        }
+
         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());
+        PayOrderVo payOrderVo = payService.downOrder(total, "incrementOrder",user.getUserName(),user.getNickName(), Arrays.asList(payGoods),autoPayVo);
         if(payOrderVo == null){
             throw new BusinessException(OrderConstant.FAILURE_CODE_8005,OrderConstant.FAILURE_MSG_8005);
         }
@@ -192,12 +203,6 @@ public class IncrementOrderServiceImpl extends ServiceImpl<IIncrementOrderMapper
         incrementOrderEntity.setMonthQy(param.getMonthQy());
         incrementOrderEntity.setTimeZoneOff(param.getTimeZoneOff());
         incrementOrderEntity.setAutoPay(param.getAutoPay());
-        if(incrementType.getValidTimeType() == 0){
-            incrementOrderEntity.setMemberLevels("PR");
-        }
-        if(incrementType.getValidTimeType() == 1){
-            incrementOrderEntity.setMemberLevels("SE");
-        }
         this.save(incrementOrderEntity);
         return incrementOrderEntity;
     }