diff --git a/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderController.java b/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderController.java index 6c99805d..afe7ca74 100644 --- a/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderController.java +++ b/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderController.java @@ -2,6 +2,8 @@ package com.ghy.web.controller.order; import com.ghy.common.core.controller.BaseController; import com.ghy.common.core.domain.AjaxResult; +import com.ghy.common.enums.OrderStatus; +import com.ghy.common.enums.PayStatus; import com.ghy.common.utils.StringUtils; import com.ghy.customer.domain.Customer; import com.ghy.customer.service.CustomerService; @@ -180,6 +182,8 @@ public class OrderController extends BaseController { Set goodsStandardIds = appGoodsList.stream().map(AppGoodsRequest::getGoodsStandardId).collect(Collectors.toSet()); // 所有商品 List goodsList = goodsStandardService.selectByIds(goodsStandardIds); + // 商品所属师傅 + Goods goods = goodsService.selectById(goodsList.get(0).getGoodsId()); // 商户ID Long deptId = appOrderRequest.getDeptId(); Assert.notNull(deptId, "deptId is null!"); @@ -189,10 +193,12 @@ public class OrderController extends BaseController { orderMaster.setDeptId(deptId); orderMaster.setCode(orderMasterService.createOrderCode()); orderMaster.setOrderType(1); - orderMaster.setOrderStatus(0); + orderMaster.setPayType(appOrderRequest.getPayType()); + orderMaster.setOrderStatus(OrderStatus.PLAIN.getCode()); orderMaster.setCustomerId(appOrderRequest.getCustomerId()); - orderMaster.setPayStatus(0); + orderMaster.setPayStatus(PayStatus.WAIT_PAY.getCode()); orderMaster.setCreateTime(new Date()); + orderMaster.setWorkerId(goods.getWorkerId()); orderMasterService.insertOrderMaster(orderMaster); Assert.notNull(orderMaster.getId(), "OrderMaster.id is null!"); diff --git a/ghy-goods/src/main/java/com/ghy/goods/domain/Goods.java b/ghy-goods/src/main/java/com/ghy/goods/domain/Goods.java index 124802f3..ed634136 100644 --- a/ghy-goods/src/main/java/com/ghy/goods/domain/Goods.java +++ b/ghy-goods/src/main/java/com/ghy/goods/domain/Goods.java @@ -33,6 +33,9 @@ public class Goods extends BaseEntity { @Excel(name = "商品排序", cellType = Excel.ColumnType.NUMERIC) private Integer goodsSort; + @Excel(name = "归属师傅", cellType = Excel.ColumnType.NUMERIC) + private Long workerId; + @Excel(name = "类别id,必须是关联到系统的第三级目录") private Long deptGoodsCategoryId; diff --git a/ghy-goods/src/main/resources/mapper/goods/GoodsMapper.xml b/ghy-goods/src/main/resources/mapper/goods/GoodsMapper.xml index 4b61e7c2..fd977b08 100644 --- a/ghy-goods/src/main/resources/mapper/goods/GoodsMapper.xml +++ b/ghy-goods/src/main/resources/mapper/goods/GoodsMapper.xml @@ -9,6 +9,7 @@ + @@ -21,7 +22,7 @@ - SELECT goods_id, goods_code, dept_id, goods_name, goods_sort, + SELECT goods_id, goods_code, dept_id, goods_name, goods_sort, worker_id, dept_goods_category_id, goods_img_url, goods_video_url, status, create_by, create_time, remark FROM goods @@ -54,6 +55,7 @@ dept_id, goods_name, goods_sort, + worker_id, dept_goods_category_id, goods_img_url, goods_video_url, @@ -66,6 +68,7 @@ #{deptId}, #{goodsName}, #{goodsSort}, + #{workerId}, #{deptGoodsCategoryId}, #{goodsImgUrl}, #{goodsVideoUrl},