1

src/main/java/com/fdkankan/ucenter/entity/IncrementOrder.java

@@ -117,5 +117,8 @@ public class IncrementOrder implements Serializable {
     @TableField("increment_type")
     private Integer incrementType;
 
+    @TableField("month_qy")
+    private Integer monthQy;
+
 
 }

src/main/java/com/fdkankan/ucenter/pay/strategy/impl/IncrementOrderImpl.java

@@ -50,7 +50,13 @@ public class IncrementOrderImpl implements OrderStrategy {
         }
         if(responseIncrementOrder.getIncrementId() == null){
             //新的增值权益套餐方案
-            DateTime date = DateUserUtil.getDateTime(new Date(),incrementType);
+            Date date = null;
+            if(responseIncrementOrder.getMonthQy() != null && incrementType.getValidTimeType() == 1 ){
+                date = DateUserUtil.getMonthDate(new Date(),responseIncrementOrder.getMonthQy());
+            }else {
+                date = DateUserUtil.getDateTime(new Date(),incrementType).toDate();
+            }
+
             if(responseIncrementOrder.getCount() > 0){
                 for(int i = 0, len = responseIncrementOrder.getCount(); i < len; i++){
                     userIncrementEntity = new UserIncrement();
@@ -58,7 +64,7 @@ public class IncrementOrderImpl implements OrderStrategy {
                     userIncrementEntity.setUserId(responseIncrementOrder.getUserId());
                     userIncrementEntity.setOrderSn(orderSn);
                     userIncrementEntity.setIncrementStartTime(DateUserUtil.getDate(new Date()));
-                    userIncrementEntity.setIncrementEndTime(DateUserUtil.getDate(date.toDate()));
+                    userIncrementEntity.setIncrementEndTime(DateUserUtil.getDate(date));
                     userIncrementEntity.setIsExpired(0);
                     userIncrementEntity.setIncrementTypeId(responseIncrementOrder.getIncrementType());
                     if(incrementType.getValidTimeType() == 0){

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

@@ -168,6 +168,7 @@ public class IncrementOrderServiceImpl extends ServiceImpl<IIncrementOrderMapper
         incrementOrderEntity.setCreateTime(DateUserUtil.getDate(new Date()));
         incrementOrderEntity.setUpdateTime(DateUserUtil.getDate(new Date()));
         incrementOrderEntity.setIncrementType(param.getIncrementType());
+        incrementOrderEntity.setMonthQy(param.getMonthQy());
         this.save(incrementOrderEntity);
         return incrementOrderEntity;
     }