adding good script

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

@@ -15,6 +15,8 @@ public class CouponService {
     private String url = "http://miniapp-test.royalcanin.com.cn:7080/crm/coupon/";
 
     public String couponCancel(CouponCancelEntity couponCancelEntity) throws Exception{
+        couponCancelEntity.setChannelId(15);
+        couponCancelEntity.setChannelSecurity("H5@2021");
         Map<String, String> paramMap  = MapRemoveNullUtil.setConditionMap(couponCancelEntity);
         net.sf.json.JSONObject jsonObject = net.sf.json.JSONObject.fromObject(paramMap);
         MapRemoveNullUtil.removeNullEntry(paramMap);
@@ -22,6 +24,8 @@ public class CouponService {
     }
 
     public String couponCosume(CouponCosumeEntity couponCosumeEntity) throws Exception{
+        couponCosumeEntity.setChannelId(15);
+        couponCosumeEntity.setChannelSecurity("H5@2021");
         Map<String, String> paramMap  = MapRemoveNullUtil.setConditionMap(couponCosumeEntity);
         paramMap.put("petCategoryId",StringUtil.toString(couponCosumeEntity.getPetCategoryId()).equals("0")?null:StringUtil.toString(couponCosumeEntity.getPetCategoryId()));
         paramMap.put("petBodySizeId",StringUtil.toString(couponCosumeEntity.getPetBodySizeId()).equals("0")?null:StringUtil.toString(couponCosumeEntity.getPetBodySizeId()));
@@ -31,6 +35,8 @@ public class CouponService {
     }
 
     public String couponFetch(CouponFetchEntity couponFetchEntity) throws Exception{
+        couponFetchEntity.setChannelId(15);
+        couponFetchEntity.setChannelSecurity("H5@2021");
         Map<String, String> paramMap  = MapRemoveNullUtil.setConditionMap(couponFetchEntity);
         MapRemoveNullUtil.removeNullEntry(paramMap);
         net.sf.json.JSONObject jsonObject = net.sf.json.JSONObject.fromObject(paramMap);
@@ -38,6 +44,8 @@ public class CouponService {
     }
 
     public String couponGetAll(CouponGetAllEntity couponGetAllEntity) throws Exception{
+        couponGetAllEntity.setChannelId(15);
+        couponGetAllEntity.setChannelSecurity("H5@2021");
         Map<String, String> paramMap  = MapRemoveNullUtil.setConditionMap(couponGetAllEntity);
         paramMap.put("status",StringUtil.toString(couponGetAllEntity.getStatus()).equals("0")?null:StringUtil.toString(couponGetAllEntity.getStatus()));
         paramMap.put("page",StringUtil.toString(couponGetAllEntity.getPage()).equals("0")?null:StringUtil.toString(couponGetAllEntity.getPage()));
@@ -48,6 +56,8 @@ public class CouponService {
     }
 
     public String couponGet(CouponGetEntity couponGetEntity) throws Exception{
+        couponGetEntity.setChannelId(15);
+        couponGetEntity.setChannelSecurity("H5@2021");
         Map<String, String> paramMap  = MapRemoveNullUtil.setConditionMap(couponGetEntity);
         MapRemoveNullUtil.removeNullEntry(paramMap);
         net.sf.json.JSONObject jsonObject = net.sf.json.JSONObject.fromObject(paramMap);
@@ -56,6 +66,8 @@ public class CouponService {
 
 
     public String couponV2GetAll(CouponV2GetAllEntity couponV2GetAllEntity) throws Exception{
+        couponV2GetAllEntity.setChannelId(15);
+        couponV2GetAllEntity.setChannelSecurity("H5@2021");
         Map<String, String> paramMap  = MapRemoveNullUtil.setConditionMap(couponV2GetAllEntity);
         paramMap.put("memberId",StringUtil.toString(couponV2GetAllEntity.getMemberId()).equals("0")?null:StringUtil.toString(couponV2GetAllEntity.getMemberId()));
         paramMap.put("activityId",StringUtil.toString(couponV2GetAllEntity.getActivityId()).equals("0")?null:StringUtil.toString(couponV2GetAllEntity.getActivityId()));
@@ -65,6 +77,5 @@ public class CouponService {
         MapRemoveNullUtil.removeNullEntry(paramMap);
         net.sf.json.JSONObject jsonObject = net.sf.json.JSONObject.fromObject(paramMap);
         return SmartHttpUtil.sendPostForm(url+"v2/getAll",paramMap,null);
-//        return SmartHttpUtil.httpPostRaw(url+"v2/getAll",jsonObject.toString(),null,"utf-8");
     }
 }

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

@@ -16,6 +16,8 @@ import net.lab1024.smartadmin.module.system.royalcanin.good.constant.OrderRespon
 import net.lab1024.smartadmin.module.system.royalcanin.good.dao.CartDao;
 import net.lab1024.smartadmin.module.system.royalcanin.good.model.CartEntity;
 import net.lab1024.smartadmin.module.system.royalcanin.good.model.GoodsEntity;
+import net.lab1024.smartadmin.module.system.royalcanin.good.model.ProductMasterQueryEntity;
+import net.lab1024.smartadmin.module.system.royalcanin.good.model.ProductQueryEntity;
 import net.lab1024.smartadmin.module.system.royalcanin.good.service.CartService;
 import net.lab1024.smartadmin.module.system.royalcanin.good.service.GoodService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -54,24 +56,11 @@ public class GoodController {
     }
 
     @ApiOperation(value = "查询标品信息", notes = "查询标品信息")
-    @PostMapping("royalcanin/h5/brand/query")
+    @PostMapping("royalcanin/product/query")
-    public String transferBrand(GoodsEntity goodsEntity) throws Exception {
+    public String transferBrand(ProductQueryEntity productQueryEntity) throws Exception {
         String result = "null";
         long startTime = System.currentTimeMillis();
-        result  = goodService.brandQuery(goodsEntity);
+        result  = goodService.brandQuery(productQueryEntity);
-        long acceptTime = System.currentTimeMillis() ;
-        long elapsedTime = acceptTime - startTime;
-        //记录服务响应时间
-        addOperatreFullData("royalcanin/h5/brand/query",result.length()+"", startTime,elapsedTime,acceptTime,result.length() >0 ?"1":"0",result.length() >0 ?"SUCCESS":"FAIL");
-        return result;
-    }
-
-    @ApiOperation(value = "查询商品信息", notes = "查询标品信息")
-    @PostMapping("royalcanin/h5/product/query")
-    public String transferProducts(GoodsEntity goodsEntity) throws Exception {
-
-        long startTime = System.currentTimeMillis();
-        String result = goodService.productQuery(goodsEntity);
         long acceptTime = System.currentTimeMillis() ;
         long elapsedTime = acceptTime - startTime;
         //记录服务响应时间
@@ -79,8 +68,21 @@ public class GoodController {
         return result;
     }
 
+    @ApiOperation(value = "查询商品信息", notes = "查询标品信息")
+    @PostMapping("royalcanin/productMaster/query")
+    public String transferProducts(ProductMasterQueryEntity productMasterQueryEntity) throws Exception {
+
+        long startTime = System.currentTimeMillis();
+        String result = goodService.productQuery(productMasterQueryEntity);
+        long acceptTime = System.currentTimeMillis() ;
+        long elapsedTime = acceptTime - startTime;
+        //记录服务响应时间
+        addOperatreFullData("royalcanin/h5/productMaster/query",result.length()+"", startTime,elapsedTime,acceptTime,result.length() >0 ?"1":"0",result.length() >0 ?"SUCCESS":"FAIL");
+        return result;
+    }
+
     @ApiOperation(value = "查询筛选标签信息", notes = "查询筛选标签信息")
-    @PostMapping("royalcanin/h5/productSearchTag/query")
+    @PostMapping("royalcanin/productSearchTag/query")
     public String transferProductSearchTag() throws Exception {
         return goodService.productSearchQuery();
     }

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

@@ -0,0 +1,22 @@
+package net.lab1024.smartadmin.module.system.royalcanin.good.model;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class ProductMasterQueryEntity {
+
+    private String channelId;
+    private String secret;
+    private String page;
+    private String rows;
+    private String productCode;
+    private String productName;
+    private String productType;
+    private String brandCode;
+    private String brandName;
+
+}

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

@@ -0,0 +1,27 @@
+package net.lab1024.smartadmin.module.system.royalcanin.good.model;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class ProductQueryEntity {
+
+    private String channelId;
+    private String secret;
+    private String page;
+    private String rows;
+    private String productCode;
+    private String name;
+    private String brandCode;
+    private String brandName;
+    private String petType;
+    private String categoryName;
+    private String tagUsedAge;
+    private String tagFunction;
+    private String tagBreed;
+    private String isSales;
+
+}

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

@@ -3,6 +3,8 @@ package net.lab1024.smartadmin.module.system.royalcanin.good.service;
 import com.alibaba.fastjson.JSONObject;
 import net.lab1024.smartadmin.module.system.royalcanin.good.dao.GoodsDao;
 import net.lab1024.smartadmin.module.system.royalcanin.good.model.GoodsEntity;
+import net.lab1024.smartadmin.module.system.royalcanin.good.model.ProductMasterQueryEntity;
+import net.lab1024.smartadmin.module.system.royalcanin.good.model.ProductQueryEntity;
 import net.lab1024.smartadmin.util.AESUtil;
 import net.lab1024.smartadmin.util.MapRemoveNullUtil;
 import net.lab1024.smartadmin.util.SmartHttpUtil;
@@ -29,8 +31,8 @@ public class GoodService {
         return goodsDao.selectRoleIdByGoodsNameBankNameTagUsedAge(title);
     }
 
-    public String brandQuery(GoodsEntity goodsEntity) throws Exception {
+    public String brandQuery(ProductQueryEntity productQueryEntity) throws Exception {
-        Map<String, String> paramMap  = MapRemoveNullUtil.setConditionMap(goodsEntity);
+        Map<String, String> paramMap  = MapRemoveNullUtil.setConditionMap(productQueryEntity);
         MapRemoveNullUtil.removeNullEntry(paramMap);
         paramMap.put("secret","H5@2021");
         paramMap.put("channelId","15");
@@ -40,15 +42,13 @@ public class GoodService {
         return result;
     }
 
-    public String productQuery(GoodsEntity goodsEntity) throws Exception {
+    public String productQuery(ProductMasterQueryEntity productMasterQueryEntity) throws Exception {
-        Map<String, String> paramMap  = MapRemoveNullUtil.setConditionMap(goodsEntity);
+        Map<String, String> paramMap  = MapRemoveNullUtil.setConditionMap(productMasterQueryEntity);
         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);
+        return sb;
-        String result = AESUtil.decryptLinux(jsonObject.getString("data"), AESUtil.KEY);
-        return result;
     }
 
     public String productSearchQuery()throws Exception{