Public/cf_imes_server
6
0
Fork 0
mirror of http://192.168.1.205:9980/cf_devdept2/cf_imes_server.git synced 2026-08-14 13:42:07 +08:00
Code Issues Packages Projects Releases Wiki Activity

修改接口问题

Browse Source
This commit is contained in:
lym
2024-05-27 10:11:44 +08:00
parent 902d62e17a
commit d57083991d
1 changed files with 13 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/order/OrderServiceImpl.java
+7 -4
View File
@@ -405,7 +405,7 @@ public class OrderServiceImpl implements OrderService {
List<PlateGoodDO> plateGoodDOS = (List<PlateGoodDO>) map.get("plateGoodDOLists"); List<PlateGoodDO> plateGoodDOS = (List<PlateGoodDO>) map.get("plateGoodDOLists");
validateCustomOrderNoExists(order.get(0).getCustomOrderNo()); validateCustomOrderNoExists(order.get(0).getCustomOrderNo());
orderInputProcessor.batchInsert(rawGoodsDO, bodyDO, groupDO, partsDO, plateDO, null, itemDO, order.get(0),goodsDO,plateGoodDOS); orderInputProcessor.batchInsert(rawGoodsDO, bodyDO, groupDO, partsDO, plateDO, null, itemDO, order.get(0), goodsDO, plateGoodDOS);
List<OrderModelDO> orderModelDOs = BeanUtils.toBean(plateDetail, OrderModelDO.class); List<OrderModelDO> orderModelDOs = BeanUtils.toBean(plateDetail, OrderModelDO.class);
orderModelDOs.forEach(orderModelDO -> orderModelDO.setOrderId(order.get(0).getId())); orderModelDOs.forEach(orderModelDO -> orderModelDO.setOrderId(order.get(0).getId()));
@@ -421,6 +421,7 @@ public class OrderServiceImpl implements OrderService {
.eq(GoodsDO::getOrderId, orderId) .eq(GoodsDO::getOrderId, orderId)
.eq(GoodsDO::getDeleted, false)); .eq(GoodsDO::getDeleted, false));
} }
private Map<String, List<?>> getPlateGoods(List<GoodsDO> goodsLists) { private Map<String, List<?>> getPlateGoods(List<GoodsDO> goodsLists) {
Map<String, List<?>> map = new HashMap<>(); Map<String, List<?>> map = new HashMap<>();
List<PlateGoodDO> plateGoodLists = new ArrayList<>(); List<PlateGoodDO> plateGoodLists = new ArrayList<>();
@@ -511,6 +512,7 @@ public class OrderServiceImpl implements OrderService {
// 验证自定义单号是否存在 // 验证自定义单号是否存在
private void validateCustomOrderNoExists(String customOrderNo) { private void validateCustomOrderNoExists(String customOrderNo) {
if (customOrderNo != null) {
if (!customOrderNo.isEmpty()) { if (!customOrderNo.isEmpty()) {
if (orderMapper.selectCount(new LambdaQueryWrapper<OrderDO>() if (orderMapper.selectCount(new LambdaQueryWrapper<OrderDO>()
.eq(OrderDO::getCustomOrderNo, customOrderNo) .eq(OrderDO::getCustomOrderNo, customOrderNo)
@@ -520,6 +522,7 @@ public class OrderServiceImpl implements OrderService {
} }
} }
} }
}
// 业务员是否存在 // 业务员是否存在
private void validateSalesmanOrderNoExists(String salesman, Long organId) { private void validateSalesmanOrderNoExists(String salesman, Long organId) {
@@ -567,9 +570,9 @@ public class OrderServiceImpl implements OrderService {
@Override @Override
public void importExcelData(OrderDO orderDO, List<?> list) { public void importExcelData(OrderDO orderDO, List<?> list) {
orderDO.setId((Long) snowFlakeGenerator.nextId(null)); orderDO.setId((Long) snowFlakeGenerator.nextId(null));
System.out.println(excelTypeRealize.changeDate(list,orderDO.getId())); System.out.println(excelTypeRealize.changeDate(list, orderDO.getId()));
Map<String, List<?>> listMap = excelTypeRealize.changeDate(list,orderDO.getId()); Map<String, List<?>> listMap = excelTypeRealize.changeDate(list, orderDO.getId());
List<RawGoodsDO> rawGoodsDO = (List<RawGoodsDO>) listMap.get("rawGoodsDOS"); List<RawGoodsDO> rawGoodsDO = (List<RawGoodsDO>) listMap.get("rawGoodsDOS");
List<GoodsDO> goodsDO = (List<GoodsDO>) listMap.get("goodsDOS"); List<GoodsDO> goodsDO = (List<GoodsDO>) listMap.get("goodsDOS");
List<PlateGoodDO> plateGoodDOS = (List<PlateGoodDO>) listMap.get("plateGoodDOS"); List<PlateGoodDO> plateGoodDOS = (List<PlateGoodDO>) listMap.get("plateGoodDOS");
@@ -580,7 +583,7 @@ public class OrderServiceImpl implements OrderService {
List<OrderItemDO> itemDO = (List<OrderItemDO>) listMap.get("orderItemDOS"); List<OrderItemDO> itemDO = (List<OrderItemDO>) listMap.get("orderItemDOS");
List<OrderModelDO> orderModelDOS = (List<OrderModelDO>) listMap.get("orderModelDOS"); List<OrderModelDO> orderModelDOS = (List<OrderModelDO>) listMap.get("orderModelDOS");
validateCustomOrderNoExists(orderDO.getCustomOrderNo()); validateCustomOrderNoExists(orderDO.getCustomOrderNo());
orderInputProcessor.batchInsert(rawGoodsDO, bodyDO, groupDO, partsDO, plateDO, null, itemDO, orderDO,goodsDO,plateGoodDOS); orderInputProcessor.batchInsert(rawGoodsDO, bodyDO, groupDO, partsDO, plateDO, null, itemDO, orderDO, goodsDO, plateGoodDOS);
orderInputProcessor.batchSaveModel(orderModelDOS); orderInputProcessor.batchSaveModel(orderModelDOS);
// System.out.println("plateDO = " + plateDO+ " BeanUtils.toBean(plateDetail, OrderModelDO.class) = " + orderModelDOS); // System.out.println("plateDO = " + plateDO+ " BeanUtils.toBean(plateDetail, OrderModelDO.class) = " + orderModelDOS);