From 79c1156767587f226caa237a726948514e1fdf0b Mon Sep 17 00:00:00 2001 From: Carl <376654749@qq.com> Date: Sun, 30 Jan 2022 18:28:57 +0800 Subject: [PATCH] debugger --- .../royalcanin/good/GoodController.java | 1 - .../royalcanin/good/service/GoodService.java | 22 +++++++++++++++++++ .../royalcanin/good/service/OrderService.java | 2 +- .../Dao/ProductSearchTagDao.java | 3 +++ .../service/ProductSearchTagService.java | 8 +++++++ .../ProductSearchTagMapper.xml | 4 ++++ 6 files changed, 38 insertions(+), 2 deletions(-) diff --git a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/good/GoodController.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/good/GoodController.java index 566ff0f7..e1cc7c96 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/good/GoodController.java +++ b/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; diff --git a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/good/service/GoodService.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/good/service/GoodService.java index b6ab2076..1e844e4e 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/good/service/GoodService.java +++ b/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; } diff --git a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/good/service/OrderService.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/good/service/OrderService.java index f18c2762..72d712ae 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/good/service/OrderService.java +++ b/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; diff --git a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/productSearchTag/Dao/ProductSearchTagDao.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/productSearchTag/Dao/ProductSearchTagDao.java index dca1469d..6cdcb309 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/productSearchTag/Dao/ProductSearchTagDao.java +++ b/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 { List findAllByCondition(@Param("brandNameList") List brandNameList,@Param("petType")String petType,@Param("tagNameList") List tagNameList,@Param("tagStatus")String tagStatus); + + + int deleteAllProductSearchTag(); } diff --git a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/productSearchTag/service/ProductSearchTagService.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/productSearchTag/service/ProductSearchTagService.java index 0b707e3e..aa23020e 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/productSearchTag/service/ProductSearchTagService.java +++ b/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 findAllByCondition( List brandNameList,String petType,List tagNameList,String tagStatus){ return productSearchTagDao.findAllByCondition(brandNameList,petType,tagNameList,tagStatus); } + + public void deleteAllSearchTag(){ + productSearchTagDao.deleteAllProductSearchTag(); + } + + public int installAllSearchTag(ProductSearchTagEntity ProductSearchTagEntity){ + return productSearchTagDao.insert(ProductSearchTagEntity); + } } diff --git a/smart-admin-service/smart-admin-api/src/main/resources/mapper/system/royalcanin/productSearchTag/ProductSearchTagMapper.xml b/smart-admin-service/smart-admin-api/src/main/resources/mapper/system/royalcanin/productSearchTag/ProductSearchTagMapper.xml index 173afd8e..9d416260 100644 --- a/smart-admin-service/smart-admin-api/src/main/resources/mapper/system/royalcanin/productSearchTag/ProductSearchTagMapper.xml +++ b/smart-admin-service/smart-admin-api/src/main/resources/mapper/system/royalcanin/productSearchTag/ProductSearchTagMapper.xml @@ -31,4 +31,8 @@ AND pet_type = #{petType} + + + delete from t_royalcanin_productsearchtag + \ No newline at end of file