add brand and product coding

smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/TransitionController.java

@@ -230,6 +230,8 @@ public class TransitionController {
 
 
 
+
+
     public ResponseDTO<String> addOperatreFullData(String type,String params,String result,Long startTime,Long elapsedTime,Long acceptTime,HttpServletRequest request){
         SimpleDateFormat dateformat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
         JSONObject jsonObject = JSONObject.parseObject(result);

smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/good/GoodController.java

@@ -24,10 +24,22 @@ public class GoodController {
     private GoodService goodService;
 
 
-    @ApiOperation(value = "商品", notes = "商品查询")
+    @ApiOperation(value = "处方粮商品", notes = "处方粮商品查询")
     @PostMapping("royalcanin/goods")
-    public List<GoodsEntity> transferGoods(@RequestBody GoodsEntity goodsEntity) throws Exception {
+    public List<GoodsEntity> transferGoods(String title) throws Exception {
-        return  goodService.listGoodsByName(goodsEntity);
+        return  goodService.listGoodsByNameBankNameTagUsedAge(title);
+    }
+
+    @ApiOperation(value = "查询标品信息", notes = "查询标品信息")
+    @PostMapping("royalcanin/h5/product/query")
+    public String transferBrand(GoodsEntity goodsEntity) throws Exception {
+        return goodService.brandQuery(goodsEntity);
+    }
+
+    @ApiOperation(value = "查询商品信息", notes = "查询标品信息")
+    @PostMapping("royalcanin/h5/product/query")
+    public String transferProducts(GoodsEntity goodsEntity) throws Exception {
+        return goodService.productQuery(goodsEntity);
     }
 
 }

smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/good/OrderController.java

@@ -2,6 +2,7 @@ package net.lab1024.smartadmin.module.system.royalcanin.good;
 
 
 import com.alipay.api.internal.util.AlipaySignature;
+import com.fasterxml.jackson.databind.ObjectMapper;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import net.lab1024.smartadmin.common.anno.OperateLog;
@@ -15,6 +16,8 @@ import net.lab1024.smartadmin.module.system.qrcode.QRCodeUtil;
 import net.lab1024.smartadmin.module.system.royalcanin.good.constant.OrderResponseCodeConst;
 import net.lab1024.smartadmin.module.system.royalcanin.good.model.OrdersEntity;
 import net.lab1024.smartadmin.module.system.royalcanin.good.service.OrderService;
+import net.lab1024.smartadmin.module.system.royalcanin.orderMaster.AddOrSaveEntity;
+import net.lab1024.smartadmin.module.system.royalcanin.orderMaster.QueryEntity;
 import net.lab1024.smartadmin.module.system.wxpay.WxpayService;
 import net.lab1024.smartadmin.module.system.wxpay.sdk.WXPayUtil;
 import net.lab1024.smartadmin.module.system.wxpay.wxPayModel.WxPayEntity;
@@ -24,10 +27,6 @@ import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
 import java.util.*;
 
 @Api(tags = {SwaggerTagConst.Admin.MANAGER_MALL_API})
@@ -154,4 +153,6 @@ public class OrderController {
         }
         return "failure";
     }
+
+
 }

smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/good/dao/GoodsDao.java

@@ -15,6 +15,6 @@ public interface GoodsDao extends BaseMapper<OrdersEntity> {
 
     GoodsEntity findByProductCode(String productCode);
 
-    List<GoodsEntity> selectRoleIdByGoodsName(String goodsName);
+    List<GoodsEntity> selectRoleIdByGoodsNameBankNameTagUsedAge(String goodsName);
 
 }

smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/good/model/GoodsEntity.java

@@ -22,9 +22,9 @@ public class GoodsEntity {
 
     private String tagUsedAge;
 
-    private String sliding_picture;
+    private String slidingPicture;
 
-    private String body_picture;
+    private String bodyPicture;
 
     private int isSales;
 

smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/good/service/GoodService.java

@@ -1,5 +1,6 @@
 package net.lab1024.smartadmin.module.system.royalcanin.good.service;
 
+import com.alibaba.fastjson.JSONObject;
 import net.lab1024.smartadmin.common.domain.ResponseDTO;
 import net.lab1024.smartadmin.module.system.royalcanin.good.dao.FlowDao;
 import net.lab1024.smartadmin.module.system.royalcanin.good.dao.GoodsDao;
@@ -7,14 +8,20 @@ import net.lab1024.smartadmin.module.system.royalcanin.good.dao.OrdersDao;
 import net.lab1024.smartadmin.module.system.royalcanin.good.model.FlowEntity;
 import net.lab1024.smartadmin.module.system.royalcanin.good.model.GoodsEntity;
 import net.lab1024.smartadmin.module.system.royalcanin.good.model.OrdersEntity;
+import net.lab1024.smartadmin.util.AESUtil;
+import net.lab1024.smartadmin.util.MapRemoveNullUtil;
+import net.lab1024.smartadmin.util.SmartHttpUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 @Service
 public class GoodService {
 
+    String url = "https://miniapp-test.royalcanin.com.cn/rcmini/h5/";
     @Autowired
    private OrdersDao ordersDao;
 
@@ -46,7 +53,29 @@ public class GoodService {
         return ResponseDTO.succ();
     }
 
-    public List<GoodsEntity> listGoodsByName(GoodsEntity goodsEntity){
+    public List<GoodsEntity> listGoodsByNameBankNameTagUsedAge(String title){
-        return goodsDao.selectRoleIdByGoodsName(goodsEntity.getProductName());
+        return goodsDao.selectRoleIdByGoodsNameBankNameTagUsedAge(title);
+    }
+
+    public String brandQuery(GoodsEntity goodsEntity) throws Exception {
+        Map<String, String> paramMap  = MapRemoveNullUtil.setConditionMap(goodsEntity);
+        MapRemoveNullUtil.removeNullEntry(paramMap);
+        paramMap.put("secret","H5@2021");
+        paramMap.put("channelId","15");
+        String sb = SmartHttpUtil.sendPostForm(url+"product/query",paramMap,null);
+        JSONObject jsonObject = JSONObject.parseObject(sb);
+        String result = AESUtil.decrypt(jsonObject.getString("data"), AESUtil.KEY);
+        return result;
+    }
+
+    public String productQuery(GoodsEntity goodsEntity) throws Exception {
+        Map<String, String> paramMap  = MapRemoveNullUtil.setConditionMap(goodsEntity);
+        MapRemoveNullUtil.removeNullEntry(paramMap);
+        paramMap.put("secret","H5@2021");
+        paramMap.put("channelId","15");
+        String sb = SmartHttpUtil.sendPostForm(url+"productMaster/query",paramMap,null);
+        JSONObject jsonObject = JSONObject.parseObject(sb);
+        String result = AESUtil.decrypt(jsonObject.getString("data"), AESUtil.KEY);
+        return result;
     }
 }

smart-admin-service/smart-admin-api/src/main/resources/mapper/system/royalcanin/good/GoodMapper.xml

@@ -8,7 +8,7 @@
         select * from t_good_goods WHERE productCode = #{productCode}
     </select>
 
-    <select id="selectRoleIdByGoodsName" resultMap="GoodsEntity">
+    <select id="selectRoleIdByGoodsNameBankNameTagUsedAge" resultMap="GoodsEntity">
         select
         product_code,
         product_name,
@@ -23,11 +23,11 @@
         isSales
          from t_good_goods
         <where>
-            <if test="product_name != null and product_name != ''">
+            <if test="goodsName != null and goodsName != ''">
-                <bind name="productName" value=" '%' + product_name +'%' "></bind>
+                <bind name="goodsName" value=" '%' + goodsName +'%' "></bind>
-                AND product_name like #{productName}
+                AND CONCAT(product_name,brand_name,category_name,tagUsedAge) like #{goodsName}
             </if>
-            <if test="product_name == null and product_name == ''">
+            <if test="goodsName == null and goodsName == ''">
                 AND isShow = 1
             </if>
         </where>