other_project/mallplus
7
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

新批量发货接口

Browse Source
This commit is contained in:
wangpengfei
2023-03-27 18:15:39 +08:00
parent d8dcf68b17
commit 48cc9d9483
5 changed files with 90 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
mallplus-admin/src/main/java/com/zscat/mallplus/oms/controller/OmsOrderController.java
View File

@@ -175,7 +175,17 @@ public class OmsOrderController {
}
return new CommonResult().failed();
}
@SysLog(MODULE = "oms", REMARK = "新批量发货")
@ApiOperation("批量发货")
@RequestMapping(value = "/update/deliveryNew", method = RequestMethod.POST)
@ResponseBody
public Object deliveryNew(@RequestBody List<OmsOrderDeliveryParam> deliveryParamList) {
int count = IOmsOrderService.deliveryNew(deliveryParamList);
if (count > 0) {
return new CommonResult().success(count);
}
return new CommonResult().failed();
}
@SysLog(MODULE = "oms", REMARK = "批量发货")
@ApiOperation("批量发货")
@RequestMapping(value = "/delivery", method = RequestMethod.POST)

6
mallplus-admin/src/main/java/com/zscat/mallplus/oms/service/IOmsOrderService.java
View File

@@ -44,7 +44,11 @@ public interface IOmsOrderService extends IService<OmsOrder> {
*/
@Transactional
int delivery(List<OmsOrderDeliveryParam> deliveryParamList);
/**
* 新批量发货
*/
@Transactional
int deliveryNew(List<OmsOrderDeliveryParam> deliveryParamList);
/**
* 批量关闭订单
*/

30
mallplus-admin/src/main/java/com/zscat/mallplus/oms/service/impl/OmsOrderServiceImpl.java
View File

@@ -76,7 +76,35 @@ public class OmsOrderServiceImpl extends ServiceImpl<OmsOrderMapper, OmsOrder> i
sendPushMsg(deliveryParamList);
return count;
}
@Override
public int deliveryNew(List<OmsOrderDeliveryParam> deliveryParamList) {
//根据订单查询地址
for(OmsOrderDeliveryParam omsOrderDeliveryParam:deliveryParamList){
String orderId=String.valueOf(omsOrderDeliveryParam.getOrderId());
OmsOrder address=orderMapper.getAddressById(orderId);
omsOrderDeliveryParam.setDeliveryCompany(address.getReceiverDetailAddress());
omsOrderDeliveryParam.setDeliverySn("到店自取");
}
//批量发货
int count = orderMapper.deliveryNew(deliveryParamList);
if (count > 0) {
//添加操作记录
List<OmsOrderOperateHistory> operateHistoryList = deliveryParamList.stream()
.map(omsOrderDeliveryParam -> {
OmsOrderOperateHistory history = new OmsOrderOperateHistory();
history.setOrderId(omsOrderDeliveryParam.getOrderId());
history.setCreateTime(new Date());
history.setOperateMan("后台管理员");
history.setPreStatus(OrderStatus.TO_DELIVER.getValue());
history.setOrderStatus(OrderStatus.DELIVERED.getValue());
history.setNote("完成发货");
return history;
}).collect(Collectors.toList());
orderOperateHistoryDao.saveBatch(operateHistoryList);
}
sendPushMsg(deliveryParamList);
return count;
}
private void sendPushMsg(List<OmsOrderDeliveryParam> deliveryParamList) {
for (OmsOrderDeliveryParam param : deliveryParamList) {
OmsOrder omsOrder = baseMapper.selectById(param.getOrderId());