1

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

@@ -67,8 +67,8 @@ public interface ScmSpecialRebateMapper extends BaseMapper<ScmSpecialRebate> {
     @Update("update scm_special_rebate set state = #{state} where sid = #{specialRebateSid}")
     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);
 

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

@@ -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());