clunt
/
ghy-all
1
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

记录订单操作，目前只记录了分配订单、完成订单、拒绝订单，接单的接口没找到

This commit is contained in:
HH 2023-03-04 23:48:33 +08:00
parent a90df2dab3
commit c99691591e
2 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ghy-admin/src/main/java/com/ghy/web/controller/order/OrderBehaviorController.java
View File

@ -5,7 +5,6 @@ import com.ghy.order.domain.OrderBehavior;
import com.ghy.order.service.OrderBehaviorService;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.ResponseBody;

17
ghy-admin/src/main/java/com/ghy/web/controller/order/OrderDetailController.java
View File

@ -759,7 +759,7 @@ public class OrderDetailController extends BaseController {
}
// 存储完单图
List<GoodsImgs> finishImgObjList = new ArrayList<GoodsImgs>();
List<GoodsImgs> finishImgObjList = new ArrayList<>();
for (String imgUrl : request.getFinishImgList()) {
GoodsImgs finishImgObj = new GoodsImgs();
finishImgObj.setGoodsId(0L);
@ -791,6 +791,15 @@ public class OrderDetailController extends BaseController {
int affectedRow = orderDetailService.updateOrderDetail(updateOrderDetail);
Assert.isTrue(affectedRow == 1, "子订单修改失败，orderDetail=" + orderDetail);
Worker worker = workerService.selectById(orderDetail.getWorkerId());
OrderBehavior orderBehavior = new OrderBehavior()
.setOrderMasterId(orderMaster.getId()).setOrderMasterCode(orderMaster.getCode())
.setOrderDetailId(orderDetail.getId()).setOrderDetailCode(orderDetail.getCode())
.setWorkerId(worker.getWorkerId()).setWorkerName(worker.getName())
.setBehavior(OrderBehaviorEnum.FINISH_ORDER);
orderBehaviorService.insert(orderBehavior);
return AjaxResult.success("发起成功");
}
@ -839,8 +848,10 @@ public class OrderDetailController extends BaseController {
orderMaster2Update.setHasDispatchedAll(0);
orderMasterService.updateOrderMaster(orderMaster2Update);
OrderBehavior orderBehavior = new OrderBehavior().setOrderMasterId(om.getId()).setOrderMasterCode(om.getCode())
.setWorkerId(worker.getWorkerId()).setWorkerName(worker.getName()).setBehavior(OrderBehaviorEnum.REFUSE_ORDER);
OrderBehavior orderBehavior = new OrderBehavior()
.setOrderMasterId(om.getId()).setOrderMasterCode(om.getCode())
.setWorkerId(worker.getWorkerId()).setWorkerName(worker.getName())
.setBehavior(OrderBehaviorEnum.REFUSE_ORDER);
orderBehaviorService.insert(orderBehavior);
return AjaxResult.success();