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

Merge remote-tracking branch 'origin/master'

zhanglei
God 3 years ago
parent
3e4b6da7d3 f2e3816f15
commit
bb83cf2d0b
4 changed files with 28 additions and 7 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/busmaindeposit/app/AppBusMainDepositOrderQuery.java
  2. 8
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busmaindeposit/BusMainDepositService.java
  3. 22
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordermakeup/BusSalesOrderMakeupService.java
  4. 3
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/model/DepositListQuery.java

2
anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busmaindeposit/app/AppBusMainDepositOrderQuery.java
View File

@ -13,7 +13,7 @@ import lombok.Data;
public class AppBusMainDepositOrderQuery implements Query {
private static final long serialVersionUID = 635103059073828392L;
@ApiModelProperty(value = "虚拟订单编号/客户名称/电话")
private String name;
private String names;
@ApiModelProperty(value = "用户sid")
private String userSid;

8
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busmaindeposit/BusMainDepositService.java
View File

@ -1685,7 +1685,7 @@ public class BusMainDepositService extends MybatisBaseService<BusMainDepositMapp
AppBusMainDepositOrderQuery query = pagerQuery.getParams();
QueryWrapper<BusMainDeposit> qw = createOrderAppPageWrapper(query);
IPage<BusMainDeposit> page = PagerUtil.queryToPage(pagerQuery);
IPage<AppBusMainDepositOrderVo> pagging = baseMapper.pageAppList(page, qw, query.getName());
IPage<AppBusMainDepositOrderVo> pagging = baseMapper.pageAppList(page, qw, query.getNames());
List<AppBusMainDepositOrderVo> list = pagging.getRecords();
list.removeAll(Collections.singleton(null));
if (!list.isEmpty()) {
@ -2185,7 +2185,7 @@ public class BusMainDepositService extends MybatisBaseService<BusMainDepositMapp
ResultBean<List<LatestTaskVo>> listResultBean = flowTaskFeign.getLatestTasks(procId);
String nextNodeUserSids = listResultBean.getData().get(0).getASSIGNEE_();
List<String> receiveSidList = Arrays.asList(nextNodeUserSids.split(","));
if (receiveSidList.size() == 1 && receiveSidList.get(0).equals(busMainDeposit.get().getStaffSid())) {
if (receiveSidList.size() == 1 && receiveSidList.get(0).equals(busMainDeposit.get().getCreateBySid())) {
messageFlowableQuery.setMsgContent("您提交的" + messageFlowableQuery.getModuleName() + "已被驳回,请重新提交");
} else {
messageFlowableQuery.setMsgContent(busMainDeposit.get().getStaffName() + "提交的" + messageFlowableQuery.getModuleName() + ",请审批");
@ -2197,7 +2197,7 @@ public class BusMainDepositService extends MybatisBaseService<BusMainDepositMapp
ResultBean<List<LatestTaskVo>> listResultBean = flowTaskFeign.getLatestTasks(procId);
String nextNodeUserSids = listResultBean.getData().get(0).getASSIGNEE_();
List<String> receiveSidList = Arrays.asList(nextNodeUserSids.split(","));
if (receiveSidList.size() == 1 && receiveSidList.get(0).equals(busMainDeposit.get().getStaffSid())) {
if (receiveSidList.size() == 1 && receiveSidList.get(0).equals(busMainDeposit.get().getCreateBySid())) {
//更新已选择的车架号的状态为未锁定
AppBusDepositVehicleDetailVo appBusDepositVehicleDetailVo = busDepositVehicleService.getReserveCarDetails(query.getBusinessSid()).getData();
List<String> list = appBusDepositVehicleDetailVo.getVehicleList().stream().map(AppBusDepositVehicleListVo::getCarSid).collect(Collectors.toList()).stream().distinct().collect(Collectors.toList());
@ -2240,7 +2240,7 @@ public class BusMainDepositService extends MybatisBaseService<BusMainDepositMapp
ResultBean<List<LatestTaskVo>> listResultBean = flowTaskFeign.getLatestTasks(procId);
String nextNodeUserSids = listResultBean.getData().get(0).getASSIGNEE_();
List<String> receiveSidList = Arrays.asList(nextNodeUserSids.split(","));
if (receiveSidList.size() == 1 && receiveSidList.get(0).equals(busMainDeposit.getStaffSid())) {
if (receiveSidList.size() == 1 && receiveSidList.get(0).equals(busMainDeposit.getCreateBySid())) {
//更新已选择的车架号的状态为未锁定
AppBusDepositVehicleDetailVo appBusDepositVehicleDetailVo = busDepositVehicleService.getReserveCarDetails(query.getBusinessSid()).getData();
List<String> list = appBusDepositVehicleDetailVo.getVehicleList().stream().map(AppBusDepositVehicleListVo::getCarSid).collect(Collectors.toList()).stream().distinct().collect(Collectors.toList());

22
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordermakeup/BusSalesOrderMakeupService.java
View File

@ -150,13 +150,18 @@ public class BusSalesOrderMakeupService extends MybatisBaseService<BusSalesOrder
bigDecimal = bigDecimal.add(new BigDecimal(dto.getTopPrice()));
bigDecimal1 = bigDecimal1.add(new BigDecimal(dto.getTopPrice()));
}
//查询是否有销售订单的价格信息。若有则更新销售指导价、销售成交价
//查询是否有销售订单的价格信息。若有则更新销售指导价、销售成交价、车价合计
BusSalesOrderPrice price = busSalesOrderPriceService.selectBySalesOrderSid(salesOrderSid);
if (price != null) {
if (!"0".equals(bigDecimal.toString())) {
if (!"0".equals(bigDecimal1.toString())) {
price.setSingleFinalPrice(bigDecimal1);
price.setSingleGuildPrice(bigDecimal);
if(price.getQuantity() == null){
price.setPriceSum(bigDecimal1);
}else{
price.setPriceSum(bigDecimal1.multiply(new BigDecimal(price.getQuantity())));
}
busSalesOrderPriceService.updateById(price);
} else {
price.setSingleGuildPrice(bigDecimal);
@ -165,6 +170,11 @@ public class BusSalesOrderMakeupService extends MybatisBaseService<BusSalesOrder
} else {
if (!"0".equals(bigDecimal1.toString())) {
price.setSingleFinalPrice(bigDecimal1);
if(price.getQuantity() == null){
price.setPriceSum(bigDecimal1);
}else{
price.setPriceSum(bigDecimal1.multiply(new BigDecimal(price.getQuantity())));
}
busSalesOrderPriceService.updateById(price);
}
}
@ -175,6 +185,11 @@ public class BusSalesOrderMakeupService extends MybatisBaseService<BusSalesOrder
if (!"0".equals(bigDecimal1.toString())) {
price.setSingleFinalPrice(bigDecimal1);
price.setSingleGuildPrice(bigDecimal);
if(price.getQuantity() == null){
price.setPriceSum(bigDecimal1);
}else{
price.setPriceSum(bigDecimal1.multiply(new BigDecimal(price.getQuantity())));
}
busSalesOrderPriceService.save(price);
} else {
price.setSingleGuildPrice(bigDecimal);
@ -183,6 +198,11 @@ public class BusSalesOrderMakeupService extends MybatisBaseService<BusSalesOrder
} else {
if (!"0".equals(bigDecimal1.toString())) {
price.setSingleFinalPrice(bigDecimal1);
if(price.getQuantity() == null){
price.setPriceSum(bigDecimal1);
}else{
price.setPriceSum(bigDecimal1.multiply(new BigDecimal(price.getQuantity())));
}
busSalesOrderPriceService.save(price);
}
}

3
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/model/DepositListQuery.java
View File

@ -1,5 +1,6 @@
package com.yxt.anrui.terminal.api.autoservice.saleOrders.model;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.yxt.common.core.query.Query;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@ -14,7 +15,7 @@ public class DepositListQuery implements Query {
private static final long serialVersionUID = -2214864083626340077L;
@ApiModelProperty(value = "虚拟订单编号/客户名称/电话/车型名称")
private String name;
private String names;
@ApiModelProperty(value = "用户sid")
private String userSid;

Write Preview
Loading…
Cancel
Save