三方服务-调整大淘客功能

commons-pojo/src/main/java/com/bjtdba/entity/thirdPartyWares/ThirdPartyWares.java

@@ -13,6 +13,7 @@ public class ThirdPartyWares {
     private String commission;//佣金
 
     private Number commission_rate;//佣金比例
+    private Number commission_rate_original;//佣金比例
 
     private Integer commission_type;//佣金类型，0-通用，1-定向，2-高佣，3-营销计划
 
@@ -113,6 +114,14 @@ public class ThirdPartyWares {
         this.commission_rate = commission_rate;
     }
 
+    public Number getCommission_rate_original() {
+        return commission_rate_original;
+    }
+
+    public void setCommission_rate_original(Number commission_rate_original) {
+        this.commission_rate_original = commission_rate_original;
+    }
+
     public Integer getCommission_type() {
         return commission_type;
     }

thirdPartyWares_service/src/main/java/com/bjtdba/thirdPartWares/service/impl/TaobaoServiceImpl.java

@@ -128,7 +128,7 @@ public class TaobaoServiceImpl implements TaobaoService {
             String sendGet = HttpUtils.sendGet(url, paraMap);
 //            System.out.println("列表接口提交"+sendGet);
             jsonArray = JSONArray.parseArray(JSONObject.parseObject(JSONObject.parseObject(sendGet).get("data").toString()).get("list").toString());
-            log.info("淘宝接口返回数据111==="+jsonArray);
+//            log.info("淘宝接口返回数据111==="+jsonArray);
         }else{
             //搜索接口
             url = dtkHost+"/api/tb-service/get-tb-service";
@@ -143,7 +143,7 @@ public class TaobaoServiceImpl implements TaobaoService {
             String sendGet = HttpUtils.sendGet(url, paraMap);
             System.out.println("搜索接口返回"+sendGet);
             jsonArray = JSONArray.parseArray(JSONObject.parseObject(sendGet).get("data").toString());
-            log.info("淘宝接口返回数据222==="+jsonArray);
+//            log.info("淘宝接口返回数据222==="+jsonArray);
         }
         List<ThirdPartyWares> thirdPartyWaresList = new ArrayList<>();
         for(int i = 0; i < jsonArray.size(); i++) {
@@ -152,7 +152,16 @@ public class TaobaoServiceImpl implements TaobaoService {
             ThirdPartyWares thirdPartyWares = new ThirdPartyWares();
             thirdPartyWares.setType(5);
             // 当前 淘宝联盟账号等级为初级 的总收益的 33%；中级 66%; 高级 100% -10%服务手续费
-            Number commissionRate = obj.get("commissionRate")!=null?(double)obj.get("commissionRate")*0.25:(((Number)obj.get("commission_rate")).doubleValue()*0.01);
+            Number commissionRate = 0.0;
+            if (obj.get("commissionRate") != null) {
+                Number rate = (Number) obj.get("commissionRate");
+                thirdPartyWares.setCommission_rate_original(rate);
+                commissionRate = rate.doubleValue() * 0.25;
+            } else if (obj.get("commission_rate") != null) {
+                Number rate = (Number) obj.get("commission_rate");
+                thirdPartyWares.setCommission_rate_original(rate);
+                commissionRate = rate.doubleValue() * 0.01;
+            }
             thirdPartyWares.setCommission_rate(commissionRate);//佣金比例
 
             Number market_price = obj.get("originalPrice") != null ? (Number)obj.get("originalPrice") : new Double(obj.get("zk_final_price").toString());