|
|
|
@ -64,10 +64,6 @@ import com.yxt.anrui.scm.api.scmspecialrebatecheckapply.flow.SubmitScmSpecialReb |
|
|
|
import com.yxt.anrui.scm.api.scmspecialrebatecheckapplydetail.ScmSpecialrebateCheckapplydetailDetailsVo; |
|
|
|
import com.yxt.anrui.scm.api.scmspecialrebatecheckapplydetail.ScmSpecialrebateCheckapplydetailDto; |
|
|
|
import com.yxt.anrui.scm.api.scmspecialrebatecheckapplydetail.ScmSpecialrebateCheckapplydetailVo; |
|
|
|
import com.yxt.anrui.scm.api.scmvehrebatecheckapply.AppVehrebateCheckapplyDetailsVo; |
|
|
|
import com.yxt.anrui.scm.api.scmvehrebatecheckapply.AppVehrebateCheckapplydetailDetailsVo; |
|
|
|
import com.yxt.anrui.scm.api.scmvehrebatecheckapply.AppVehrebateCheckapplydetailDetailssVo; |
|
|
|
import com.yxt.anrui.scm.api.scmvehrebatecheckapply.ScmVehrebateCheckapply; |
|
|
|
import com.yxt.anrui.scm.biz.scmspecialrebate.ScmSpecialRebateService; |
|
|
|
import com.yxt.anrui.scm.biz.scmspecialrebatecheckapplydetail.ScmSpecialrebateCheckapplydetailService; |
|
|
|
import com.yxt.anrui.scm.biz.scmvehrebatewithapply.ScmVehRebateWithApplyService; |
|
|
|
@ -452,7 +448,7 @@ public class ScmSpecialrebateCheckapplyService extends MybatisBaseService<ScmSpe |
|
|
|
* |
|
|
|
* @param sid,tag (0代表核对申请通过推送，1代表重推功能) |
|
|
|
*/ |
|
|
|
public void pushSpecialRebateWithVoucher(String sid, String tag) { |
|
|
|
public void pushSpecialRebateWithVoucher(String sid, String tag, Map<String,Integer> mapCheckState) { |
|
|
|
String format = scmVehRebateWithApplyService.returnBusDate(new Date()); |
|
|
|
String summaryTag = "";//摘要前缀
|
|
|
|
ScmSpecialrebateCheckapply entity = fetchBySid(sid); |
|
|
|
@ -484,6 +480,10 @@ public class ScmSpecialrebateCheckapplyService extends MybatisBaseService<ScmSpe |
|
|
|
List<GeneralVoucher.GeneralVoucherDetail> voucherDetails = new ArrayList<>(); |
|
|
|
if (!v.isEmpty()) { |
|
|
|
for (ScmSpecialRebate rebate : v) { |
|
|
|
Integer onceState = 0; |
|
|
|
if (tag.equals("0") && mapCheckState.size() > 0) { |
|
|
|
onceState = mapCheckState.get(rebate.getSid()); |
|
|
|
} |
|
|
|
if (StringUtils.isNotBlank(rebate.getUseOrgSid())) { |
|
|
|
String useOrgSid = rebate.getUseOrgSid(); |
|
|
|
SysOrganizationVo organizationVo = sysOrganizationFeign.fetchBySid(useOrgSid).getData(); |
|
|
|
@ -512,7 +512,7 @@ public class ScmSpecialrebateCheckapplyService extends MybatisBaseService<ScmSpe |
|
|
|
} |
|
|
|
} |
|
|
|
if (!rebate.getRebateTypeValue().equals("行销活动")) { |
|
|
|
if (rebate.getOnceCheckState().intValue() == 0 || tag.equals("1")) { |
|
|
|
if (onceState.intValue() == 2 || tag.equals("1")) { |
|
|
|
//没有进行过核对申请
|
|
|
|
BigDecimal oneMoney = BigDecimal.ZERO;//一次上传金额
|
|
|
|
BigDecimal yicifanli = BigDecimal.ZERO;//一次应收返利返利
|
|
|
|
@ -687,7 +687,7 @@ public class ScmSpecialrebateCheckapplyService extends MybatisBaseService<ScmSpe |
|
|
|
} |
|
|
|
} |
|
|
|
} else { |
|
|
|
if (rebate.getOnceCheckState().intValue() == 0 || tag.equals("1")) { |
|
|
|
if (onceState.intValue() == 2 || tag.equals("1")) { |
|
|
|
//没有进行过核对申请
|
|
|
|
BigDecimal oneMoney = BigDecimal.ZERO;//一次上传金额
|
|
|
|
BigDecimal yicidaizhifu = BigDecimal.ZERO;//一次待支付金额
|
|
|
|
@ -906,8 +906,10 @@ public class ScmSpecialrebateCheckapplyService extends MybatisBaseService<ScmSpe |
|
|
|
updateFlowFiled(BeanUtil.beanToMap(resultBean.getData())); |
|
|
|
if ("Event_end".equals(resultBean.getData().getTaskDefKey())) { |
|
|
|
List<ScmSpecialrebateCheckapplydetailVo> scmSpecialrebateCheckapplydetailVos = scmSpecialrebateCheckapplydetailService.selByMainSid(bv.getBusinessSid()); |
|
|
|
Map<String,Integer> mapCheckState = new HashMap<>(); |
|
|
|
for (ScmSpecialrebateCheckapplydetailVo scmSpecialrebateCheckapplydetailVo : scmSpecialrebateCheckapplydetailVos) { |
|
|
|
ScmSpecialRebate scmSpecialRebate = scmSpecialRebateService.fetchBySid(scmSpecialrebateCheckapplydetailVo.getSpecialRebateSid()); |
|
|
|
mapCheckState.put(scmSpecialRebate.getSid(),scmSpecialRebate.getOnceCheckState()); |
|
|
|
if ("是".equals(scmSpecialRebate.getIsAdjustment())) { |
|
|
|
scmSpecialRebateService.updateState(scmSpecialrebateCheckapplydetailVo.getSpecialRebateSid(), 4); |
|
|
|
scmSpecialRebateService.updateAdjustmentState(scmSpecialrebateCheckapplydetailVo.getSpecialRebateSid(), 1); |
|
|
|
@ -917,7 +919,7 @@ public class ScmSpecialrebateCheckapplyService extends MybatisBaseService<ScmSpe |
|
|
|
scmSpecialRebateService.updateOnceCheckState(scmSpecialrebateCheckapplydetailVo.getSpecialRebateSid(), 1); |
|
|
|
} |
|
|
|
|
|
|
|
pushSpecialRebateWithVoucher(bv.getBusinessSid(),"0"); |
|
|
|
pushSpecialRebateWithVoucher(bv.getBusinessSid(),"0",mapCheckState); |
|
|
|
} |
|
|
|
return rb.success().setData(resultBean.getData()); |
|
|
|
} else { |
|
|
|
|
