Merge branch 'task-lyh-pay'

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

@@ -9,6 +9,7 @@ public class PayGoods {
     private String sceneNum;
     private Integer type;   //0专业会员，1高级会员，2下载，3配件
     private Integer goodsId;
+    private Integer monthQy = 1;
 
     public PayGoods(String name, Integer count,Integer type) {
         this.name = name;
@@ -16,6 +17,13 @@ public class PayGoods {
         this.type = type;
     }
 
+    public PayGoods(String name, Integer count,Integer type,Integer monthQy) {
+        this.name = name;
+        this.count = count;
+        this.type = type;
+        this.monthQy = monthQy;
+    }
+
     public PayGoods(String name, Integer count,String sceneNum,Integer type) {
         this.name = name;
         this.count = count;

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

@@ -161,7 +161,7 @@ public class IncrementOrderServiceImpl extends ServiceImpl<IIncrementOrderMapper
         }
 
         IncrementOrder incrementOrderEntity = new IncrementOrder();
-        PayGoods payGoods = new PayGoods(incrementType.getName(),param.getCount(),incrementType.getValidTimeType());
+        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));
         if(payOrderVo == null){
             throw new BusinessException(OrderConstant.FAILURE_CODE_8005,OrderConstant.FAILURE_MSG_8005);
@@ -178,7 +178,7 @@ public class IncrementOrderServiceImpl extends ServiceImpl<IIncrementOrderMapper
         incrementOrderEntity.setRecStatus("A");
         incrementOrderEntity.setCreateTime(DateUserUtil.getDate(new Date()));
         incrementOrderEntity.setUpdateTime(DateUserUtil.getDate(new Date()));
-        incrementOrderEntity.setIncrementType(param.getIncrementType());
+        incrementOrderEntity.setIncrementType(incrementType.getId());
         incrementOrderEntity.setMonthQy(param.getMonthQy());
         incrementOrderEntity.setTimeZoneOff(param.getTimeZoneOff());
         if(incrementType.getValidTimeType() == 0){