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

优化简易订单订金推送款项确认添加子表数据

master
dimengzhe 2 years ago
parent
b277f99a19
commit
5335697a9a
9 changed files with 197 additions and 153 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. 2
      anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeposit/AppBusDepositBuscenterDetailVo.java
  2. 1
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeposit/BusDepositService.java
  3. 2
      anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomertemp/CrmCustomerTempFeign.java
  4. 4
      anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomertemp/CrmCustomerTempFeignFallback.java
  5. 2
      anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempRest.java
  6. 6
      anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempService.java
  7. 106
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java
  8. 3
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedMapper.xml
  9. 8
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedMapper.xml

2
anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeposit/AppBusDepositBuscenterDetailVo.java
View File

@ -100,6 +100,8 @@ public class AppBusDepositBuscenterDetailVo implements Vo {
@ApiModelProperty("采购系统名称")
private String purchaseSystemName;
private String orgSidPath;
}

1
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeposit/BusDepositService.java
View File

@ -186,6 +186,7 @@ public class BusDepositService extends MybatisBaseService<BusDepositMapper, BusD
vo.setCreateDate(busMainDeposit.getCreateDate());
vo.setDepositBillType(busMainDeposit.getDepositBillType());
vo.setDepositBillTypeKey(busMainDeposit.getDepositBillTypeKey());
vo.setOrgSidPath(busMainDeposit.getOrgSidPath());
List<String> list = new ArrayList<>();
if (StringUtils.isNotBlank(vo.getPaymentProof())) {
String url = fileUploadComponent.getUrlPrefix() + vo.getPaymentProof();

2
anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomertemp/CrmCustomerTempFeign.java
View File

@ -132,7 +132,7 @@ public interface CrmCustomerTempFeign {
@ApiOperation("手机端保存/修改潜在客户信息")
@PostMapping("/saveOrUpdateAppCustomerTemp")
public ResultBean saveOrUpdateAppCustomerTemp(@Valid @RequestBody AppCrmCustomerTempDto dto);
public ResultBean<String> saveOrUpdateAppCustomerTemp(@Valid @RequestBody AppCrmCustomerTempDto dto);
@ApiOperation("手机端维护客户信息是否完善的状态")
@ResponseBody

4
anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomertemp/CrmCustomerTempFeignFallback.java
View File

@ -90,8 +90,8 @@ public class CrmCustomerTempFeignFallback implements CrmCustomerTempFeign {
}
@Override
public ResultBean saveOrUpdateAppCustomerTemp(AppCrmCustomerTempDto dto) {
ResultBean rb = ResultBean.fireFail();
public ResultBean<String> saveOrUpdateAppCustomerTemp(AppCrmCustomerTempDto dto) {
ResultBean<String> rb = ResultBean.fireFail();
return rb.setMsg("接口anrui-crm/crmcustomertemp/saveOrUpdateAppCustomerTemp无法访问");
}

2
anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempRest.java
View File

@ -173,7 +173,7 @@ public class CrmCustomerTempRest implements CrmCustomerTempFeign {
* @return
*/
@Override
public ResultBean saveOrUpdateAppCustomerTemp(AppCrmCustomerTempDto dto) {
public ResultBean<String> saveOrUpdateAppCustomerTemp(AppCrmCustomerTempDto dto) {
return crmCustomerTempService.saveOrUpdateAppCustomerTemp(dto);
}

6
anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempService.java
View File

@ -274,8 +274,8 @@ public class CrmCustomerTempService extends MybatisBaseService<CrmCustomerTempMa
* @return code: 511：为当前用户的客户；512：该手机号的客户不是当前用户的客户；
* 513：该微信号的客户已是当前用户的客户
*/
public ResultBean saveOrUpdateAppCustomerTemp(AppCrmCustomerTempDto dto) {
ResultBean rb = ResultBean.fireFail();
public ResultBean<String> saveOrUpdateAppCustomerTemp(AppCrmCustomerTempDto dto) {
ResultBean<String> rb = ResultBean.fireFail();
/**
* 2023-02-10:
* 先查询客户编码是否存在：
@ -309,7 +309,7 @@ public class CrmCustomerTempService extends MybatisBaseService<CrmCustomerTempMa
SysUserVo sysCrmVo = sysUserFeign.fetchBySid(crmCustomerTemp.getCreateBySid()).getData();
if (sysCrmVo != null) {
staffName = sysCrmVo.getName();
return rb.setCode(HttpStatusEnum.CRM_ERROR_NOTBELONG.getCode()).setMsg("为" + staffName + "销售专员客户");
return rb.setCode(HttpStatusEnum.CRM_ERROR_NOTBELONG.getCode()).setMsg("为" + staffName + "销售专员客户").setData(crmCustomerTemp.getSid());
}
} else {
// 返回潜在客户sid，跳转维护信息页面

106
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java
View File

@ -54,9 +54,7 @@ import com.yxt.anrui.buscenter.api.bussalesorder.app.order.AppOrderPriceInfoVo;
import com.yxt.anrui.buscenter.api.bussalesordersubmit.SubmitVo;
import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicle;
import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicleFeign;
import com.yxt.anrui.crm.api.crmcustomertemp.CrmCustomerTempFeign;
import com.yxt.anrui.crm.api.crmcustomertemp.CrmCustomerTempVo;
import com.yxt.anrui.crm.api.crmcustomertemp.CustomerQuery;
import com.yxt.anrui.crm.api.crmcustomertemp.*;
import com.yxt.anrui.fin.api.fincollectionconfirmation.*;
import com.yxt.anrui.fin.api.fincollectionconfirmation.app.AppBusArrearsCarryMoneyVo;
import com.yxt.anrui.fin.api.fincollectionconfirmation.app.FinConfirmDto;
@ -1160,7 +1158,6 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
if (params.getSidList().size() > 0) {
qw.notIn("furd.sid", params.getSidList());
}
/* qw.gt("furd.currentReceivableMoney", 0);//应收金额*/
if (StringUtils.isNotBlank(pagerQuery.getParams().getPurchaseSystemSid())) {
qw.eq("furd.purchaseSystemSid", pagerQuery.getParams().getPurchaseSystemSid());
} else {
@ -1168,28 +1165,6 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
}
}
IPage<AppFinUncollectedReceivablesDetailedVo> pagging = finSelectedReceivablesDetailedService.getPaymentDetailsList(page, qw, params.getName());
/* List<AppFinUncollectedReceivablesDetailedVo> records = pagging.getRecords();
records.removeAll(Collections.singleton(null));
if (!records.isEmpty()) {
for (int i = 0; i < records.size(); i++) {
AppFinUncollectedReceivablesDetailedVo vo = records.get(i);
//查询当前应收:应收金额-所有认款的余额=剩余应收金额 (所有认款的余额 = 认款金额-结转之和)
String receivablesSid = vo.getReceivablesSid();
//查询所有的该应收未收的已提交和已审核的认款
List<FinSelectedReceivablesDetailed> stringList = finSelectedReceivablesDetailedService.selectListByReceivableSid(receivablesSid);
stringList.removeAll(Collections.singleton(null));
if (!stringList.isEmpty()) {
//所有已提交和已审核的认款
BigDecimal bigDecimalVinAll = stringList.stream().map(FinSelectedReceivablesDetailed::getSubscriptionMoney).reduce(BigDecimal.ZERO, BigDecimal::add);
List<String> sidsList = stringList.stream().map(v -> v.getSid()).collect(Collectors.toList());
//查询所有已提交和已审核的认款是否包含结转的
String forwardMoneyAll = finFundsCarriedForwardVehService.selectByBusSid(sidsList);
BigDecimal reveivableMoney = bigDecimalVinAll.subtract(new BigDecimal(forwardMoneyAll));
BigDecimal receivable = new BigDecimal(vo.getReceivable()).subtract(reveivableMoney);
vo.setReceivable(receivable.toString());
}
}
}*/
return pagging;
}
@ -1270,7 +1245,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
* @param userSid
* @return
*/
public ResultBean cashierConfirm(String sid, String userSid) {
public ResultBean cashierConfirmOld(String sid, String userSid) {
ResultBean rb = ResultBean.fireFail();
FinCollectionConfirmation confirmation = fetchBySid(sid);
if (confirmation == null) {
@ -1616,7 +1591,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
}
public ResultBean cashierConfirm11111(String sid, String userSid) {
public ResultBean cashierConfirm(String sid, String userSid) {
ResultBean rb = ResultBean.fireFail();
FinCollectionConfirmation confirmation = fetchBySid(sid);
if (confirmation == null) {
@ -1806,6 +1781,18 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
BigDecimal subscriptionMoneyAll = new BigDecimal("0");
List<FinSelectedReceivablesDetailedVo> finSelectedReceivablesDetailedVos = finSelectedReceivablesDetailedService.fetchByAuditState(sid, 1);
if (finSelectedReceivablesDetailedVos.size() > 0) {
if (confirmation.getPushMessgae() == 1) {//简易订单定金
finSelectedReceivablesDetailedVos.stream().forEach(v -> {
//已选款项明细sid
String selectSid = v.getSid();
FinSelectedReceivablesDetailed finSelectedReceivablesDetailed = finSelectedReceivablesDetailedService.fetchBySid(selectSid);
//更新已选款项明细的审核状态1待审核/2已驳回/3已审核
finSelectedReceivablesDetailed.setAuditState(3);
//更新审核时间
finSelectedReceivablesDetailed.setAuditDate(DateUtil.today());
finSelectedReceivablesDetailedService.updateById(finSelectedReceivablesDetailed);
});
} else {
finSelectedReceivablesDetailedVos.stream().forEach(v -> {
//已选款项明细sid
String selectSid = v.getSid();
@ -1823,7 +1810,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
//更新审核时间
finSelectedReceivablesDetailed.setAuditDate(DateUtil.today());
finSelectedReceivablesDetailedService.updateById(finSelectedReceivablesDetailed);
/*//ToDo:查询是否符合待出库的条件
//ToDo:查询是否符合待出库的条件
//该合同编号下的该车架号的所有认款金额
List<FinSelectedReceivablesDetailedVo> voList = finSelectedReceivablesDetailedService.selectListByVin(v.getContractNo(), finUncollectedReceivablesDetailed.getBusVinSid(), 3);
BigDecimal bigDecimalVinAll = voList.stream().map(FinSelectedReceivablesDetailedVo::getSubscriptionMoney).map(BigDecimal::new).reduce(BigDecimal.ZERO, BigDecimal::add);
@ -1934,9 +1921,10 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
}
}
}*/
}
});
}
//查询该申请已认款金额总数
subscriptionMoneyAll = finSelectedReceivablesDetailedVos.stream().map(FinSelectedReceivablesDetailedVo::getSubscriptionMoney).map(BigDecimal::new).reduce(BigDecimal.ZERO, BigDecimal::add);
}
@ -2480,7 +2468,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
}
public ResultBean saveFinConfirm(FinConfirmDto dto) {
public ResultBean saveFinConfirmOld(FinConfirmDto dto) {
ResultBean rb = ResultBean.fireFail();
FinCollectionConfirmation confirmation = new FinCollectionConfirmation();
BeanUtil.copyProperties(dto, confirmation, "sid");
@ -2510,6 +2498,60 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
return rb.success();
}
public ResultBean saveFinConfirm(FinConfirmDto dto) {
ResultBean rb = ResultBean.fireFail();
FinCollectionConfirmation confirmation = new FinCollectionConfirmation();
BeanUtil.copyProperties(dto, confirmation, "sid");
confirmation.setBalance(BigDecimal.ZERO);
baseMapper.insert(confirmation);
AppBusDepositBuscenterDetailVo busDeposit = busDepositFeign.getDepositInfoDetails(confirmation.getBusSid()).getData();
//根据简易订单的付款人创建客户
AppCrmCustomerTempDto crmCustomerTemp = new AppCrmCustomerTempDto();
//付款人
crmCustomerTemp.setName(busDeposit.getPayName());
crmCustomerTemp.setMobile(busDeposit.getPhone());
crmCustomerTemp.setUserSid(confirmation.getCreateBySid());
crmCustomerTemp.setOrgPath(busDeposit.getOrgSidPath());
crmCustomerTemp.setCustomerType("个人");
crmCustomerTemp.setCustomerTypeKey("1");
String mobile = busDeposit.getPhone();
String name = busDeposit.getPayName();
crmCustomerTemp.setMobile(mobile);
crmCustomerTemp.setName(name);
crmCustomerTemp.setIsOnRemindkey("0");
crmCustomerTemp.setIsOnRemind("否");
ResultBean<String> crmResultBean = crmCustomerTempFeign.saveOrUpdateAppCustomerTemp(crmCustomerTemp);
FinSelectedReceivablesDetailed finSelectedReceivablesDetailed = new FinSelectedReceivablesDetailed();
finSelectedReceivablesDetailed.setCollSid(confirmation.getSid());
finSelectedReceivablesDetailed.setReceivablesName("订金");
finSelectedReceivablesDetailed.setSubscribedOf(1);
finSelectedReceivablesDetailed.setAuditState(1);
finSelectedReceivablesDetailed.setCustomerName(crmCustomerTemp.getName());
finSelectedReceivablesDetailed.setCustomerPhone(crmCustomerTemp.getMobile());
finSelectedReceivablesDetailed.setCustomerSid(crmResultBean.getData());
finSelectedReceivablesDetailed.setCreateByName(busDeposit.getStaffName());
finSelectedReceivablesDetailed.setCurrentReceivableMoney(confirmation.getCollectionMoney());
finSelectedReceivablesDetailed.setSubscriptionMoney(confirmation.getCollectionMoney());
finSelectedReceivablesDetailed.setUseOrgSid(confirmation.getUseOrgSid());
finSelectedReceivablesDetailed.setSubscriptionDate(DateUtil.today());
finSelectedReceivablesDetailedService.insert(finSelectedReceivablesDetailed);
if (StringUtils.isNotBlank(confirmation.getPaymentVoucherUrl())) {
//添加进附件表
List<String> stringList = Arrays.asList(confirmation.getPaymentVoucherUrl().split(","));
//附件保存:打款凭证附件
stringList.stream().forEach(v -> {
CommonAppendixDto commonAppendixDto = new CommonAppendixDto();
commonAppendixDto.setFilePath(v);
commonAppendixDto.setFileName(CommonAttachTypeEnum.PAYMENT_VOUCHER.getMark());
commonAppendixDto.setLinkSid(confirmation.getSid());
commonAppendixDto.setCreateBySid(confirmation.getCreateBySid());
commonAppendixDto.setAttachType(CommonAttachTypeEnum.PAYMENT_VOUCHER.getAttachType());
commonAppendixFeign.save(commonAppendixDto);
});
}
return rb.success();
}
public ResultBean<List<String>> billNoList() {
ResultBean<List<String>> rb = ResultBean.fireFail();
List<String> stringList = baseMapper.billNoList();

3
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedMapper.xml
View File

@ -284,9 +284,10 @@
</select>
<select id="selectByVinSid" resultType="java.lang.String">
select sum(fd.balance)
select cast((sum(fd.`subscriptionMoney`) - COALESCE(SUM(f.`thisUseMoney`), 0)) AS DECIMAL (10, 2) ) AS dbalance
from fin_selected_receivables_detailed fd
left join fin_uncollected_receivables_detailed ff on ff.sid = fd.receivablesSid
LEFT JOIN `fin_funds_carried_forward_veh` f ON f.`busSid` = fd.`sid`
where ff.busVinSid = #{busVinSid}
and fd.auditState = 3
</select>

8
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedMapper.xml
View File

@ -59,7 +59,7 @@
furd.customerName AS `customerName`,
furd.customerSid,
furd.useOrgSid,
(furd.`reveivableMoney` - COALESCE(df.dbalance, 0)) AS currentReceivableMoney,
cast((furd.`reveivableMoney` - COALESCE(df.dbalance, 0)) AS DECIMAL (10, 2) ) AS currentReceivableMoney,
furd.reveivableMoney,
furd.contractSid,
if(bv.linkNo is null or LENGTH(trim(bv.linkNo)) &lt; 1,
@ -76,12 +76,10 @@
SELECT d.sid,
d.receivablesSid,
d.`collSid`,
(
sum(d.`subscriptionMoney`) - COALESCE(SUM(f.`thisUseMoney`), 0)) AS dbalance
cast((sum(d.`subscriptionMoney`) - COALESCE(SUM(f.`thisUseMoney`), 0)) AS DECIMAL (10, 2)) AS dbalance
FROM fin_selected_receivables_detailed d
LEFT JOIN `fin_funds_carried_forward_veh` f ON f.`busSid` = d.`sid`
where d.auditState = 1
or d.auditState = 3
where (d.auditState = 1 or d.auditState = 3)
GROUP BY d.`receivablesSid`
) df ON df.receivablesSid = furd.`sid`
<where>

Write Preview
Loading…
Cancel
Save