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

修改

master
dimengzhe 2 years ago
parent
acac8c4201
commit
1c3af4bc2b
5 changed files with 142 additions and 5 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. 19
      anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/order/AppOrderPriceInfoVo.java
  2. 104
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java
  3. 5
      anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/flow/app/FlowTaskFinishVo.java
  4. 1
      anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/flow/FlowableService.java
  5. 18
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/order/OrderPriceInfoVo.java

19
anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/order/AppOrderPriceInfoVo.java
View File

@ -35,4 +35,23 @@ public class AppOrderPriceInfoVo implements Vo {
@ApiModelProperty("xx日期限内")
private String payDepositDays;
@ApiModelProperty("挂车价格")
private String gcPrice;
@ApiModelProperty("上装价格")
private String szPrice;
@ApiModelProperty("价格折让（元/台）")
private String priceDiscount;
@ApiModelProperty("中介返利（元/台）")
private String zjReturnPrice;
@ApiModelProperty("优惠套餐（元/台）")
private String pkgPrice;
@ApiModelProperty("实际成交价（元/台）")
private String realPrice;
@ApiModelProperty("差额")
private String diffPrice;
}

104
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java
View File

@ -2802,6 +2802,24 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
return rb.setMsg("订金信息存在错误，请检查");
}
}
if ("2".equals(busSalesOrder.getFinancePlan()) || "2".equals(busSalesOrder.getPayTypeKey())) {
//根据销售订单sid查询金融方案
ResultBean<SolutionsDetailsVo> solutionsDetailsVoResultBean = loanSolutionsFeign.selectDetailss(sid);
SolutionsDetailsVo solutionsDetailsVo = solutionsDetailsVoResultBean.getData();
if (solutionsDetailsVo != null) {
if (StringUtils.isNotBlank(solutionsDetailsVo.getTypeKey())) {
if (!"02".equals(solutionsDetailsVo.getTypeKey())) {
//判断实收和单台订金
if(new BigDecimal(solutionsDetailsVo.getRealTotal()).compareTo(busSalesOrderDeposit.getDeposit())<0){
return rb.setMsg("金融方案中实收金额小于单台订金");
}
}
} else {//担保贷款
return rb.setMsg("金融方案中实收金额小于单台订金");
}
}
}
return rb.success();
}
@ -3178,6 +3196,7 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
vo.setPriceInfo(priceInfo);
}
/***************************上装信息***************************************/
String topPriice = "￥0";
if (BusSalesOrderConstantUtils.TopType.YES.getCode().equals(busSalesOrder.getIsTop())) {
AppOrderTopInfoVo topInfo = busSalesOrderMakeupService.selectTop(sid);
if (topInfo != null) {
@ -3195,6 +3214,7 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
topInfo.setTopBean(topInfo.getTopBean() + "\n\n" + "备注：" + topInfo.getRemarks());
}
vo.setTopInfo(topInfo);
topPriice = "￥"+topInfo.getTopPrice();
}
BusSalesOrderMakeup busSalesOrderMakeup = busSalesOrderMakeupService.detailsss(sid);
String topMessage = "";
@ -3256,17 +3276,21 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
vo.setTotaldiscount(bigDecimalAll.toString());
}
/*************************返利信息*******************************************/
BigDecimal zjAll = BigDecimal.ZERO;
BusSalesOrderSubmit busSalesOrderSubmit = busSalesOrderSubmitService.selectBySaleOrderSid(sid);
if (busSalesOrderSubmit != null) {
//内部推荐人
if (StringUtils.isNotBlank(busSalesOrderSubmit.getName())) {
vo.setRecommender(busSalesOrderSubmit.getName());
}
//中介返利（元/台）
String zjReturnPrice = "";
if (StringUtils.isNotBlank(busSalesOrderSubmit.getDistributorName())) {
SubmitVo submitVo = new SubmitVo();
submitVo.setIntermediaryName(busSalesOrderSubmit.getDistributorName());
submitVo.setIntermediaryMobile(busSalesOrderSubmit.getDistributorMobile());
if (busSalesOrderSubmit.getDistributorPrice() != null) {
zjAll = zjAll.add(busSalesOrderSubmit.getDistributorPrice());
submitVo.setAgencyFee(busSalesOrderSubmit.getDistributorPrice().toString());
if (priceInfo != null) {
submitVo.setAgencyFeeTotal(busSalesOrderSubmit.getDistributorPrice().multiply(new BigDecimal(priceInfo.getNumber())).toString());
@ -3280,6 +3304,7 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
submitVo.setIntermediaryName(busSalesOrderSubmit.getDistributorNameTwo());
submitVo.setIntermediaryMobile(busSalesOrderSubmit.getDistributorMobileTwo());
if (busSalesOrderSubmit.getDistributorPriceTwo() != null) {
zjAll = zjAll.add(busSalesOrderSubmit.getDistributorPriceTwo());
submitVo.setAgencyFee(busSalesOrderSubmit.getDistributorPriceTwo().toString());
if (priceInfo != null) {
submitVo.setAgencyFeeTotal(busSalesOrderSubmit.getDistributorPriceTwo().multiply(new BigDecimal(priceInfo.getNumber())).toString());
@ -3287,6 +3312,17 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
}
vo.setIntermediary2(submitVo);
}
if (priceInfo != null) {
if(zjAll.compareTo(BigDecimal.ZERO)>0){
//如果中介返利小于0，乘以-1
zjAll = zjAll.multiply(new BigDecimal(-1));
zjReturnPrice = "-￥"+zjAll.toString();
}else{
zjReturnPrice = "￥"+zjAll.toString();
}
priceInfo.setZjReturnPrice(zjReturnPrice);
}
}
//计算单台折让
BigDecimal bigDecimalSing = new BigDecimal("0");
@ -3330,8 +3366,14 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
list.removeAll(Collections.singleton(null));
List<String> stringList = new ArrayList<>();
if (!list.isEmpty()) {
for (BusDepositFictitiousDetailsVo v : list) {
String b = "编号为" + v.getDepositBillNo() + "简易订单订金转入" + v.getPrice() + "元，";
for (int j = 0;j<list.size();j++) {
BusDepositFictitiousDetailsVo v = list.get(j);
String b = "";
if(j == list.size() - 1){
b = "编号为" + v.getDepositBillNo() + "简易订单订金转入" + v.getPrice() + "元。";
}else{
b = "编号为" + v.getDepositBillNo() + "简易订单订金转入" + v.getPrice() + "元，";
}
a = a + b;
if (StringUtils.isNotBlank(v.getPayPath())) {
List<String> payPathList = Arrays.asList(v.getPayPath().split(","));
@ -3340,7 +3382,7 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
}
}
}
a = a + "原订金额度使用完后，其收据自动作废。";
// a = a + "原订金额度使用完后，其收据自动作废。";
depositInfo.setDepositRemarks(a);
depositInfo.setImages(stringList);
}
@ -3364,6 +3406,62 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
}
// vo = selectSolution(vo, sid);
vo = selectSolutions(vo, sid);
//===============================================
//挂车价格（金融方案中取）
ResultBean<SolutionsDetailsVo> solutionsDetailsVoResultBean = loanSolutionsFeign.selectDetailss(sid);
List<OrderSolutionVo> list = new ArrayList<>();
if (solutionsDetailsVoResultBean.getData() != null) {
SolutionsDetailsVo solutionsDetailsVo = solutionsDetailsVoResultBean.getData();
//挂车
if (StringUtils.isNotBlank(solutionsDetailsVo.getTrailerAmount())) {
if(priceInfo != null){
priceInfo.setGcPrice(solutionsDetailsVo.getTrailerAmount());
}
}else{
priceInfo.setGcPrice("￥0");
}
}
if(priceInfo != null){
priceInfo.setSzPrice(topPriice);
//价格折让 = 销售合同价（整体成交价）-销售指导价（整体指导价）
//销售合同价-销售指导价
BigDecimal all = new BigDecimal(priceInfo.getSingleFinalPrice()).subtract(new BigDecimal(priceInfo.getSingleGuildPrice()));
String priceAll = "";
if(all.compareTo(BigDecimal.ZERO) <0){
//如果价格折让小于0，乘以-1
all = all.multiply(new BigDecimal(-1));
priceAll = "-￥"+all.toString();
}else{
priceAll = "￥"+all.toString();
}
priceInfo.setPriceDiscount(priceAll);
//优惠套餐 = 优惠套餐总额/台数（保留到个位）
String pkgPrice = "";
BigDecimal oneAll = BigDecimal.ZERO;
if(StringUtils.isNotBlank(vo.getTotaldiscount())){
//总优惠/台数
oneAll = new BigDecimal(vo.getTotaldiscount()).divide(new BigDecimal(priceInfo.getNumber()));
if(oneAll.compareTo(BigDecimal.ZERO) >0){
//如果小于0，乘以-1
oneAll = oneAll.multiply(new BigDecimal(-1));
pkgPrice = "-￥"+oneAll.toString();
}else{
pkgPrice = "￥"+oneAll.toString();
}
priceInfo.setPkgPrice(pkgPrice);
}
//实际成交 = 销售指导价-价格折让-中介返利-优惠套餐
BigDecimal realAll = BigDecimal.ZERO;
realAll = realAll.add(new BigDecimal(priceInfo.getSingleGuildPrice())).add(all).add(zjAll.multiply(new BigDecimal(-1))).add(oneAll.multiply(new BigDecimal(-1)));
priceInfo.setRealPrice("￥"+realAll.toString());
//差额 = 实际成交价-销售指导价
BigDecimal diffAll = BigDecimal.ZERO;
diffAll = realAll.subtract(new BigDecimal(priceInfo.getSingleGuildPrice()));
priceInfo.setDiffPrice(diffAll.toString());
}
return rb.success().setData(vo);
}

5
anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/flow/app/FlowTaskFinishVo.java
View File

@ -59,4 +59,9 @@ public class FlowTaskFinishVo implements Vo {
@ApiModelProperty("流程名称")
private String flowableName;
@ApiModelProperty("业务sid")
private String businessSid;
@ApiModelProperty("发起人sid")
@JsonProperty("createUserSid")
private String startUserSid;
}

1
anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/flow/FlowableService.java
View File

@ -656,6 +656,7 @@ public class FlowableService extends MybatisBaseService<FlowableMapper, Flowable
for (int i = 0; i < voList.size(); i++) {
FlowTaskFinishVo f = voList.get(i);
Map<String, Object> flowMap = f.getProcessVariables();
f.setBusinessSid(flowMap.get("businessSid").toString());
Map<String, Object> appMap = ConstantUtils.getMap(flowMap, "app");
String json = JSONObject.toJSONString(appMap);
AppVo appVo = new AppVo();

18
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/order/OrderPriceInfoVo.java
View File

@ -31,7 +31,21 @@ public class OrderPriceInfoVo implements Vo {
@ApiModelProperty("单台整体成交价")
@JsonProperty("overallPrice")
private String singleFinalPrice;
//单车折让
@ApiModelProperty("单车折让")
private String singleCarDiscountPrice;
@ApiModelProperty("挂车价格")
private String gcPrice;
@ApiModelProperty("上装价格")
private String szPrice;
@ApiModelProperty("价格折让（元/台）")
private String priceDiscount;
@ApiModelProperty("中介返利（元/台）")
private String zjReturnPrice;
@ApiModelProperty("优惠套餐（元/台）")
private String pkgPrice;
@ApiModelProperty("实际成交价（元/台）")
private String realPrice;
@ApiModelProperty("差额")
private String diffPrice;
}

Write Preview
Loading…
Cancel
Save