附加产品提交

ship-module-product/ship-module-product-biz/src/main/resources/mapper/productGroup/ProductGroupMapper.xml

@@ -31,7 +31,7 @@
         pb.can_repeat_buy canRepeatBuy,
         pp.`name` projectName,
         pp.code projectCode,
-        pp1.`name` specificationName,
+        pp.`name` specificationName,
         pb.start_point startPoint,
         pb.end_point endPoint,
         pb.use_status useStatus
@@ -40,7 +40,6 @@
         INNER JOIN product_spu p ON p.id = pg.product_id
         INNER JOIN product_base pb ON pb.id = pg.product_base_id
         INNER JOIN product_project pp ON pp.id = pg.project_id
-        INNER JOIN product_project pp1 ON pp1.id = pg.specification_id
         WHERE
         pg.deleted = 0
         and pg.product_base_type = 0
@@ -77,7 +76,7 @@
         pb.can_repeat_buy canRepeatBuy,
         pp.`name` projectName,
         pp.code projectCode,
-        pp1.`name` specificationName,
+        pp.`name` specificationName,
         pb.start_point startPoint,
         pb.end_point endPoint,
         pb.use_status useStatus
@@ -86,7 +85,6 @@
         INNER JOIN product_spu p ON p.id = pg.product_id
         INNER JOIN product_base pb ON pb.id = pg.product_base_id
         INNER JOIN product_project pp ON pp.id = pg.project_id
-        INNER JOIN product_project pp1 ON pp1.id = pg.specification_id
         WHERE
         pg.deleted = 0
         and pg.product_base_type = 0
@@ -118,7 +116,7 @@
         pb.can_repeat_buy canRepeatBuy,
         pp.`name` projectName,
         pp.code projectCode,
-        pp1.`name` specificationName,
+        pp.`name` specificationName,
         pb.start_point startPoint,
         pb.end_point endPoint,
         pb.use_status useStatus
@@ -127,7 +125,6 @@
         INNER JOIN product_spu p ON p.id = pg.product_id
         INNER JOIN product_base pb ON pb.id = pg.product_base_id
         INNER JOIN product_project pp ON pp.id = pg.project_id
-        INNER JOIN product_project pp1 ON pp1.id = pg.specification_id
         WHERE
         pg.deleted = 0
         and pg.product_base_type = 0

ship-module-trade/ship-module-trade-api/src/main/java/com/yc/ship/module/trade/api/dto/TradeOrderCreateReqDTO.java

@@ -1,6 +1,5 @@
 package com.yc.ship.module.trade.api.dto;
 
-import com.yc.ship.framework.common.validation.InEnum;
 import com.yc.ship.framework.common.validation.IntEnum;
 import com.yc.ship.framework.common.validation.Mobile;
 import com.yc.ship.module.trade.enums.CredentialTypeEnum;

ship-module-trade/ship-module-trade-biz/src/main/java/com/yc/ship/module/trade/controller/app/order/TradeOrderController.java

@@ -2,11 +2,17 @@ package com.yc.ship.module.trade.controller.app.order;
 
 import com.yc.ship.framework.common.pojo.CommonResult;
 import com.yc.ship.framework.operatelog.core.annotations.OperateLog;
+import com.yc.ship.module.trade.api.contract.dto.group.WindowCreateOrderGroup;
+import com.yc.ship.module.trade.controller.admin.order.vo.order.OtcTradeOrderCreateReqVO;
+import com.yc.ship.module.trade.controller.admin.order.vo.order.OtcTradeOrderCreateRespVO;
 import com.yc.ship.module.trade.controller.admin.order.vo.order.PayOrderReqVO;
 import com.yc.ship.module.trade.controller.admin.order.vo.order.PayOrderRespVO;
 import com.yc.ship.module.trade.framework.annotation.PlatTenantEnv;
+import com.yc.ship.module.trade.service.order.AdminTradeOrderService;
+import com.yc.ship.module.trade.service.otc.OtcTradeOrderService;
 import com.yc.ship.module.trade.service.pay.TradeOrderPayService;
 import com.yc.ship.module.trade.service.refund.TradeRefundService;
+import com.yc.ship.module.trade.utils.AgencyAuthUtils;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.extern.slf4j.Slf4j;
@@ -37,6 +43,18 @@ public class TradeOrderController {
     @Resource
     private TradeOrderPayService tradeOrderPayService;
 
+    @Resource
+    private OtcTradeOrderService otcTradeOrderService;
+    @Resource
+    private AgencyAuthUtils agencyAuthUtils;
+
+    @PostMapping("/orderTest")
+    @Operation(summary = "支付通知")
+    @OperateLog(type = TRADE)
+    public CommonResult<OtcTradeOrderCreateRespVO> createMoveOrder(@Validated(value = WindowCreateOrderGroup.class)  @RequestBody OtcTradeOrderCreateReqVO otcTradeOrderCreateReqVO) {
+        return otcTradeOrderService.createMoveOrder(agencyAuthUtils.getAgencyLoginUser(), otcTradeOrderCreateReqVO);
+    }
+
     @PostMapping("/payNotify")
     @Operation(summary = "支付通知")
     @OperateLog(type = TRADE)

ship-module-trade/ship-module-trade-biz/src/main/java/com/yc/ship/module/trade/service/supplier/impl/TradeSupplierServiceImpl.java

@@ -433,16 +433,16 @@ public class TradeSupplierServiceImpl implements TradeSupplierService {
         SupplierTradeService supplierTradeService;
         SupplierRespDTO supplierRespDTO = null;
         MapBuilder<String,Object> logContentBuilder =  MapUtil.builder();
-        if(tradeSupplierOrderBO.getTradeSupplierOrderDO().getSupplierType() == SUPPLIER_TYPE_PLAT){
-            //平台分销订单
-            supplierTradeService = allSupplierTradeService.get(PLAT_SERVICE);
-            logContentBuilder.put("supplierName","平台" ).put("serviceName",PLAT_SERVICE);
-        }else {
+//        if(tradeSupplierOrderBO.getTradeSupplierOrderDO().getSupplierType() == SUPPLIER_TYPE_PLAT){
+//            //平台分销订单
+//            supplierTradeService = allSupplierTradeService.get(PLAT_SERVICE);
+//            logContentBuilder.put("supplierName","平台" ).put("serviceName",PLAT_SERVICE);
+//        }else {
             supplierRespDTO = resourceApi.getSupplierById(tradeSupplierOrderBO.getTradeSupplierOrderDO().getSupplierId()).getCheckedData();
             supplierTradeService = allSupplierTradeService.get(supplierRespDTO.getDirectServer());
             Asserts.isTrue(supplierTradeService!=null,"未找到对应供应商实现类：{}",supplierRespDTO.getDirectServer());
             logContentBuilder.put("supplierName",supplierRespDTO.getName() ).put("serviceName",supplierRespDTO.getDirectServer());
-        }
+//        }
 
         SupplierTradeOrderBO supplierTradeOrderBO = new SupplierTradeOrderBO();
         supplierTradeOrderBO.setTradeSupplierOrderDO(tradeSupplierOrderBO.getTradeSupplierOrderDO());