debugger

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

@@ -2,7 +2,6 @@ package net.lab1024.smartadmin.module.system.royalcanin.good;
 
 
 
-import com.alibaba.fastjson.JSONObject;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import net.lab1024.smartadmin.common.anno.OperateLog;

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

@@ -6,9 +6,12 @@ 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.module.system.royalcanin.productSearchTag.model.ProductSearchTagEntity;
+import net.lab1024.smartadmin.module.system.royalcanin.productSearchTag.service.ProductSearchTagService;
 import net.lab1024.smartadmin.util.AESUtil;
 import net.lab1024.smartadmin.util.MapRemoveNullUtil;
 import net.lab1024.smartadmin.util.SmartHttpUtil;
+import org.checkerframework.checker.units.qual.A;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.stereotype.Service;
@@ -30,6 +33,10 @@ public class GoodService {
     @Autowired
     private RedisTemplate redisTemplate;
 
+    @Autowired
+    private ProductSearchTagService productSearchTagService;
+
+
     public GoodsEntity listGoodsByProductCode(String productCode){
         String ip = "https://shop.royalcanin.com.cn/royalcanin/royalcanin/";
         GoodsEntity goodsEntity = goodsDao.findByProductCode(productCode);
@@ -82,6 +89,21 @@ public class GoodService {
         String sb = SmartHttpUtil.sendPostForm(url+"productSearchTag/query",paramMap,null);
         JSONObject jsonObject = JSONObject.parseObject(sb);
         String result = AESUtil.decryptLinux(jsonObject.getString("data"), AESUtil.KEY);
+        productSearchTagService.deleteAllSearchTag();
+        com.alibaba.fastjson.JSONArray jsonArray = JSONObject.parseArray(result);
+        for (int i = 0; i < jsonArray.size();i++){
+            JSONObject jsonObjectResult = (JSONObject)jsonArray.get(i);
+            ProductSearchTagEntity productSearchTagEntity = new ProductSearchTagEntity();
+            productSearchTagEntity.setBrandCode("16518816");
+            productSearchTagEntity.setBrandName(jsonObjectResult.getString("name"));
+            productSearchTagEntity.setIsDelete("0");
+            productSearchTagEntity.setId(jsonObjectResult.getString("id"));
+            productSearchTagEntity.setPetType(jsonObjectResult.getString("petType"));
+            productSearchTagEntity.setTagName(jsonObjectResult.getString("tagName"));
+            productSearchTagEntity.setTagType(jsonObjectResult.getString("tagType"));
+            productSearchTagEntity.setTagCode(jsonObjectResult.getString("tagCode"));
+            productSearchTagService.installAllSearchTag(productSearchTagEntity);
+        }
         return result;
     }
 

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

@@ -290,7 +290,7 @@ public class OrderService {
                 endTotal = total * buyCount - discount;
                 break;
             case "4" :
-                endTotal = (total * buyCount) * discount;
+                endTotal = (total * buyCount) * (1-discount);
                 break;
             case "6" :
                 endTotal = total * buyCount - discount;

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

@@ -13,4 +13,7 @@ import java.util.List;
 public interface ProductSearchTagDao extends BaseMapper<ProductSearchTagEntity> {
 
     List<ProductSearchTagEntity> findAllByCondition(@Param("brandNameList") List<String> brandNameList,@Param("petType")String petType,@Param("tagNameList") List<String> tagNameList,@Param("tagStatus")String tagStatus);
+
+
+    int deleteAllProductSearchTag();
 }

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

@@ -17,4 +17,12 @@ public class ProductSearchTagService {
     public List<ProductSearchTagEntity> findAllByCondition( List<String> brandNameList,String petType,List<String> tagNameList,String tagStatus){
         return productSearchTagDao.findAllByCondition(brandNameList,petType,tagNameList,tagStatus);
     }
+
+    public void deleteAllSearchTag(){
+        productSearchTagDao.deleteAllProductSearchTag();
+    }
+
+    public int installAllSearchTag(ProductSearchTagEntity ProductSearchTagEntity){
+        return productSearchTagDao.insert(ProductSearchTagEntity);
+    }
 }

smart-admin-service/smart-admin-api/src/main/resources/mapper/system/royalcanin/productSearchTag/ProductSearchTagMapper.xml

@@ -31,4 +31,8 @@
             AND pet_type = #{petType}
         </if>
     </select>
+
+    <delete id="deleteAllProductSearchTag">
+        delete from t_royalcanin_productsearchtag
+    </delete>
 </mapper>