fix bug

ghy-admin/src/main/java/com/ghy/web/controller/order/OrderController.java

@@ -126,8 +126,11 @@ public class OrderController extends BaseController {
         Worker acceptWorker = workerService.selectById(request.getWorkerId());
         Assert.notNull(acceptWorker, "查询接单师傅信息失败");
         // 校验接单师傅和派单师傅是不是同一个Team
-        boolean checkInTeam = workerService.checkInTeam(assignWorker.getWorkerId(), acceptWorker.getWorkerId());
+        if(!om.getWorkerId().equals(request.getWorkerId())){
-        Assert.isTrue(checkInTeam, "接单师傅不在本团队");
+            boolean checkInTeam = workerService.checkInTeam(assignWorker.getWorkerId(), acceptWorker.getWorkerId());
+            Assert.isTrue(checkInTeam, "接单师傅不在本团队");
+        }
+
 
         // 创建子订单
         OrderDetail od = new OrderDetail();
@@ -231,6 +234,7 @@ public class OrderController extends BaseController {
         orderMaster.setPayType(appOrderRequest.getPayType());
         orderMaster.setOrderStatus(OrderStatus.PLAIN.code());
         orderMaster.setCustomerId(appOrderRequest.getCustomerId());
+        orderMaster.setAddressId(appOrderRequest.getAddressId());
         orderMaster.setPayStatus(PayStatus.WAIT_PAY.getCode());
         orderMaster.setCreateTime(new Date());
         orderMaster.setWorkerId(goods.getWorkerId());
@@ -283,7 +287,7 @@ public class OrderController extends BaseController {
         }
 
         /* 1 平台服务服务费 */
-        DeptGoodsCategory deptGoodsCategory = deptGoodsCategoryService.selectOneByGoodsCategoryId(deptGoodsCategoryId);
+        DeptGoodsCategory deptGoodsCategory = deptGoodsCategoryService.get(deptGoodsCategoryId);
         BigDecimal deptRate = new BigDecimal(deptGoodsCategory.getDeptRate());
         BigDecimal deptMoney = deptGoodsCategory.getDeptMoney();
 

ghy-custom/src/main/java/com/ghy/customer/mapper/CustomerAddressMapper.java

@@ -1,6 +1,7 @@
 package com.ghy.customer.mapper;
 
 import com.ghy.customer.domain.CustomerAddress;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -34,7 +35,7 @@ public interface CustomerAddressMapper {
      * @param customerAddressId 地址id
      * @return 地址
      */
-    CustomerAddress selectByCustomerAddressId(Long customerAddressId);
+    CustomerAddress selectByCustomerAddressId(@Param("customerAddressId") Long customerAddressId);
 
     /**
      * @param customerAddress 地址信息

ghy-goods/src/main/resources/mapper/goods/GoodsStandardMapper.xml

@@ -83,7 +83,7 @@
         <foreach collection="goodsStandards" separator="," item="goodsStandard">
             (
             #{goodsStandard.goodsStandardName}, #{goodsStandard.goodsId}, #{goodsStandard.deptGoodsCategoryId}, #{goodsStandard.goodsPrice}, #{goodsStandard.discountPrice},
-            #{goodsStandard.groupPrice}, #{goodsStandard.goodsNum}, #{goodsStandard.saleNum}, #{goodsStandard.status}, #{goodsStandard.remark}, #{goodsStandard.createBy}, sysdate()
+            #{goodsStandard.groupPrice}, 100, 0, #{goodsStandard.status}, #{goodsStandard.remark}, #{goodsStandard.createBy}, sysdate()
             )
         </foreach>
     </insert>