baolei il y a 8 mois
Parent
commit
7d90e16cd4
15 fichiers modifiés avec 334 ajouts et 112 suppressions
  1. 3 22
      08.src/Xingxi/xingxi-miniprogram-api/src/main/java/com/xingxi/api/controller/HomepageApiController.java
  2. 43 0
      08.src/Xingxi/xingxi-miniprogram-api/src/main/java/com/xingxi/api/controller/ProdApiController.java
  3. 17 0
      08.src/Xingxi/xingxi-miniprogram-api/src/main/java/com/xingxi/api/data/mapper/WxApiProductMapper.java
  4. 15 0
      08.src/Xingxi/xingxi-miniprogram-api/src/main/java/com/xingxi/api/model/MercProdListResponse.java
  5. 11 4
      08.src/Xingxi/xingxi-miniprogram-api/src/main/java/com/xingxi/api/model/MercProdRequest.java
  6. 46 0
      08.src/Xingxi/xingxi-miniprogram-api/src/main/java/com/xingxi/api/model/MercProdResponse.java
  7. 30 0
      08.src/Xingxi/xingxi-miniprogram-api/src/main/java/com/xingxi/api/model/ProdAttrResponse.java
  8. 0 15
      08.src/Xingxi/xingxi-miniprogram-api/src/main/java/com/xingxi/api/model/ProdListResponse.java
  9. 14 0
      08.src/Xingxi/xingxi-miniprogram-api/src/main/java/com/xingxi/api/service/ProdServiceI.java
  10. 118 0
      08.src/Xingxi/xingxi-miniprogram-api/src/main/java/com/xingxi/api/service/impl/ProdServiceImpl.java
  11. BIN
      08.src/Xingxi/xingxi-miniprogram-api/src/main/resources/META-INF/apiclient_cert.p12
  12. 0 25
      08.src/Xingxi/xingxi-miniprogram-api/src/main/resources/META-INF/apiclient_cert.pem
  13. 0 28
      08.src/Xingxi/xingxi-miniprogram-api/src/main/resources/META-INF/apiclient_key.pem
  14. 37 0
      08.src/Xingxi/xingxi-miniprogram-api/src/main/resources/META-INF/sqlmap/WxApiProductMapper.xml
  15. 0 18
      08.src/Xingxi/xingxi-miniprogram-api/src/main/resources/META-INF/证书使用说明.txt

+ 3 - 22
08.src/Xingxi/xingxi-miniprogram-api/src/main/java/com/xingxi/api/controller/HomepageApiController.java

@@ -13,17 +13,16 @@ import com.xingxi.business.SuggestProd.service.ISuggestProdService;
 import com.xingxi.common.enums.EDelFlag;
 import com.xingxi.master.ipInfo.domain.IpInfo;
 import com.xingxi.master.ipInfo.service.IIpInfoService;
-import com.xingxi.master.product.domain.Prod;
 import com.xingxi.master.product.domain.ProdClass;
 import com.xingxi.master.product.service.IProdClassService;
-import com.xingxi.master.product.service.IProdService;
 import com.xingxi.system.service.ISysConfigService;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
-import javax.validation.Valid;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -49,9 +48,6 @@ public class HomepageApiController extends BaseApiController {
     @Autowired
     private INewProdService rightProdService;
 
-    @Autowired
-    private IProdService prodService;
-
     @GetMapping("/banners")
     public BannerResponse getBanners(){
         Banner cond = new Banner();
@@ -118,19 +114,4 @@ public class HomepageApiController extends BaseApiController {
         return new ProdClassResponse(prodClassService.selectProdClassList(cond));
     }
 
-    @PostMapping("/prods")
-    public ProdListResponse getProdList(@Valid @RequestBody ProdRequest request) {
-        Prod cond = new Prod();
-        cond.setId(request.getId());
-        cond.setIpId(request.getIpId());
-        cond.setProdClassId(request.getProdClassId());
-        cond.setProdName(request.getProdName());
-        cond.setDelFlag(EDelFlag.NO.getVal());
-
-        return new ProdListResponse(prodService.selectProdList(cond));
-    }
-
-
-
-
 }

+ 43 - 0
08.src/Xingxi/xingxi-miniprogram-api/src/main/java/com/xingxi/api/controller/ProdApiController.java

@@ -0,0 +1,43 @@
+package com.xingxi.api.controller;
+
+import com.xingxi.api.common.BaseApiController;
+import com.xingxi.api.model.*;
+import com.xingxi.api.service.ProdServiceI;
+import com.xingxi.common.enums.EDelFlag;
+import com.xingxi.common.enums.ERoleKey;
+import com.xingxi.master.product.domain.*;
+import com.xingxi.master.product.service.IProdAttrService;
+import com.xingxi.master.product.service.IProdPicService;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.validation.Valid;
+import java.util.ArrayList;
+import java.util.List;
+
+@Slf4j
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/api/homepage")
+public class ProdApiController extends BaseApiController {
+
+    @Autowired
+    private ProdServiceI prodService;
+
+    @PostMapping("/prods")
+    public MercProdListResponse getProdList(@Valid @RequestBody MercProdRequest request) {
+
+        List<MercProdResponse> prodList = prodService.selectMercProdList(request);
+
+        return new MercProdListResponse(prodList);
+    }
+
+    @PostMapping("/prodDetail")
+    public MercProdResponse getProdDetail(@Valid @RequestBody MercProdRequest request) {
+
+        return prodService.selectMercProdById(request.getMercProdId());
+
+    }
+}

+ 17 - 0
08.src/Xingxi/xingxi-miniprogram-api/src/main/java/com/xingxi/api/data/mapper/WxApiProductMapper.java

@@ -0,0 +1,17 @@
+package com.xingxi.api.data.mapper;
+
+import com.xingxi.api.model.MercProdRequest;
+import com.xingxi.api.model.MercProdResponse;
+import com.xingxi.master.merchant.mapper.MerchantProdMapper;
+import com.xingxi.master.product.mapper.ProdMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
+
+@Mapper
+public interface WxApiProductMapper extends ProdMapper, MerchantProdMapper {
+
+    List<MercProdResponse> selectProductList(MercProdRequest request);
+
+
+}

+ 15 - 0
08.src/Xingxi/xingxi-miniprogram-api/src/main/java/com/xingxi/api/model/MercProdListResponse.java

@@ -0,0 +1,15 @@
+package com.xingxi.api.model;
+
+import lombok.Data;
+import lombok.Value;
+
+import java.util.List;
+
+@Data
+@Value
+public class MercProdListResponse {
+
+    // 只有prod内容和prodpic有内容,其他没有,画面显示第一张
+    List<MercProdResponse> mercProdList;
+
+}

+ 11 - 4
08.src/Xingxi/xingxi-miniprogram-api/src/main/java/com/xingxi/api/model/ProdRequest.java → 08.src/Xingxi/xingxi-miniprogram-api/src/main/java/com/xingxi/api/model/MercProdRequest.java

@@ -3,10 +3,18 @@ package com.xingxi.api.model;
 import lombok.Data;
 
 @Data
-public class ProdRequest {
+public class MercProdRequest {
 
-    // 主键
-    private Long id;
+    private Long mercProdId;
+
+    // 商户ID
+    private Long mercId;
+
+    // 商品ID
+    private Long prodId;
+
+    // 商品属性ID
+    private Long prodAttrId;
 
     // 商品分类ID
     private Long prodClassId;
@@ -17,5 +25,4 @@ public class ProdRequest {
     // 商品名称
     private String prodName;
 
-
 }

+ 46 - 0
08.src/Xingxi/xingxi-miniprogram-api/src/main/java/com/xingxi/api/model/MercProdResponse.java

@@ -0,0 +1,46 @@
+package com.xingxi.api.model;
+
+import com.xingxi.master.product.domain.ProdPic;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class MercProdResponse {
+
+    private Long mercProdId;
+
+    // 商户ID
+    private Long mercId;
+
+    // 商品分类ID
+    private Long prodClassId;
+
+    // 商品名称
+    private Long prodId;
+
+    private String prodName;
+
+    // IPID
+    private Long ipId;
+
+    // 设计师ID
+    private Long designerId;
+
+    // 商品描述
+    private String description;
+
+    // 商品状态
+    private String prodStatus;
+
+    // 确认其他平台ID
+    private String thirdIdConfirmFlag;
+
+    // 删除标志
+    private String delFlag;
+
+    List<ProdPic> prodPicList;
+
+    List<ProdAttrResponse> prodAttrList;
+
+}

+ 30 - 0
08.src/Xingxi/xingxi-miniprogram-api/src/main/java/com/xingxi/api/model/ProdAttrResponse.java

@@ -0,0 +1,30 @@
+package com.xingxi.api.model;
+
+import com.xingxi.master.product.domain.ProdAttrJoint;
+import com.xingxi.master.product.domain.ProdAttrPrice;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class ProdAttrResponse {
+
+    private Long prodAttrId;
+
+    // 商品ID
+    private Long prodId;
+
+    // 属性名称
+    private String attrName;
+
+    // 属性种类
+    private String attrType;
+
+    // 删除标志
+    private String delFlag;
+
+    ProdAttrPrice prodAttrPrice;
+
+    List<ProdAttrJoint> prodAttrJointList;
+
+}

+ 0 - 15
08.src/Xingxi/xingxi-miniprogram-api/src/main/java/com/xingxi/api/model/ProdListResponse.java

@@ -1,15 +0,0 @@
-package com.xingxi.api.model;
-
-import com.xingxi.master.product.domain.Prod;
-import lombok.Data;
-import lombok.Value;
-
-import java.util.List;
-
-@Data
-@Value
-public class ProdListResponse {
-
-    List<Prod> prodList;
-
-}

+ 14 - 0
08.src/Xingxi/xingxi-miniprogram-api/src/main/java/com/xingxi/api/service/ProdServiceI.java

@@ -0,0 +1,14 @@
+package com.xingxi.api.service;
+
+import com.xingxi.api.model.MercProdRequest;
+import com.xingxi.api.model.MercProdResponse;
+
+import java.util.List;
+
+public interface ProdServiceI {
+
+    List<MercProdResponse> selectMercProdList(MercProdRequest request);
+
+    MercProdResponse selectMercProdById(Long mercProdId);
+
+}

+ 118 - 0
08.src/Xingxi/xingxi-miniprogram-api/src/main/java/com/xingxi/api/service/impl/ProdServiceImpl.java

@@ -0,0 +1,118 @@
+package com.xingxi.api.service.impl;
+
+import com.xingxi.api.data.mapper.WxApiProductMapper;
+import com.xingxi.api.model.MercProdRequest;
+import com.xingxi.api.model.MercProdResponse;
+import com.xingxi.api.model.ProdAttrResponse;
+import com.xingxi.api.service.ProdServiceI;
+import com.xingxi.common.enums.EDelFlag;
+import com.xingxi.common.enums.ERoleKey;
+import com.xingxi.master.merchant.domain.MerchantProd;
+import com.xingxi.master.product.domain.*;
+import com.xingxi.master.product.service.IProdAttrJointService;
+import com.xingxi.master.product.service.IProdAttrPriceService;
+import com.xingxi.master.product.service.IProdAttrService;
+import com.xingxi.master.product.service.IProdPicService;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.validation.annotation.Validated;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@Slf4j
+@RequiredArgsConstructor
+@Service
+@Validated
+class ProdServiceImpl implements ProdServiceI {
+
+    @Autowired
+    WxApiProductMapper productMapper;
+
+    @Autowired
+    IProdPicService prodPicService;
+
+    @Autowired
+    IProdAttrService prodAttrService;
+
+    @Autowired
+    IProdAttrPriceService prodAttrPriceService;
+
+    @Autowired
+    IProdAttrJointService prodAttrJointService;
+
+    @Override
+    public List<MercProdResponse> selectMercProdList(MercProdRequest request) {
+        return productMapper.selectProductList(request);
+    }
+
+    @Override
+    public MercProdResponse selectMercProdById(Long mercProdId) {
+        MercProdResponse rtn = new MercProdResponse();
+
+        MerchantProd mercProd = productMapper.selectMerchantProdByMercProdId(mercProdId);
+
+        rtn.setMercProdId(mercProd.getMercProdId());
+        rtn.setMercId(mercProd.getMercId());
+        rtn.setProdId(mercProd.getProdId());
+        Prod prod = productMapper.selectProdById(mercProd.getProdId());
+        rtn.setProdClassId(prod.getProdClassId());
+        rtn.setProdName(prod.getProdName());
+        rtn.setIpId(prod.getIpId());
+        rtn.setDesignerId(prod.getDesignerId());
+        rtn.setDescription(prod.getDescription());
+        rtn.setThirdIdConfirmFlag(prod.getThirdIdConfirmFlag());
+        rtn.setProdStatus(prod.getProdStatus());
+
+        ProdPic condPic = new ProdPic();
+        condPic.setProdId(mercProd.getProdId());
+        condPic.setDelFlag(EDelFlag.NO.getVal());
+
+        List<ProdPic> prodPicList = prodPicService.selectProdPicList(condPic);
+        rtn.setProdPicList(prodPicList);
+
+        ProdAttr condAttr = new ProdAttr();
+        condAttr.setProdId(prod.getId());
+        condAttr.setDelFlag(EDelFlag.NO.getVal());
+
+        List<ProdAttr> prodAttrList = prodAttrService.selectProdAttrList(condAttr);
+
+        List<ProdAttrResponse> prodAttrResponseList = new ArrayList<>();
+
+        for (ProdAttr prodAttr : prodAttrList) {
+            ProdAttrResponse prodAttrResponse = new ProdAttrResponse();
+
+            prodAttrResponse.setProdAttrId(prodAttr.getProdAttrId());
+            prodAttrResponse.setProdId(prodAttr.getProdId());
+            prodAttrResponse.setAttrName(prodAttr.getAttrName());
+            prodAttrResponse.setAttrType(prodAttr.getAttrType());
+            prodAttrResponse.setDelFlag(prodAttr.getDelFlag());
+
+            ProdAttrPrice condPrice = new ProdAttrPrice();
+            condPrice.setProdAttrId(prodAttr.getProdAttrId());
+            condPrice.setProdId(prodAttr.getProdId());
+            condPrice.setDelFlag(EDelFlag.NO.getVal());
+            condPrice.setBuyerRoleKey(ERoleKey.CUSTOMER.getCode());
+            condPrice.setSellerId(mercProd.getMercId());
+
+            List<ProdAttrPrice> priceList = prodAttrPriceService.selectProdAttrPriceList(condPrice);
+            if (priceList != null && !priceList.isEmpty()) {
+                prodAttrResponse.setProdAttrPrice(priceList.get(0));
+            }
+
+            ProdAttrJoint condJoint = new ProdAttrJoint();
+            condJoint.setDelFlag(EDelFlag.NO.getVal());
+            condJoint.setProdId(prodAttr.getProdId());
+            condJoint.setProdAttrId(prodAttr.getProdAttrId());
+
+            List<ProdAttrJoint> prodAttrJointList = prodAttrJointService.selectProdAttrJointList(condJoint);
+            prodAttrResponse.setProdAttrJointList(prodAttrJointList);
+        }
+
+        rtn.setProdAttrList(prodAttrResponseList);
+
+        return rtn;
+    }
+}

BIN
08.src/Xingxi/xingxi-miniprogram-api/src/main/resources/META-INF/apiclient_cert.p12


+ 0 - 25
08.src/Xingxi/xingxi-miniprogram-api/src/main/resources/META-INF/apiclient_cert.pem

@@ -1,25 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIEKDCCAxCgAwIBAgIUdCdkhggFaKwVktqceNxq5OHro4swDQYJKoZIhvcNAQEL
-BQAwXjELMAkGA1UEBhMCQ04xEzARBgNVBAoTClRlbnBheS5jb20xHTAbBgNVBAsT
-FFRlbnBheS5jb20gQ0EgQ2VudGVyMRswGQYDVQQDExJUZW5wYXkuY29tIFJvb3Qg
-Q0EwHhcNMjMxMjI1MDQxMDQ3WhcNMjgxMjIzMDQxMDQ3WjCBgTETMBEGA1UEAwwK
-MTY2MjY1NzY2NzEbMBkGA1UECgwS5b6u5L+h5ZWG5oi357O757ufMS0wKwYDVQQL
-DCTkuIrmtbfkuYnliqLmlofljJbkvKDlqpLmnInpmZDlhazlj7gxCzAJBgNVBAYT
-AkNOMREwDwYDVQQHDAhTaGVuWmhlbjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC
-AQoCggEBALbknccE4FRxqKqgqdLT0c8XzFVvi/WrReN7Q9OByEPA46WDXZyUX8Au
-A19B+XJJ+i1HGGFy81zxuwvoZcUxxcE2iqrnoegUeGQ0KxqKzp10+vA21jOfb/QK
-e9bAJrqvd+Is2ZGd0CrnLuu7Cp0ewLCd4QK+Q9SQRe3WpdiaUYRqRl2+/o3uhgRi
-Mz1u0gA5X7UiXrVGrkYy7XGKBh+6hKb1EDupEdlhXsij/VdIrILQhGa8yo4SdgMY
-n2EhjLtD2o57JyS4O7b2uOm+aiU0HmLYzo4c1RXIUxMU2OTH995NynY9nwmzgtyk
-4i8Hpjm79Wg8LolzcJken22bmHjdXscCAwEAAaOBuTCBtjAJBgNVHRMEAjAAMAsG
-A1UdDwQEAwID+DCBmwYDVR0fBIGTMIGQMIGNoIGKoIGHhoGEaHR0cDovL2V2Y2Eu
-aXRydXMuY29tLmNuL3B1YmxpYy9pdHJ1c2NybD9DQT0xQkQ0MjIwRTUwREJDMDRC
-MDZBRDM5NzU0OTg0NkMwMUMzRThFQkQyJnNnPUhBQ0M0NzFCNjU0MjJFMTJCMjdB
-OUQzM0E4N0FEMUNERjU5MjZFMTQwMzcxMA0GCSqGSIb3DQEBCwUAA4IBAQBI+C1/
-pRYqxhwD93GABQVw8mmwsOIe+15RAQN/ZhfIt265h3aQxJ8pSYYm8sSUPemFv9vE
-6sSOwuXLnwxFN/JPyVjXd/oxFwubPg6c+GImgkkXRlWJC1OAtjLMGccsxdCVbxs/
-qezHXtyUrp5PjD/LENK/TeEJgcxBl37pQw9vFpOrJm4wpWrKHCGC/EuVbvB5fZyo
-P53J0VKH3ppxECv/0rdV6Jkq9jYwKaIcMsNTLZ7sQzKeCsChSSC39SA61DDZ2UhE
-QfQvyorB5FlrOiDkqDp1QLd/Tuhtw7gFMW6YpVciUbswNGOGoUZnR1bI42Owm+TK
-1xG6P+zA37wHmLuL
------END CERTIFICATE-----

+ 0 - 28
08.src/Xingxi/xingxi-miniprogram-api/src/main/resources/META-INF/apiclient_key.pem

@@ -1,28 +0,0 @@
------BEGIN PRIVATE KEY-----
-MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQC25J3HBOBUcaiq
-oKnS09HPF8xVb4v1q0Xje0PTgchDwOOlg12clF/ALgNfQflySfotRxhhcvNc8bsL
-6GXFMcXBNoqq56HoFHhkNCsais6ddPrwNtYzn2/0CnvWwCa6r3fiLNmRndAq5y7r
-uwqdHsCwneECvkPUkEXt1qXYmlGEakZdvv6N7oYEYjM9btIAOV+1Il61Rq5GMu1x
-igYfuoSm9RA7qRHZYV7Io/1XSKyC0IRmvMqOEnYDGJ9hIYy7Q9qOeyckuDu29rjp
-vmolNB5i2M6OHNUVyFMTFNjkx/feTcp2PZ8Js4LcpOIvB6Y5u/VoPC6Jc3CZHp9t
-m5h43V7HAgMBAAECggEBAIUQvIKKV7TYpQDPt/8+Qc5M4EvgxpHNNSIXEvgV2uEA
-vCA1/avof+nREH8D/ztZ+31p1qFAAzRCY/Z79V+NoPW8exNxR+kUy6sMEbhT+ZOy
-Ask2/I2+mLOT1Rof343AEJcsTneVvFkarpawFT7Pmx5lH8rhJ3TGKzqqCywWyuxt
-MT/W0meJMMTGrZNeNxurmQtayLtBQV+//Wo9R8LbxsdjxuurVBDcrhnYPoP8h4oE
-Z2tm5X2DjyspIKnkYW5khev+L72TzMLUwdCcgNsg0K8MN/weqX8pOy0wHSC6V4O3
-w7kMF9TY4mXGV26AODEwZwN427g3WpiHEuaJ4I6YwWECgYEA8hOQu8piHIPO4IHw
-mwwc8f57454Mi1LAQP2q+ZEOyki7CpJzGH/YDZJd2bTOm4Jxxim07IRKhbepcJJM
-R7TgtU02U73ycrrnjiC7TC2rUHgxo/a+7VQXgUTKZONZCzyScHtaqMxo3Ddt4Psw
-K7OVeXQ3aaoIU3C7em93hR1TKa8CgYEAwWmcIPLXBwlpCSrd3U3i07/tv0aMdbvq
-WdhwFabHmDRxX7NQU3Xb1QQHqiraIR2vQhmE5L9ECCOz7V3E5eqDHvs2/zaE9YsJ
-I8bc53E9CheNu9Q5qBJWpEO5KIDqVSc6ZLllztvdGOGfLSiXIktuzV4vGg+KHA1q
-asTh/UGymmkCgYEAkCXobHqiG5q9aODXVmxLHCrOuQaXL6tyAgFLe1rOdNQEVNJK
-KQ+Ppt0+d3H8CYwOldKmAqTv/1oTUo47UAO8PxmgPROBuKHlWrPQ9BbJyZwY6yr2
-HDqT2I0O/C6JCnDiPoqlvJgj5OY4ztyknZFNc8opaQkv9gfOC6UuhZyltc8CgYAZ
-NAXgVUSn6hYB19ApcmjIZw44Cp1rCh2zr3yLlbwUnWDYs6kX9xe6XlgRWJwsDI41
-8tVaaYIX/W8I01tBCpojg2DbSONyi7eZLeTDVAI8Om2BuFn7CMi5hwmtuX7Psdju
-HyqhFg1tnJj9bXikQ2gg4tEIeFXq6eSgHR/FvLXlYQKBgBc24IHHu2nfLctpd16s
-z89nSvpHZnLkYODxqr0LqRg0mJ1iBIbEDJ2xN39xkTT6ch99nWdSEXNN04qXK92h
-KKbDrekQii/kgUE6WsO+EBIZvVX3gdamWDg28ZEDQ9xFfLem4dOckKllATWMB/zn
-1EbfS75RCmenEaiut2EMPYc/
------END PRIVATE KEY-----

+ 37 - 0
08.src/Xingxi/xingxi-miniprogram-api/src/main/resources/META-INF/sqlmap/WxApiProductMapper.xml

@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.xingxi.api.data.mapper.WxApiProductMapper">
+
+    <resultMap id="MercProdResponse" type="MercProdResponse">
+        <id property="mercProdId"    column="mercProdId"/>
+        <result property="mercId" column="mercId"/>
+        <result property="prodClassId"    column="prodClassId"/>
+        <result property="prodId"    column="prodId"/>
+        <result property="prodName"    column="prodName"/>
+        <result property="ipId"    column="ipId"/>
+        <result property="designerId"    column="designerId"/>
+        <result property="description"    column="description"/>
+        <result property="prodStatus"    column="prodStatus"/>
+        <result property="thirdIdConfirmFlag"    column="thirdIdConfirmFlag"/>
+        <result property="delFlag"    column="delFlag"/>
+    </resultMap>
+
+    <select id="selectProductList" parameterType="MercProdRequest" resultMap="MercProdResponse">
+        SELECT mmp.mercProdId,mmp.mercId,mp.prodClassId,mmp.prodId,mp.prodName,mp.idId,mp.designerId,mp.description,mp.prodStatus,mmp.delFlag
+        FROM m_merchant_prod mmp
+        LEFT JOIN m_prod mp ON mmp.prodId = mp.id
+        <where>
+            mmp.shelfFlag = '1'
+            AND mmp.delFlag = '0'
+            <if test="mercProdId != null ">AND mmp.mercProdId = #{mercProdId}</if>
+            <if test="mercId != null ">AND mmp.mercId = #{mercId}</if>
+            <if test="prodId != null ">AND mmp.prodId = #{prodId}</if>
+            <if test="prodAttrId != null">AND mmp.prodAttrId = #{prodAttrId} </if>
+            <if test="prodClassId != null">AND mp.prodClassId = #{prodClassId} </if>
+            <if test="ipId != null">AND mp.ipId = #{ipId} </if>
+            <if test="prodName != null and prodName != ''">AND mp.prodName like concat('%',#{prodName},'%')</if>
+        </where>
+    </select>
+</mapper>

+ 0 - 18
08.src/Xingxi/xingxi-miniprogram-api/src/main/resources/META-INF/证书使用说明.txt

@@ -1,18 +0,0 @@
-欢迎使用微信支付!
-附件中的三份文件(证书pkcs12格式、证书pem格式、证书密钥pem格式),为接口中强制要求时需携带的证书文件。
-证书属于敏感信息,请妥善保管不要泄露和被他人复制。
-不同开发语言下的证书格式不同,以下为说明指引:
-    证书pkcs12格式(apiclient_cert.p12)
-        包含了私钥信息的证书文件,为p12(pfx)格式,由微信支付签发给您用来标识和界定您的身份
-        部分安全性要求较高的API需要使用该证书来确认您的调用身份
-        windows上可以直接双击导入系统,导入过程中会提示输入证书密码,证书密码默认为您的商户号(如:1900006031)
-    证书pem格式(apiclient_cert.pem)
-        从apiclient_cert.p12中导出证书部分的文件,为pem格式,请妥善保管不要泄漏和被他人复制
-        部分开发语言和环境,不能直接使用p12文件,而需要使用pem,所以为了方便您使用,已为您直接提供
-        您也可以使用openssl命令来自己导出:openssl pkcs12 -clcerts -nokeys -in apiclient_cert.p12 -out apiclient_cert.pem
-    证书密钥pem格式(apiclient_key.pem)
-        从apiclient_cert.p12中导出密钥部分的文件,为pem格式
-        部分开发语言和环境,不能直接使用p12文件,而需要使用pem,所以为了方便您使用,已为您直接提供
-        您也可以使用openssl命令来自己导出:openssl pkcs12 -nocerts -in apiclient_cert.p12 -out apiclient_key.pem
-备注说明:  
-        由于绝大部分操作系统已内置了微信支付服务器证书的根CA证书,  2018年3月6日后, 不再提供CA证书文件(rootca.pem)下载