1

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebate/ScmSpecialRebateMapper.java

@@ -65,18 +65,18 @@ public interface ScmSpecialRebateMapper extends BaseMapper<ScmSpecialRebate> {
     List<ScmSpecialRebateVo> selectListVo();
 
     @Update("update scm_special_rebate set state = #{state} where sid = #{specialRebateSid}")
-    void updateState(@Param("specialRebateSid") String specialRebateSid,@Param("state") Integer state);
+    void updateState(@Param("specialRebateSid") String specialRebateSid, @Param("state") Integer state);
 
-	@Update("update scm_special_rebate set withholdingDate = CURRENT_TIMESTAMP where sid = #{sid}")
-    void updateWithholdingDateBySid(String sid);
+    @Update("update scm_special_rebate set withholdingDate = #{withApply} where sid = #{sid}")
+    void updateWithholdingDateBySid(@Param("sid") String sid, @Param("withApply") String withApply);
 
-	IPage<ScmStayDisRebateVo> stayDisRebate(IPage<ScmSpecialRebate> page,@Param(Constants.WRAPPER) QueryWrapper<ScmSpecialRebate> qw);
+    IPage<ScmStayDisRebateVo> stayDisRebate(IPage<ScmSpecialRebate> page, @Param(Constants.WRAPPER) QueryWrapper<ScmSpecialRebate> qw);
 
-	ScmSpecialRebateVo selectExcelInfo(@Param("createTime") String createTime,@Param("rebateName") String rebateName,@Param("rebateTypeValue") String rebateTypeValue,@Param("estimateRebate") String estimateRebate);
+    ScmSpecialRebateVo selectExcelInfo(@Param("createTime") String createTime, @Param("rebateName") String rebateName, @Param("rebateTypeValue") String rebateTypeValue, @Param("estimateRebate") String estimateRebate);
 
-	void updateOneExcelInfo(@Param("uploadDate") String uploadDate,@Param("uploadMoney") String uploadMoney,@Param("stayDetermineMoney") String stayDetermineMoney,@Param("money") String money,@Param("adjustmentRemarks") String adjustmentRemarks,@Param("sid") String sid);
+    void updateOneExcelInfo(@Param("uploadDate") String uploadDate, @Param("uploadMoney") String uploadMoney, @Param("stayDetermineMoney") String stayDetermineMoney, @Param("money") String money, @Param("adjustmentRemarks") String adjustmentRemarks, @Param("sid") String sid);
 
-	void updateTwoExcelInfo(@Param("secondaryUploadDate") String secondaryUploadDate,@Param("secondaryUploadMoney") String secondaryUploadMoney,@Param("money") String money,@Param("adjustmentRemarks") String adjustmentRemarks,@Param("sid") String sid);
+    void updateTwoExcelInfo(@Param("secondaryUploadDate") String secondaryUploadDate, @Param("secondaryUploadMoney") String secondaryUploadMoney, @Param("money") String money, @Param("adjustmentRemarks") String adjustmentRemarks, @Param("sid") String sid);
 
     List<OneExcelVo> excelListOne(@Param(Constants.WRAPPER) QueryWrapper<ScmSpecialRebate> qw);
 

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebate/ScmSpecialRebateService.java

@@ -152,25 +152,25 @@ public class ScmSpecialRebateService extends MybatisBaseService<ScmSpecialRebate
         ResultBean rb = ResultBean.fireFail();
         String dtoSid = dto.getSid();
         QueryWrapper<ScmSpecialRebate> qw = new QueryWrapper<>();
-        qw.eq("createOrgSid",dto.getCreateOrgSid());
-        qw.like("createTime",DateUtil.formatDate(new Date()));
-        qw.eq("rebateTypeKey",dto.getRebateTypeKey());
-        qw.eq("rebateName",dto.getRebateName());
-        qw.eq("estimateRebate",dto.getEstimateRebate());
-        qw.eq("palceGenDate",dto.getPalceGenDate());
-        qw.eq("purchaseSystemSid",dto.getPurchaseSystemSid());
-        qw.eq("brandSid",dto.getBrandSid());
+        qw.eq("createOrgSid", dto.getCreateOrgSid());
+        qw.like("createTime", DateUtil.formatDate(new Date()));
+        qw.eq("rebateTypeKey", dto.getRebateTypeKey());
+        qw.eq("rebateName", dto.getRebateName());
+        qw.eq("estimateRebate", dto.getEstimateRebate());
+        qw.eq("palceGenDate", dto.getPalceGenDate());
+        qw.eq("purchaseSystemSid", dto.getPurchaseSystemSid());
+        qw.eq("brandSid", dto.getBrandSid());
         if (StringUtils.isBlank(dtoSid)) {
             int i = baseMapper.checkSave(qw);
-            if (i > 0){
+            if (i > 0) {
                 return rb.setMsg("返利信息已存在");
             }
             this.insertByDto(dto);
             return rb.success();
         }
-        qw.ne("sid",dtoSid);
+        qw.ne("sid", dtoSid);
         int i = baseMapper.checkSave(qw);
-        if (i > 0){
+        if (i > 0) {
             return rb.setMsg("返利信息已存在");
         }
         this.updateByDto(dto);
@@ -402,8 +402,8 @@ public class ScmSpecialRebateService extends MybatisBaseService<ScmSpecialRebate
         return rb.success().setMsg("调整成功");
     }
 
-    public void updateWithholdingDateBySid(String sid) {
-        baseMapper.updateWithholdingDateBySid(sid);
+    public void updateWithholdingDateBySid(String sid, String withApply) {
+        baseMapper.updateWithholdingDateBySid(sid, withApply);
     }
 
     public PagerVo<ScmStayDisRebateVo> stayDisRebate(PagerQuery<ScmSpecialRebateQuery> pq) {

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatewithapply/ScmSpecialRebateWithApplyService.java

@@ -314,7 +314,6 @@ public class ScmSpecialRebateWithApplyService extends MybatisBaseService<ScmSpec
         for (ScmSpecialRebateWithDto scmSpecialRebateWith : scmSpecialRebateWiths) {
             List<String> specialRebateSids = scmSpecialRebateWith.getSpecialRebateSids();
             for (String specialRebateSid : specialRebateSids) {
-                scmSpecialRebateService.updateWithholdingDateBySid(specialRebateSid);
                 scmSpecialRebateService.updateState(specialRebateSid, 1);
             }
         }
@@ -384,6 +383,7 @@ public class ScmSpecialRebateWithApplyService extends MybatisBaseService<ScmSpec
             if ("Event_end".equals(resultBean.getData().getTaskDefKey())) {
                 for (String specialRebateSid : specialRebateSids) {
                     scmSpecialRebateService.updateState(specialRebateSid, 2);
+                    scmSpecialRebateService.updateWithholdingDateBySid(specialRebateSid,scmSpecialRebateWithApply.getWithApply());
                 }
             }
             return rb.success().setData(resultBean.getData());