yxt_develop
/
anrui
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

1

master
God 8 months ago
parent
5d1aa42743
commit
aa2a09a3b2
3 changed files with 34 additions and 34 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 40
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebate/ScmSpecialRebateMapper.java
  2. 26
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebate/ScmSpecialRebateService.java
  3. 2
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatewithapply/ScmSpecialRebateWithApplyService.java

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

@ -54,33 +54,33 @@ import java.util.List;
@Mapper
public interface ScmSpecialRebateMapper extends BaseMapper<ScmSpecialRebate> {
//@Update("update scm_special_rebate set name=#{msg} where id=#{id}")
//IPage<ScmSpecialRebateVo> voPage(IPage<ScmSpecialRebate> page, @Param(Constants.WRAPPER) QueryWrapper<ScmSpecialRebate> qw);
IPage<ScmSpecialRebateVo> selectPageVo(IPage<ScmSpecialRebate> page, @Param(Constants.WRAPPER) Wrapper<ScmSpecialRebate> qw);
List<ScmSpecialRebateVo> selectListAllVo(@Param(Constants.WRAPPER) Wrapper<ScmSpecialRebate> qw);
@Select("select * from scm_special_rebate")
List<ScmSpecialRebateVo> selectListVo();
//@Update("update scm_special_rebate set name=#{msg} where id=#{id}")
//IPage<ScmSpecialRebateVo> voPage(IPage<ScmSpecialRebate> page, @Param(Constants.WRAPPER) QueryWrapper<ScmSpecialRebate> qw);
@Update("update scm_special_rebate set state = #{state} where sid = #{specialRebateSid}")
void updateState(@Param("specialRebateSid") String specialRebateSid,@Param("state") Integer state);
IPage<ScmSpecialRebateVo> selectPageVo(IPage<ScmSpecialRebate> page, @Param(Constants.WRAPPER) Wrapper<ScmSpecialRebate> qw);
@Update("update scm_special_rebate set withholdingDate = CURRENT_TIMESTAMP where sid = #{sid}")
void updateWithholdingDateBySid(String sid);
List<ScmSpecialRebateVo> selectListAllVo(@Param(Constants.WRAPPER) Wrapper<ScmSpecialRebate> qw);
IPage<ScmStayDisRebateVo> stayDisRebate(IPage<ScmSpecialRebate> page,@Param(Constants.WRAPPER) QueryWrapper<ScmSpecialRebate> qw);
@Select("select * from scm_special_rebate")
List<ScmSpecialRebateVo> selectListVo();
ScmSpecialRebateVo selectExcelInfo(@Param("createTime") String createTime,@Param("rebateName") String rebateName,@Param("rebateTypeValue") String rebateTypeValue,@Param("estimateRebate") String estimateRebate);
@Update("update scm_special_rebate set state = #{state} where sid = #{specialRebateSid}")
void updateState(@Param("specialRebateSid") String specialRebateSid, @Param("state") Integer state);
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);
@Update("update scm_special_rebate set withholdingDate = #{withApply} where sid = #{sid}")
void updateWithholdingDateBySid(@Param("sid") String sid, @Param("withApply") String withApply);
void updateTwoExcelInfo(@Param("secondaryUploadDate") String secondaryUploadDate,@Param("secondaryUploadMoney") String secondaryUploadMoney,@Param("money") String money,@Param("adjustmentRemarks") String adjustmentRemarks,@Param("sid") String sid);
IPage<ScmStayDisRebateVo> stayDisRebate(IPage<ScmSpecialRebate> page, @Param(Constants.WRAPPER) QueryWrapper<ScmSpecialRebate> qw);
List<OneExcelVo> excelListOne(@Param(Constants.WRAPPER) QueryWrapper<ScmSpecialRebate> qw);
ScmSpecialRebateVo selectExcelInfo(@Param("createTime") String createTime, @Param("rebateName") String rebateName, @Param("rebateTypeValue") String rebateTypeValue, @Param("estimateRebate") String estimateRebate);
List<TwoExcelVo> excelListTwo(@Param(Constants.WRAPPER) QueryWrapper<ScmSpecialRebate> qw);
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);
int checkSave(@Param(Constants.WRAPPER) QueryWrapper<ScmSpecialRebate> qw);
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);
List<TwoExcelVo> excelListTwo(@Param(Constants.WRAPPER) QueryWrapper<ScmSpecialRebate> qw);
int checkSave(@Param(Constants.WRAPPER) QueryWrapper<ScmSpecialRebate> qw);
}

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

@ -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) {

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

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

Write Preview
Loading…
Cancel
Save