lyhzzz 2 年之前
父节点
当前提交
6f89e116ec

+ 1 - 0
src/main/java/com/fdkankan/manage/service/impl/IncrementOrderMgServiceImpl.java

@@ -28,6 +28,7 @@ public class IncrementOrderMgServiceImpl extends ServiceImpl<IIncrementOrderMgMa
     public IncrementOrderMg addOrder(UserIncrementParam param, IncrementType incrementType) {
         IncrementOrderMg incrementOrderMg = new IncrementOrderMg();
         BeanUtil.copyProperties(param,incrementOrderMg);
+        param.setId(null);
         incrementOrderMg.setOrderSn(Dateutils.getOrderSn());
         incrementOrderMg.setPayStatus(1);
         incrementOrderMg.setIncrementType(incrementType.getId());

+ 2 - 1
src/main/java/com/fdkankan/manage/service/impl/UserIncrementServiceImpl.java

@@ -186,6 +186,7 @@ public class UserIncrementServiceImpl extends ServiceImpl<IUserIncrementMapper,
         for (int i = 0 ; i<param.getCount() ;i++) {
             UserIncrement userIncrement = new UserIncrement();
             String date = DateUtil.date2String(new Date(), DateUtil.DEFAULT_DATE_FORMAT);
+            userIncrement.setId(param.getId());
             userIncrement.setUserId(param.getUserId());
             userIncrement.setKeyWord(UUID.randomUUID().toString().replace("-", ""));
             userIncrement.setIsExpired(0);
@@ -208,7 +209,7 @@ public class UserIncrementServiceImpl extends ServiceImpl<IUserIncrementMapper,
         }
 
         if(userIncrementList.size() >0){
-            this.saveBatch(userIncrementList);
+            this.saveOrUpdateBatch(userIncrementList);
             User user = userService.getById(param.getUserId());
             if(user == null){
                 throw new BusinessException(ResultCode.USER_NOT_EXIST);