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

优化

master
dimengzhe 2 years ago
parent
f763cded61
commit
663c7b00ac
2 changed files with 61 additions and 52 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. 3
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordermodel/BusSalesOrderModelService.java
  2. 110
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java

3
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordermodel/BusSalesOrderModelService.java
View File

@ -695,6 +695,9 @@ public class BusSalesOrderModelService extends MybatisBaseService<BusSalesOrderM
return rb.setMsg("采购数量不能为空");
}
num = Integer.parseInt(dto.getArrangeNumber());
busSalesOrder.setPurchaseSystemName("");
busSalesOrder.setPurchaseSystemSid("");
busSalesOrderService.updateById(busSalesOrder);
}
//新增或更新价格信息中的台数及单台销售指导价
BigDecimal bigDecimalPrice = new BigDecimal(dto.getGuildPrice());

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

@ -1178,7 +1178,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
* @param userSid
* @return
*/
public ResultBean cashierConfirm(String sid, String userSid) {
public ResultBean cashierConfirm111(String sid, String userSid) {
ResultBean rb = ResultBean.fireFail();
FinCollectionConfirmation confirmation = fetchBySid(sid);
if (confirmation == null) {
@ -1945,7 +1945,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
}
//备份
public ResultBean cashierConfirm1(String sid, String userSid) {
public ResultBean cashierConfirm(String sid, String userSid) {
ResultBean rb = ResultBean.fireFail();
FinCollectionConfirmation confirmation = fetchBySid(sid);
if (confirmation == null) {
@ -2018,7 +2018,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
finSelectedReceivablesDetailedVos1_1_2.size() == 0) {
one = true;
}
fullPaymentPushCar(confirmation, arReceivebill, carSize, finSelectedReceivablesDetailedVos1, freceivebillentry, one, orgCode);
carSize = fullPaymentPushCar(confirmation, arReceivebill, carSize, finSelectedReceivablesDetailedVos1, freceivebillentry, one, orgCode);
}
//全款推送车款（首付款及费用）
if (finSelectedReceivablesDetailedVos1_1_1.size() > 0) {
@ -2031,7 +2031,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
finSelectedReceivablesDetailedVos1_1_2.size() == 0) {
one = true;
}
fullPaymentPushCarFirst(confirmation, arReceivebill, carSize, finSelectedReceivablesDetailedVos1_1_1, freceivebillentry, one, orgCode);
carSize = fullPaymentPushCarFirst(confirmation, arReceivebill, carSize, finSelectedReceivablesDetailedVos1_1_1, freceivebillentry, one, orgCode);
}
//全款推送订金
@ -2045,7 +2045,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
finSelectedReceivablesDetailedVos1_1_2.size() == 0) {
one = true;
}
fullPaymentPushDeposit(confirmation, arReceivebill, carSize, finSelectedReceivablesDetailedVos2, freceivebillentry, one, orgCode);
carSize = fullPaymentPushDeposit(confirmation, arReceivebill, carSize, finSelectedReceivablesDetailedVos2, freceivebillentry, one, orgCode);
}
//担保贷款推送车款
@ -2059,7 +2059,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
finSelectedReceivablesDetailedVos1_1_2.size() == 0) {
one = true;
}
loanPushCar(confirmation, arReceivebill, carSize, finSelectedReceivablesDetailedVos1_1, freceivebillentry, one, orgCode);
carSize = loanPushCar(confirmation, arReceivebill, carSize, finSelectedReceivablesDetailedVos1_1, freceivebillentry, one, orgCode);
}
//担保贷款推送车款（首付款及费用）
if (finSelectedReceivablesDetailedVos1_1_2.size() > 0) {
@ -2072,7 +2072,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
finSelectedReceivablesDetailedVos1_1_2.size() == 1) {
one = true;
}
loanPushCarFirst(confirmation, arReceivebill, carSize, finSelectedReceivablesDetailedVos1_1_2, freceivebillentry, one, orgCode);
carSize = loanPushCarFirst(confirmation, arReceivebill, carSize, finSelectedReceivablesDetailedVos1_1_2, freceivebillentry, one, orgCode);
}
//担保贷款推送订金
if (finSelectedReceivablesDetailedVos2_1.size() > 0) {
@ -2085,7 +2085,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
finSelectedReceivablesDetailedVos1_1_2.size() == 0) {
one = true;
}
loanPushDeposit(confirmation, arReceivebill, carSize, finSelectedReceivablesDetailedVos2_1, freceivebillentry, one, orgCode);
carSize = loanPushDeposit(confirmation, arReceivebill, carSize, finSelectedReceivablesDetailedVos2_1, freceivebillentry, one, orgCode);
}
//简易订单-订金收取
@ -3138,13 +3138,13 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
}
//全款推送车款
public void fullPaymentPushCar(FinCollectionConfirmation confirmation,
ARReceivebill arReceivebill,
int carSize,
List<FinSelectedReceivablesDetailedVo> finSelectedReceivablesDetailedVos1,
ARReceivebill.FRECEIVEBILLENTRY freceivebillentry,
boolean one,
String orgCode) {
public int fullPaymentPushCar(FinCollectionConfirmation confirmation,
ARReceivebill arReceivebill,
int carSize,
List<FinSelectedReceivablesDetailedVo> finSelectedReceivablesDetailedVos1,
ARReceivebill.FRECEIVEBILLENTRY freceivebillentry,
boolean one,
String orgCode) {
String sid = confirmation.getSid();
//推送全款车款
//查询该收款单的所有已选明细：车款-待审核-全款
@ -3221,16 +3221,17 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
}
ResultBean resultBean1 = arReceivebillService.draftArReceivebill(arReceivebill);
}
return carSize;
}
//全款推送车款（首付款）
public void fullPaymentPushCarFirst(FinCollectionConfirmation confirmation,
ARReceivebill arReceivebill,
int carSize,
List<FinSelectedReceivablesDetailedVo> finSelectedReceivablesDetailedVos1_1_1,
ARReceivebill.FRECEIVEBILLENTRY freceivebillentry,
boolean one,
String orgCode) {
public int fullPaymentPushCarFirst(FinCollectionConfirmation confirmation,
ARReceivebill arReceivebill,
int carSize,
List<FinSelectedReceivablesDetailedVo> finSelectedReceivablesDetailedVos1_1_1,
ARReceivebill.FRECEIVEBILLENTRY freceivebillentry,
boolean one,
String orgCode) {
String sid = confirmation.getSid();
//查询该收款单的所有已选明细：首付款及费用-待审核-全款
List<FinSelectedReceivablesDetailedVo> voListv =
@ -3301,22 +3302,23 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
if (one) {
arReceivebill.setFBillNo(confirmation.getBillNo());
} else {
carSize = i + 1;
carSize = carSize + 1;
arReceivebill.setFBillNo(confirmation.getBillNo() + "-" + carSize);
}
ResultBean resultBean1 = arReceivebillService.draftArReceivebill(arReceivebill);
}
return carSize;
}
//全款推送订金
public void fullPaymentPushDeposit(FinCollectionConfirmation confirmation,
ARReceivebill arReceivebill,
int carSize,
List<FinSelectedReceivablesDetailedVo> finSelectedReceivablesDetailedVos2,
ARReceivebill.FRECEIVEBILLENTRY freceivebillentry,
boolean one,
String orgCode) {
public int fullPaymentPushDeposit(FinCollectionConfirmation confirmation,
ARReceivebill arReceivebill,
int carSize,
List<FinSelectedReceivablesDetailedVo> finSelectedReceivablesDetailedVos2,
ARReceivebill.FRECEIVEBILLENTRY freceivebillentry,
boolean one,
String orgCode) {
String sid = confirmation.getSid();
//查询该收款单的所有已选明细：首付款及费用-待审核-全款
List<FinSelectedReceivablesDetailedVo> voListv =
@ -3379,21 +3381,22 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
if (one) {
arReceivebill.setFBillNo(confirmation.getBillNo());
} else {
carSize = i + 1;
carSize = carSize + 1;
arReceivebill.setFBillNo(confirmation.getBillNo() + "-" + carSize);
}
ResultBean resultBean1 = arReceivebillService.draftArReceivebill(arReceivebill);
}
return carSize;
}
//担保贷款推送车款
public void loanPushCar(FinCollectionConfirmation confirmation,
ARReceivebill arReceivebill,
int carSize,
List<FinSelectedReceivablesDetailedVo> finSelectedReceivablesDetailedVos1_1,
ARReceivebill.FRECEIVEBILLENTRY freceivebillentry,
boolean one,
String orgCode) {
public int loanPushCar(FinCollectionConfirmation confirmation,
ARReceivebill arReceivebill,
int carSize,
List<FinSelectedReceivablesDetailedVo> finSelectedReceivablesDetailedVos1_1,
ARReceivebill.FRECEIVEBILLENTRY freceivebillentry,
boolean one,
String orgCode) {
String sid = confirmation.getSid();
List<ARReceivebill.FRECEIVEBILLENTRY> fEntityList = new ArrayList<>();
for (int i = 0; i < finSelectedReceivablesDetailedVos1_1.size(); i++) {
@ -3440,16 +3443,17 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
ResultBean resultBean1 = arReceivebillService.draftArReceivebill(arReceivebill);
}
return carSize;
}
//担保贷款推送车款（首付款）
public void loanPushCarFirst(FinCollectionConfirmation confirmation,
ARReceivebill arReceivebill,
int carSize,
List<FinSelectedReceivablesDetailedVo> finSelectedReceivablesDetailedVos1_1_2,
ARReceivebill.FRECEIVEBILLENTRY freceivebillentry,
boolean one,
String orgCode) {
public int loanPushCarFirst(FinCollectionConfirmation confirmation,
ARReceivebill arReceivebill,
int carSize,
List<FinSelectedReceivablesDetailedVo> finSelectedReceivablesDetailedVos1_1_2,
ARReceivebill.FRECEIVEBILLENTRY freceivebillentry,
boolean one,
String orgCode) {
String sid = confirmation.getSid();
List<ARReceivebill.FRECEIVEBILLENTRY> fEntityList = new ArrayList<>();
for (int i = 0; i < finSelectedReceivablesDetailedVos1_1_2.size(); i++) {
@ -3496,16 +3500,17 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
ResultBean resultBean1 = arReceivebillService.draftArReceivebill(arReceivebill);
}
return carSize;
}
//担保贷款推送订金
public void loanPushDeposit(FinCollectionConfirmation confirmation,
ARReceivebill arReceivebill,
int carSize,
List<FinSelectedReceivablesDetailedVo> finSelectedReceivablesDetailedVos2_1,
ARReceivebill.FRECEIVEBILLENTRY freceivebillentry,
boolean one,
String orgCode) {
public int loanPushDeposit(FinCollectionConfirmation confirmation,
ARReceivebill arReceivebill,
int carSize,
List<FinSelectedReceivablesDetailedVo> finSelectedReceivablesDetailedVos2_1,
ARReceivebill.FRECEIVEBILLENTRY freceivebillentry,
boolean one,
String orgCode) {
String sid = confirmation.getSid();
List<ARReceivebill.FRECEIVEBILLENTRY> fEntityList = new ArrayList<>();
for (int i = 0; i < finSelectedReceivablesDetailedVos2_1.size(); i++) {
@ -3547,6 +3552,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
ResultBean resultBean1 = arReceivebillService.draftArReceivebill(arReceivebill);
}
return carSize;
}
private BdCustomer createBdCustomer1(String useOrgSid, String name, String contractNo, String collSid, String vinNo) {

Write Preview
Loading…
Cancel
Save