修改小程序获取商品、商品一览接口

08.src/Xingxi/xingxi-admin/src/main/resources/mapper/ProdVoMapper.xml

@@ -43,7 +43,7 @@
         <where>
             <if test="prodClassId != null "> and m_prod.prodClassId = #{prodClassId}</if>
             <if test="prodName != null  and prodName != ''"> and m_prod.prodName like concat('%', #{prodName}, '%')</if>
-            <if test="ipId != null "> and ipId = #{ipId}</if>
+            <if test="ipId != null "> and m_prod.ipId = #{ipId}</if>
             <if test="designerId != null "> and m_prod.designerId = #{designerId}</if>
             <if test="description != null  and description != ''"> and m_prod.description = #{description}</if>
             <if test="prodStatus != null  and prodStatus != ''"> and m_prod.prodStatus = #{prodStatus}</if>

08.src/Xingxi/xingxi-miniprogram-api/src/main/java/com/xingxi/api/data/domain/MercProdRequest.java

@@ -6,6 +6,9 @@ import lombok.Data;
 @Data
 public class MercProdRequest extends PageDTO {
 
+    // 商户商品ID
+    private Long mercProdId;
+
     // 商户ID
     private Long mercId;
 

08.src/Xingxi/xingxi-miniprogram-api/src/main/java/com/xingxi/api/data/domain/MercProdResponse.java

@@ -22,6 +22,8 @@ public class MercProdResponse {
 
     private String prodName;
 
+    private Long prodAttrId;
+
     // IPID
     private Long ipId;
 

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

@@ -150,8 +150,16 @@ class ProdApiServiceImpl implements ProdServiceI {
     public MercProdResponse selectMercProdById(MercProdRequest mercProd) {
         MercProdResponse rtn = new MercProdResponse();
 
+        if (mercProd.getMercProdId() != null && mercProd.getMercProdId() != 0L) {
+            MerchantProd merchantProd = merchantProdMapper.selectMerchantProdByMercProdId(mercProd.getMercProdId());
+            mercProd.setMercId(merchantProd.getMercId());
+            mercProd.setProdId(merchantProd.getProdId());
+            mercProd.setProdAttrId(merchantProd.getProdAttrId());
+        }
+
         rtn.setMercId(mercProd.getMercId());
         rtn.setProdId(mercProd.getProdId());
+        rtn.setProdAttrId(mercProd.getProdAttrId());
 
         Prod prod = productMapper.selectProdById(mercProd.getProdId());
         rtn.setProdClassId(prod.getProdClassId());