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

出库相关

master
dimengzhe 2 years ago
parent
34b6d13b6e
commit
ea9477a6fd
3 changed files with 90 additions and 68 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 85
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdelivered/BusDeliveredService.java
  2. 69
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyService.java
  3. 4
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java

85
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdelivered/BusDeliveredService.java
View File

@ -227,6 +227,7 @@ public class BusDeliveredService extends MybatisBaseService<BusDeliveredMapper,
public ResultBean<AppDeliveredDetailsVo> getRetrievalApplyInfo(AppDeliveredDetailsQuery query) { public ResultBean<AppDeliveredDetailsVo> getRetrievalApplyInfo(AppDeliveredDetailsQuery query) {
ResultBean<AppDeliveredDetailsVo> rb = ResultBean.fireFail(); ResultBean<AppDeliveredDetailsVo> rb = ResultBean.fireFail();
AppDeliveredDetailsVo appDeliveredDetailsVo = new AppDeliveredDetailsVo(); AppDeliveredDetailsVo appDeliveredDetailsVo = new AppDeliveredDetailsVo();
boolean codeMsg = false;
if (StringUtils.isBlank(query.getOutboundSid())) { if (StringUtils.isBlank(query.getOutboundSid())) {
appDeliveredDetailsVo.setOrgPath(query.getOrgPath()); appDeliveredDetailsVo.setOrgPath(query.getOrgPath());
List<String> list = query.getList(); List<String> list = query.getList();
@ -436,40 +437,55 @@ public class BusDeliveredService extends MybatisBaseService<BusDeliveredMapper,
} }
List<AppCarListVo> carList = new ArrayList<>(); List<AppCarListVo> carList = new ArrayList<>();
List<BusDeliveredApplyDetails> detailsList = busDeliveredApplyDetailsService.selectByApplySid(query.getOutboundSid()); List<BusDeliveredApplyDetails> detailsList = busDeliveredApplyDetailsService.selectByApplySid(query.getOutboundSid());
for (int i = 0; i < detailsList.size(); i++) { detailsList.removeAll(Collections.singleton(null));
BusDeliveredApplyDetails busDeliveredApplyDetails = detailsList.get(i); if(!detailsList.isEmpty()){
AppCarListVo appCarListVo = new AppCarListVo(); for (int i = 0; i < detailsList.size(); i++) {
appCarListVo.setDiscount(busDeliveredApplyDetails.getSingleCarDiscountPrice()); BusDeliveredApplyDetails busDeliveredApplyDetails = detailsList.get(i);
appCarListVo.setVinSid(busDeliveredApplyDetails.getVinSid()); AppCarListVo appCarListVo = new AppCarListVo();
//查询该车辆是否有挂车 appCarListVo.setDiscount(busDeliveredApplyDetails.getSingleCarDiscountPrice());
ResultBean<TraliveredVo> trailerList = baseTrailerFeign.trailerList(busDeliveredApplyDetails.getVinSid(),busDeliveredApply.getContractNo()); appCarListVo.setVinSid(busDeliveredApplyDetails.getVinSid());
if (trailerList.getData().getList().isEmpty() && trailerList.getData().getVehillModelList().isEmpty()) { //查询该车辆是否有挂车
appCarListVo.setShowHandCarBtn(false); ResultBean<TraliveredVo> trailerList = baseTrailerFeign.trailerList(busDeliveredApplyDetails.getVinSid(),busDeliveredApply.getContractNo());
} else { if (trailerList.getData().getList().isEmpty() && trailerList.getData().getVehillModelList().isEmpty()) {
appCarListVo.setShowHandCarBtn(true); appCarListVo.setShowHandCarBtn(false);
} else {
appCarListVo.setShowHandCarBtn(true);
}
//优惠包使用情况
List<BusDeliveredDetailsDiscountsVo> discountUse = new ArrayList<>();
List<BusDeliveredDetailsDiscount> discountsList = busDeliveredDetailsDiscountService.selectByVinSid(busDeliveredApplyDetails.getSid());
for (int j = 0; j < discountsList.size(); j++) {
BusDeliveredDetailsDiscount busDeliveredDetailsDiscount = discountsList.get(j);
BusDeliveredDetailsDiscountsVo busDeliveredDetailsDiscountsVo = new BusDeliveredDetailsDiscountsVo();
busDeliveredDetailsDiscountsVo.setDiscountSid(busDeliveredDetailsDiscount.getDiscountSid());
busDeliveredDetailsDiscountsVo.setDiscountName(busDeliveredDetailsDiscount.getName());
busDeliveredDetailsDiscountsVo.setDiscountNum(busDeliveredDetailsDiscount.getGiveNum());
busDeliveredDetailsDiscountsVo.setDiscountInfo(busDeliveredDetailsDiscount.getDiscountExplain());
busDeliveredDetailsDiscountsVo.setDiscountPrice(busDeliveredDetailsDiscount.getPrice());
busDeliveredDetailsDiscountsVo.setTotalNum(busDeliveredDetailsDiscount.getNum());
//已使用的数量：根据优惠包sid查询出库已提交以及出库已办结的数量
int intCount = busDeliveredDetailsDiscountService.selectCounts(busDeliveredDetailsDiscount.getDiscountSid());
int count = busDeliveredDetailsDiscount.getNum();
//剩余数量
int discountLeaveNum = count - intCount;
if(discountLeaveNum<busDeliveredDetailsDiscount.getGiveNum()){
codeMsg = true;
busDeliveredDetailsDiscountsVo.setDiscountNum(0);
}
discountUse.add(busDeliveredDetailsDiscountsVo);
}
appCarListVo.setDiscountUse(discountUse);
//使用人信息
BusDeliveredUseMessagesVo realBuyer = new BusDeliveredUseMessagesVo();
BusDeliveredUseMessage busDeliveredUseMessage = new BusDeliveredUseMessage();
if("2".equals(busDeliveredApply.getTypeKey())){
busDeliveredUseMessage = busDeliveredUseMessageService.fetchBySid(busDeliveredApplyDetails.getUseMessageSid());
BeanUtil.copyProperties(busDeliveredUseMessage, realBuyer);
}
realBuyer.setVin(busDeliveredApplyDetails.getVinNo());
appCarListVo.setRealBuyer(realBuyer);
carList.add(appCarListVo);
} }
//优惠包使用情况
List<BusDeliveredDetailsDiscountsVo> discountUse = new ArrayList<>();
List<BusDeliveredDetailsDiscount> discountsList = busDeliveredDetailsDiscountService.selectByVinSid(busDeliveredApplyDetails.getSid());
for (int j = 0; j < discountsList.size(); j++) {
BusDeliveredDetailsDiscount busDeliveredDetailsDiscount = discountsList.get(j);
BusDeliveredDetailsDiscountsVo busDeliveredDetailsDiscountsVo = new BusDeliveredDetailsDiscountsVo();
busDeliveredDetailsDiscountsVo.setDiscountSid(busDeliveredDetailsDiscount.getDiscountSid());
busDeliveredDetailsDiscountsVo.setDiscountName(busDeliveredDetailsDiscount.getName());
busDeliveredDetailsDiscountsVo.setDiscountNum(busDeliveredDetailsDiscount.getGiveNum());
busDeliveredDetailsDiscountsVo.setDiscountInfo(busDeliveredDetailsDiscount.getDiscountExplain());
busDeliveredDetailsDiscountsVo.setDiscountPrice(busDeliveredDetailsDiscount.getPrice());
busDeliveredDetailsDiscountsVo.setTotalNum(busDeliveredDetailsDiscount.getNum());
discountUse.add(busDeliveredDetailsDiscountsVo);
}
appCarListVo.setDiscountUse(discountUse);
//使用人信息
BusDeliveredUseMessagesVo realBuyer = new BusDeliveredUseMessagesVo();
BusDeliveredUseMessage busDeliveredUseMessage = busDeliveredUseMessageService.fetchBySid(busDeliveredApplyDetails.getUseMessageSid());
BeanUtil.copyProperties(busDeliveredUseMessage, realBuyer);
realBuyer.setVin(busDeliveredApplyDetails.getVinNo());
appCarListVo.setRealBuyer(realBuyer);
carList.add(appCarListVo);
} }
appDeliveredDetailsVo.setCarList(carList); appDeliveredDetailsVo.setCarList(carList);
//剩余 //剩余
@ -528,6 +544,9 @@ public class BusDeliveredService extends MybatisBaseService<BusDeliveredMapper,
vo.setCarList(appCarListVos); vo.setCarList(appCarListVos);
vo.setTerminalKey("0"); vo.setTerminalKey("0");
vo.setTerminalValue("否");*/ vo.setTerminalValue("否");*/
if(codeMsg){
return rb.success().setData(appDeliveredDetailsVo).setCode("20005");
}
return rb.success().setData(appDeliveredDetailsVo); return rb.success().setData(appDeliveredDetailsVo);
} }

69
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyService.java
View File

@ -1324,40 +1324,43 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
} }
List<AppCarListVo> carList = new ArrayList<>(); List<AppCarListVo> carList = new ArrayList<>();
List<BusDeliveredApplyDetails> detailsList = busDeliveredApplyDetailsService.selectByApplySid(sid); List<BusDeliveredApplyDetails> detailsList = busDeliveredApplyDetailsService.selectByApplySid(sid);
for (int i = 0; i < detailsList.size(); i++) { detailsList.removeAll(Collections.singleton(null));
BusDeliveredApplyDetails busDeliveredApplyDetails = detailsList.get(i); if(!detailsList.isEmpty()){
AppCarListVo appCarListVo = new AppCarListVo(); for (int i = 0; i < detailsList.size(); i++) {
appCarListVo.setDiscount(busDeliveredApplyDetails.getSingleCarDiscountPrice()); BusDeliveredApplyDetails busDeliveredApplyDetails = detailsList.get(i);
appCarListVo.setVinSid(busDeliveredApplyDetails.getVinSid()); AppCarListVo appCarListVo = new AppCarListVo();
//查询该车辆是否有挂车 appCarListVo.setDiscount(busDeliveredApplyDetails.getSingleCarDiscountPrice());
ResultBean<TraliveredVo> trailerList = baseTrailerFeign.trailerList(busDeliveredApplyDetails.getVinSid(), busDeliveredApply.getContractNo()); appCarListVo.setVinSid(busDeliveredApplyDetails.getVinSid());
if (trailerList.getData().getList().isEmpty()) { //查询该车辆是否有挂车
appCarListVo.setShowHandCarBtn(false); ResultBean<TraliveredVo> trailerList = baseTrailerFeign.trailerList(busDeliveredApplyDetails.getVinSid(), busDeliveredApply.getContractNo());
} else { if (trailerList.getData().getList().isEmpty()) {
appCarListVo.setShowHandCarBtn(true); appCarListVo.setShowHandCarBtn(false);
} } else {
//优惠包使用情况 appCarListVo.setShowHandCarBtn(true);
List<BusDeliveredDetailsDiscountsVo> discountUse = new ArrayList<>(); }
List<BusDeliveredDetailsDiscount> discountsList = busDeliveredDetailsDiscountService.selectByVinSid(busDeliveredApplyDetails.getSid()); //优惠包使用情况
for (int j = 0; j < discountsList.size(); j++) { List<BusDeliveredDetailsDiscountsVo> discountUse = new ArrayList<>();
BusDeliveredDetailsDiscount busDeliveredDetailsDiscount = discountsList.get(j); List<BusDeliveredDetailsDiscount> discountsList = busDeliveredDetailsDiscountService.selectByVinSid(busDeliveredApplyDetails.getSid());
BusDeliveredDetailsDiscountsVo busDeliveredDetailsDiscountsVo = new BusDeliveredDetailsDiscountsVo(); for (int j = 0; j < discountsList.size(); j++) {
busDeliveredDetailsDiscountsVo.setDiscountSid(busDeliveredDetailsDiscount.getDiscountSid()); BusDeliveredDetailsDiscount busDeliveredDetailsDiscount = discountsList.get(j);
busDeliveredDetailsDiscountsVo.setDiscountName(busDeliveredDetailsDiscount.getName()); BusDeliveredDetailsDiscountsVo busDeliveredDetailsDiscountsVo = new BusDeliveredDetailsDiscountsVo();
busDeliveredDetailsDiscountsVo.setDiscountNum(busDeliveredDetailsDiscount.getGiveNum()); busDeliveredDetailsDiscountsVo.setDiscountSid(busDeliveredDetailsDiscount.getDiscountSid());
busDeliveredDetailsDiscountsVo.setDiscountInfo(busDeliveredDetailsDiscount.getDiscountExplain()); busDeliveredDetailsDiscountsVo.setDiscountName(busDeliveredDetailsDiscount.getName());
busDeliveredDetailsDiscountsVo.setDiscountPrice(busDeliveredDetailsDiscount.getPrice()); busDeliveredDetailsDiscountsVo.setDiscountNum(busDeliveredDetailsDiscount.getGiveNum());
busDeliveredDetailsDiscountsVo.setTotalNum(busDeliveredDetailsDiscount.getNum()); busDeliveredDetailsDiscountsVo.setDiscountInfo(busDeliveredDetailsDiscount.getDiscountExplain());
discountUse.add(busDeliveredDetailsDiscountsVo); busDeliveredDetailsDiscountsVo.setDiscountPrice(busDeliveredDetailsDiscount.getPrice());
busDeliveredDetailsDiscountsVo.setTotalNum(busDeliveredDetailsDiscount.getNum());
discountUse.add(busDeliveredDetailsDiscountsVo);
}
appCarListVo.setDiscountUse(discountUse);
//使用人信息
BusDeliveredUseMessagesVo realBuyer = new BusDeliveredUseMessagesVo();
BusDeliveredUseMessage busDeliveredUseMessage = busDeliveredUseMessageService.fetchBySid(busDeliveredApplyDetails.getUseMessageSid());
BeanUtil.copyProperties(busDeliveredUseMessage, realBuyer);
realBuyer.setVin(busDeliveredApplyDetails.getVinNo());
appCarListVo.setRealBuyer(realBuyer);
carList.add(appCarListVo);
} }
appCarListVo.setDiscountUse(discountUse);
//使用人信息
BusDeliveredUseMessagesVo realBuyer = new BusDeliveredUseMessagesVo();
BusDeliveredUseMessage busDeliveredUseMessage = busDeliveredUseMessageService.fetchBySid(busDeliveredApplyDetails.getUseMessageSid());
BeanUtil.copyProperties(busDeliveredUseMessage, realBuyer);
realBuyer.setVin(busDeliveredApplyDetails.getVinNo());
appCarListVo.setRealBuyer(realBuyer);
carList.add(appCarListVo);
} }
appDeliveredDetailsVo.setCarList(carList); appDeliveredDetailsVo.setCarList(carList);
//获取实际购车人的数据 //获取实际购车人的数据

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

@ -580,7 +580,7 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
List<String> stringList = new ArrayList<>(); List<String> stringList = new ArrayList<>();
if (!list.isEmpty()) { if (!list.isEmpty()) {
for (BusDepositFictitiousDetailsVo v : list) { for (BusDepositFictitiousDetailsVo v : list) {
String b = "编号为" + v.getDepositBillNo() + "虚拟订单订金转入" + v.getPrice() + "元，"; String b = "编号为" + v.getDepositBillNo() + "简易订单订金转入" + v.getPrice() + "元，";
a = a + b; a = a + b;
if (StringUtils.isNotBlank(v.getPayPath())) { if (StringUtils.isNotBlank(v.getPayPath())) {
List<String> payPathList = Arrays.asList(v.getPayPath().split(",")); List<String> payPathList = Arrays.asList(v.getPayPath().split(","));
@ -3331,7 +3331,7 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
List<String> stringList = new ArrayList<>(); List<String> stringList = new ArrayList<>();
if (!list.isEmpty()) { if (!list.isEmpty()) {
for (BusDepositFictitiousDetailsVo v : list) { for (BusDepositFictitiousDetailsVo v : list) {
String b = "编号为" + v.getDepositBillNo() + "虚拟订单订金转入" + v.getPrice() + "元，"; String b = "编号为" + v.getDepositBillNo() + "简易订单订金转入" + v.getPrice() + "元，";
a = a + b; a = a + b;
if (StringUtils.isNotBlank(v.getPayPath())) { if (StringUtils.isNotBlank(v.getPayPath())) {
List<String> payPathList = Arrays.asList(v.getPayPath().split(",")); List<String> payPathList = Arrays.asList(v.getPayPath().split(","));

Write Preview
Loading…
Cancel
Save