下单参数修改

08.src/Xingxi/xingxi-miniprogram-api/src/main/java/com/xingxi/api/model/OrderItemDTO.java

@@ -10,7 +10,7 @@ public class OrderItemDTO {
     private Long cartsId;
 
     private Long mercId;
-    private Long prodId;
+    private Long mercProdId;
     private Long prodAttrId;
 
     private Integer count;

08.src/Xingxi/xingxi-miniprogram-api/src/main/java/com/xingxi/api/service/impl/OrderApiServiceImpl.java

@@ -211,13 +211,8 @@ class OrderApiServiceImpl implements OrderServiceI {
         List<OrderDetail> orderDetailItems = new ArrayList<>();
 
         for (OrderItemDTO orderItemDTO : orderItemDTOS) {
-//            MerchantProd merchantProd = merchantProdMapper.selectMerchantProdByMercProdId(orderItemDTO.getMercProdId());
-            MerchantProd condMerchant = new MerchantProd();
-            condMerchant.setMercId(orderItemDTO.getMercId());
-            condMerchant.setProdId(orderItemDTO.getProdId());
-            condMerchant.setProdAttrId(orderItemDTO.getProdAttrId());
 
-            MerchantProd merchantProd = wxApiProductMapper.selectFirstMerchantProdByCondition(condMerchant);
+            MerchantProd merchantProd = wxApiProductMapper.selectMerchantProdByMercProdId(orderItemDTO.getMercProdId());
 
             Prod prod = prodMapper.selectProdById(merchantProd.getProdId());
             order.setSellerId(merchantProd.getMercId());
@@ -225,7 +220,6 @@ class OrderApiServiceImpl implements OrderServiceI {
             ProdVendor condPv = new ProdVendor();
             condPv.setDelFlag(EDelFlag.NO.getVal());
             condPv.setProdId(merchantProd.getProdId());
-//            condPv.setProdAttrId(merchantProd.getProdAttrId());
 
             List<ProdVendor> prodVendorList = prodVendorMapper.selectProdVendorList(condPv);
             if (prodVendorList.isEmpty()) {