|
|
|
@ -26,11 +26,13 @@ |
|
|
|
package com.yxt.anrui.scm.biz.scmvehrebatewithapply; |
|
|
|
|
|
|
|
import cn.hutool.core.bean.BeanUtil; |
|
|
|
import cn.hutool.core.date.DateUtil; |
|
|
|
import com.alibaba.fastjson.JSON; |
|
|
|
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; |
|
|
|
import com.baomidou.mybatisplus.core.metadata.IPage; |
|
|
|
import com.yxt.anrui.base.api.basevehicle.BaseVehicle; |
|
|
|
import com.yxt.anrui.base.api.basevehicle.BaseVehicleFeign; |
|
|
|
import com.yxt.anrui.base.common.utils.Rule; |
|
|
|
import com.yxt.anrui.fin.api.kingdee.FinKingDeeFeign; |
|
|
|
import com.yxt.anrui.fin.api.kingdee.costadjustmentsbill.CostAdjustmentsBill; |
|
|
|
import com.yxt.anrui.fin.api.kingdee.voucher.GeneralVoucher; |
|
|
|
@ -110,6 +112,7 @@ public class ScmVehRebateWithApplyService extends MybatisBaseService<ScmVehRebat |
|
|
|
private SysOrganizationFeign sysOrganizationFeign; |
|
|
|
@Autowired |
|
|
|
private BaseVehicleFeign baseVehicleFeign; |
|
|
|
|
|
|
|
private QueryWrapper<ScmVehRebateWithApply> createQueryWrapper(ScmVehRebateWithApplyQuery query) { |
|
|
|
// todo: 这里根据具体业务调整查询条件
|
|
|
|
// 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName()));
|
|
|
|
@ -161,13 +164,16 @@ public class ScmVehRebateWithApplyService extends MybatisBaseService<ScmVehRebat |
|
|
|
} |
|
|
|
} |
|
|
|
if (StringUtils.isNotBlank(query.getUseOrgName())) { |
|
|
|
qw.eq("svrwa.useOrgName", query.getUseOrgName()); |
|
|
|
qw.like("svrwa.useOrgName", query.getUseOrgName()); |
|
|
|
} |
|
|
|
if (StringUtils.isNotBlank(query.getDeptName())) { |
|
|
|
qw.like("svrwa.deptName", query.getDeptName()); |
|
|
|
} |
|
|
|
if (StringUtils.isNotBlank(query.getCreateByName())) { |
|
|
|
qw.eq("svrwa.createByName", query.getCreateByName()); |
|
|
|
qw.like("svrwa.createByName", query.getCreateByName()); |
|
|
|
} |
|
|
|
if (StringUtils.isNotBlank(query.getBrandSid())) { |
|
|
|
qw.eq("svrwa.brandSid", query.getBrandSid()); |
|
|
|
if (StringUtils.isNotBlank(query.getBillNo())) { |
|
|
|
qw.like("svrwa.billNo", query.getBillNo()); |
|
|
|
} |
|
|
|
if (StringUtils.isNotBlank(query.getWithApply())) { |
|
|
|
qw.like("svrwa.withApply", query.getWithApply()); |
|
|
|
@ -177,6 +183,11 @@ public class ScmVehRebateWithApplyService extends MybatisBaseService<ScmVehRebat |
|
|
|
qw.apply(StringUtils.isNotBlank(createStartTime), "date_format (svrwa.createTime,'%Y-%m-%d') >= date_format('" + createStartTime + "','%Y-%m-%d')"). |
|
|
|
apply(StringUtils.isNotBlank(createEndTime), "date_format (svrwa.createTime,'%Y-%m-%d') <= date_format('" + createEndTime + "','%Y-%m-%d')" |
|
|
|
); |
|
|
|
String finishTimeStart = query.getFinishTimeStart(); |
|
|
|
String finishTimeEnd = query.getFinishTimeEnd(); |
|
|
|
qw.apply(StringUtils.isNotBlank(finishTimeStart), "date_format (svrwa.finishTime,'%Y-%m-%d') >= date_format('" + finishTimeStart + "','%Y-%m-%d')"). |
|
|
|
apply(StringUtils.isNotBlank(finishTimeEnd), "date_format (svrwa.finishTime,'%Y-%m-%d') <= date_format('" + finishTimeEnd + "','%Y-%m-%d')" |
|
|
|
); |
|
|
|
qw.groupBy("svrwa.sid"); |
|
|
|
qw.orderByDesc("svrwa.createTime"); |
|
|
|
IPage<ScmVehRebateWithApply> page = PagerUtil.queryToPage(pq); |
|
|
|
@ -193,6 +204,18 @@ public class ScmVehRebateWithApplyService extends MybatisBaseService<ScmVehRebat |
|
|
|
return rb.setMsg("请选择单车返利信息"); |
|
|
|
} |
|
|
|
if (StringUtils.isBlank(dtoSid)) { |
|
|
|
//生成单据编号
|
|
|
|
String billNo = ""; |
|
|
|
String date = DateUtil.format(DateUtil.date(), "yyyyMM"); |
|
|
|
SysOrganizationVo sysOrganizationVo = sysOrganizationFeign.fetchBySid(dto.getUseOrgSid()).getData(); |
|
|
|
billNo = "DCFLYT" + sysOrganizationVo.getOrgCode() + date; |
|
|
|
String i = baseMapper.selectNum(billNo); |
|
|
|
if (StringUtils.isNotBlank(i)) { |
|
|
|
billNo = Rule.getBillNo(billNo, Integer.valueOf(i).intValue()); |
|
|
|
} else { |
|
|
|
billNo = Rule.getBillNo(billNo, 0); |
|
|
|
} |
|
|
|
dto.setBillNo(billNo); |
|
|
|
String sid = this.insertByDto(dto).getData(); |
|
|
|
for (ScmVehRebateWithDto scmVehRebateWith : scmVehRebateWiths) { |
|
|
|
List<String> vehRebateSids = scmVehRebateWith.getVehRebateSids(); |
|
|
|
@ -383,17 +406,18 @@ public class ScmVehRebateWithApplyService extends MybatisBaseService<ScmVehRebat |
|
|
|
|
|
|
|
/** |
|
|
|
* 推送单车返利预提凭证 |
|
|
|
* |
|
|
|
* @param sid |
|
|
|
*/ |
|
|
|
public void pushVehRebateWithVoucher(String sid) { |
|
|
|
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); |
|
|
|
Calendar calendar=Calendar.getInstance(); |
|
|
|
int month=calendar.get(Calendar.MONTH); |
|
|
|
calendar.set(Calendar.MONTH, month-1); |
|
|
|
Calendar calendar = Calendar.getInstance(); |
|
|
|
int month = calendar.get(Calendar.MONTH); |
|
|
|
calendar.set(Calendar.MONTH, month - 1); |
|
|
|
calendar.set(Calendar.DAY_OF_MONTH, calendar.getActualMaximum(Calendar.DAY_OF_MONTH)); |
|
|
|
Date endTime = calendar.getTime();//上个月最后一天
|
|
|
|
String format = sdf.format(endTime); |
|
|
|
String summaryTag = "";//摘要前缀
|
|
|
|
String summaryTag = "";//摘要前缀
|
|
|
|
ScmVehRebateWithApply entity = fetchBySid(sid); |
|
|
|
if (null != entity) { |
|
|
|
if (StringUtils.isNotBlank(entity.getWithApply())) { |
|
|
|
@ -495,8 +519,6 @@ public class ScmVehRebateWithApplyService extends MybatisBaseService<ScmVehRebat |
|
|
|
} |
|
|
|
}); |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
private int updateFlowFiled(Map<String, Object> beanToMap) { |
|
|
|
@ -516,7 +538,7 @@ public class ScmVehRebateWithApplyService extends MybatisBaseService<ScmVehRebat |
|
|
|
if ("Event_end".equals(resultBean.getData().getTaskDefKey())) { |
|
|
|
for (String vehRebateSid : vehRebateSids) { |
|
|
|
scmVehRebateService.updateState(vehRebateSid, 2); |
|
|
|
scmVehRebateService.updateWithholdingDateBySid(vehRebateSid,scmVehRebateWithApply.getWithApply()); |
|
|
|
scmVehRebateService.updateWithholdingDateBySid(vehRebateSid, scmVehRebateWithApply.getWithApply()); |
|
|
|
} |
|
|
|
//推送单车返利预提凭证
|
|
|
|
pushVehRebateWithVoucher(bv.getBusinessSid()); |
|
|
|
@ -598,7 +620,7 @@ public class ScmVehRebateWithApplyService extends MybatisBaseService<ScmVehRebat |
|
|
|
Map<String, Object> map = BeanUtil.beanToMap(resultBean.getData()); |
|
|
|
updateFlowFiled(map); |
|
|
|
for (ScmVehRebateWithDetailsVo scmVehRebateWithDetailsVo : scmVehRebateWithDetailsVos) { |
|
|
|
scmVehRebateService.updateState(scmVehRebateWithDetailsVo.getVehRebateSid(),0); |
|
|
|
scmVehRebateService.updateState(scmVehRebateWithDetailsVo.getVehRebateSid(), 0); |
|
|
|
} |
|
|
|
return rb.success().setData(resultBean.getData()); |
|
|
|
} else { |
|
|
|
@ -612,7 +634,7 @@ public class ScmVehRebateWithApplyService extends MybatisBaseService<ScmVehRebat |
|
|
|
Map<String, Object> map = BeanUtil.beanToMap(resultBean.getData()); |
|
|
|
updateFlowFiled(map); |
|
|
|
for (ScmVehRebateWithDetailsVo scmVehRebateWithDetailsVo : scmVehRebateWithDetailsVos) { |
|
|
|
scmVehRebateService.updateState(scmVehRebateWithDetailsVo.getVehRebateSid(),0); |
|
|
|
scmVehRebateService.updateState(scmVehRebateWithDetailsVo.getVehRebateSid(), 0); |
|
|
|
} |
|
|
|
return rb.success().setData(resultBean.getData()); |
|
|
|
} |
|
|
|
|
ligaode
4 months ago