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

销售订单-完善采购订单内容的验证

zhanglei
dimengzhe 3 years ago
parent
22d4cf0f38
commit
e547d58593
2 changed files with 36 additions and 22 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. 43
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java
  2. 15
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesvehicleorder/BusSalesVehicleOrderService.java

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

@ -311,6 +311,7 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
* @param dto 数据传输对象
* @return
*/
@Transactional(rollbackFor = Exception.class)
public ResultBean<String> saveOrUpdateOrder(BusSalesOrderAllDto dto) {
ResultBean<String> rb = ResultBean.fireFail();
String sid = dto.getSid();
@ -348,12 +349,20 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
} else if ("2".equals(dto.getType())) {
//采购订单
List<BusSalesVehicleOrderDto> busSalesVehicleOrderList = dto.getBusSalesVehicleOrderList();
for (int i = 0; i < busSalesVehicleOrderList.size(); i++) {
if(busSalesVehicleOrderList.get(i).getUsingNum()>busSalesVehicleOrderList.get(i).getUseNum()){
return rb.setMsg("本次使用台数不允许大于可使用台数");
if(busSalesVehicleOrderList.size()>0){
for (int i = 0; i < busSalesVehicleOrderList.size(); i++) {
if(busSalesVehicleOrderList.get(i) != null){
if(busSalesVehicleOrderList.get(i).getUsingNum()>busSalesVehicleOrderList.get(i).getUseNum()){
return rb.setMsg("本次使用台数不允许大于可使用台数");
}
vehicleNum = vehicleNum + busSalesVehicleOrderList.get(i).getUsingNum();
}else{
return rb.setMsg("请选择采购订单数据");
}
}
vehicleNum = vehicleNum + busSalesVehicleOrderList.get(i).getUsingNum();
}
} else {
vehicleNum = quantity;
}
@ -458,8 +467,8 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
}
return rb.success();
}
private void updateOrder(BusSalesOrderAllDto dto) {
@Transactional(rollbackFor = Exception.class)
public void updateOrder(BusSalesOrderAllDto dto) {
//主车车型信息
BusSalesOrderModelDto busSalesOrderModelDto = dto.getBusSalesOrderModel();
//现车车辆信息
@ -534,7 +543,7 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
}
@Transactional(rollbackFor = Exception.class)
public String save(BusSalesOrderAllDto dto) {
//主车车型信息
BusSalesOrderModelDto busSalesOrderModelDto = dto.getBusSalesOrderModel();
@ -600,7 +609,7 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
return sid;
}
@Transactional(rollbackFor = Exception.class)
public ResultBean submit(BusSalesOrderAllDto dto) {
ResultBean rb = ResultBean.fireFail();
String orgSid = checkUserOrg(dto.getStaffSid());
@ -609,14 +618,20 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
String businessSid = resultBean.getData();
//保存提交时补充的内容
BusSalesOrderSubmitDto busSalesOrderSubmit = dto.getBusSalesOrderSubmit();
if(StringUtils.isNotBlank(busSalesOrderSubmit.getDistributorPrice()) && StringUtils.isNotBlank(busSalesOrderSubmit.getDistributorPriceAll())){
BigDecimal priceBig = new BigDecimal(busSalesOrderSubmit.getDistributorPrice());
BigDecimal priceAll = new BigDecimal(busSalesOrderSubmit.getDistributorPriceAll());
if(priceAll.compareTo(priceBig.multiply(new BigDecimal(busSalesOrderSubmit.getNum().toString()))) != 0){
return rb.setMsg("返利合计计算错误");
if(busSalesOrderSubmit != null){
if(StringUtils.isNotBlank(busSalesOrderSubmit.getDistributorPrice()) && StringUtils.isNotBlank(busSalesOrderSubmit.getDistributorPriceAll())){
BigDecimal priceBig = new BigDecimal(busSalesOrderSubmit.getDistributorPrice());
BigDecimal priceAll = new BigDecimal(busSalesOrderSubmit.getDistributorPriceAll());
if(busSalesOrderSubmit.getNum() != null){
if(priceAll.compareTo(priceBig.multiply(new BigDecimal(busSalesOrderSubmit.getNum().toString()))) != 0){
return rb.setMsg("返利合计计算错误");
}
}
}
busSalesOrderSubmitService.saveOrderSubmit(busSalesOrderSubmit,businessSid);
}
busSalesOrderSubmitService.saveOrderSubmit(busSalesOrderSubmit,businessSid);
Map<String, Object> variables = new HashMap<>();
variables.put("businessSid", businessSid);
if ("01".equals(dto.getPayTypeKey())) {

15
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesvehicleorder/BusSalesVehicleOrderService.java
View File

@ -28,7 +28,6 @@ package com.yxt.anrui.buscenter.biz.bussalesvehicleorder;
import cn.hutool.core.bean.BeanUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.yxt.anrui.buscenter.api.bussalesorder.AppNowCar;
import com.yxt.anrui.buscenter.api.bussalesorder.AppReadyCarList;
import com.yxt.anrui.buscenter.api.bussalesvehicleorder.*;
import com.yxt.common.base.service.MybatisBaseService;
@ -89,13 +88,13 @@ public class BusSalesVehicleOrderService extends MybatisBaseService<BusSalesVehi
if (stringList.size() > 0) {
//删除
baseMapper.deleteBySalesOrderSid(sid);
for (int i = 0; i < vehicleList.size(); i++) {
BusSalesVehicleOrderDto busSalesVehicleOrderDto = vehicleList.get(i);
BusSalesVehicleOrder busSalesVehicleOrder = new BusSalesVehicleOrder();
BeanUtil.copyProperties(busSalesVehicleOrderDto, busSalesVehicleOrder, "sid");
busSalesVehicleOrder.setSalesOrderSid(sid);
save(busSalesVehicleOrder);
}
}
for (int i = 0; i < vehicleList.size(); i++) {
BusSalesVehicleOrderDto busSalesVehicleOrderDto = vehicleList.get(i);
BusSalesVehicleOrder busSalesVehicleOrder = new BusSalesVehicleOrder();
BeanUtil.copyProperties(busSalesVehicleOrderDto, busSalesVehicleOrder, "sid");
busSalesVehicleOrder.setSalesOrderSid(sid);
save(busSalesVehicleOrder);
}
}

Write Preview
Loading…
Cancel
Save