Merge remote-tracking branch 'origin/master'

ad-platform-manage/ad-platform-management/src/main/java/com/baiye/modules/agent/service/impl/ChannelResourceAssignServiceImpl.java

@@ -60,7 +60,6 @@ public class ChannelResourceAssignServiceImpl implements ChannelResourceAssignSe
         //增加客户的总量和余量
         channelCustom.setTotalNum(channelCustom.getTotalNum() + assignNum);
         channelCustom.setSurplusNum(channelCustom.getSurplusNum() + assignNum);
-        channelCustomRepository.save(channelCustom);
         channelCustom.setPurchaseTime(DateUtil.date());
         channelCustomRepository.save(channelCustom);
 

ad-platform-manage/ad-platform-management/src/main/java/com/baiye/modules/agent/service/impl/CustomManageServiceImpl.java

@@ -98,9 +98,9 @@ public class CustomManageServiceImpl implements CustomManageService {
                 return CommonResponse.createByErrorMessage("可分配的余量不足");
             }
             channelCustom.setSurplusNum(channelCustom.getTotalNum());
+            channelCustom.setPurchaseTime(DateUtil.date());
             //减掉渠道商余量
             parent.setSurplusNum(parent.getSurplusNum() - channelCustom.getTotalNum());
-            parent.setCreateTime(DateUtil.date());
             channelCustomRepository.save(parent);
         }