修复zara,sku为中文的问题

src/main/java/com/diaoyun/zion/chinafrica/api/ThirdPartyController.java

@@ -63,6 +63,23 @@ public class ThirdPartyController {
         }
         return tbCfOrderService.getDeliveryList(beginTime,endTime,pageNum,pageSize);
     }
+  /*  *//**
+     *获取某段时间已发货订单数据
+     *//*
+    @ApiOperation(value = "获取某段时间已发货订单数据")
+    @GetMapping(value ="/delivery")
+    public Result getDeliveryLists(@ApiParam(value ="开始时间") @RequestParam("beginTime")long beginTime,
+                                  @ApiParam(value ="结束时间") @RequestParam("endTime")long endTime,
+                                  @ApiParam(value = "页数") @RequestParam(required = false) Integer pageNum,
+                                  @ApiParam(value ="每页大小 默认100") @RequestParam(required = false) Integer pageSize) {
+        if (pageNum == null) {
+            pageNum = 1;
+        }
+        if (pageSize == null) {
+            pageSize = 100;
+        }
+        return tbCfOrderService.getDeliveryLists(beginTime,endTime,pageNum,pageSize);
+    }*/
 
     /**
      * 根据订单号获取详细订单数据

src/main/java/com/diaoyun/zion/chinafrica/entity/TbCfItemShippedEntity.java

@@ -59,6 +59,7 @@ public class TbCfItemShippedEntity implements Serializable {
      * 商品品名
      */
     private String descripition;
+    private String descripitionId;
 
     public static long getSerialVersionUID() {
         return serialVersionUID;
@@ -183,4 +184,12 @@ public class TbCfItemShippedEntity implements Serializable {
     public void setDescripition(String descripition) {
         this.descripition = descripition;
     }
+
+    public String getDescripitionId() {
+        return descripitionId;
+    }
+
+    public void setDescripitionId(String descripitionId) {
+        this.descripitionId = descripitionId;
+    }
 }

src/main/java/com/diaoyun/zion/chinafrica/service/TbCfOrderService.java

@@ -177,4 +177,6 @@ public interface TbCfOrderService {
     Result rePayForOrder(String orderId);
 
     Result currencyConversion(String price, String currency);
+
+    Result getDeliveryLists(long beginTime, long endTime, Integer pageNum, Integer pageSize);
 }

src/main/java/com/diaoyun/zion/chinafrica/service/impl/TbCfOrderServiceImpl.java

@@ -517,6 +517,26 @@ public class TbCfOrderServiceImpl implements TbCfOrderService {
         return result;
     }
 
+    @Override
+    public Result getDeliveryLists(long beginTime, long endTime, Integer pageNum, Integer pageSize) {
+        Result result = new Result<>();
+        if ((endTime - beginTime) > 31 * 24 * 60 * 60) {
+            result.setCode(ResultCodeEnum.ERROR.getCode()).setMessage("Time interval is too long");
+        } else {
+            startPage(pageNum, pageSize);
+            Date beginDate = new Date(beginTime * 1000);
+            Date endDate = new Date(endTime * 1000);
+            List<TbCfItemShippedEntity> orderList = tbCfOrderDao.getDeliveryList(beginDate, endDate);
+            // TODO 暂设为赞比亚
+            for (TbCfItemShippedEntity list : orderList) {
+                list.setCountry("赞比亚");
+            }
+            PageInfo<TbCfItemShippedEntity> pageInfo = new PageInfo<>(orderList);
+            result.setData(pageInfo);
+        }
+        return result;
+    }
+
 
     /**
      * 记录财务流水

src/main/java/com/diaoyun/zion/master/util/TranslateHelper.java

@@ -96,7 +96,14 @@ public class TranslateHelper {
         }
         // TODO productPropSetMap.put("translateArray",translateArray);
     }
-
+    public static  String translateProps(List<Map<String, Object>> futureList,  String productSet) throws InterruptedException, ExecutionException, TimeoutException {
+                 Map<String, Object> valMap=new HashMap<>();
+                if (ValidateUtils.isContainChinese(productSet)) {
+                    TranslateHelper.translateText(futureList, valMap, productSet);
+                    TranslateHelper.waitForResult(futureList);
+                }
+                return String.valueOf(valMap.get("translate"));
+        }
     /**
      * 翻译爬取回来的数据
      *
@@ -137,4 +144,5 @@ public class TranslateHelper {
         resultObj.put("productPropSet", productPropSet);
         //////////////////////翻译 END//////////////////////
     }
+
 }

src/main/resources/mapper/TbCfOrderDao.xml

@@ -346,8 +346,30 @@
 		and deal_time <![CDATA[ >= ]]> #{beginDate} and deal_time <![CDATA[ < ]]> #{endDate}
 	</select>
 
-    <!--获取某段时间已发货订单数据-->
     <select id="getDeliveryList" resultType="com.diaoyun.zion.chinafrica.entity.TbCfItemShippedEntity">
+		select
+		DISTINCT
+		r.order_item_id orderId,
+		o.delivery_name deliveryName,
+		o.delivery_address deliveryAddress,
+		o.user_id userId,
+		p.p_express_number expressId,
+        i.item_id itemId,
+        i.item_num itemNum,
+        a.address_country_name country,
+        p.descripition_id
+		from tb_cf_order o
+		INNER JOIN  tb_cf_item_order_r r on r.order_id=o.order_id
+		INNER JOIN   tb_cf_platform_order p on r.order_item_id=p.relative_id
+		INNER JOIN   tb_cf_item_detail i on r.item_id=i.item_id
+		INNER JOIN   tb_cf_address a on a.user_id=o.user_id
+		INNER JOIN   tb_cf_user_info  u on u.user_id=o.user_id
+		INNER JOIN   tb_cf_express_template e on e.template_id=p.descripition_id
+		where r.delivery_flag=10 and r.enable_flag=1 and r.order_status=40
+		and p.create_time <![CDATA[ >= ]]> #{beginDate} and p.create_time <![CDATA[ < ]]> #{endDate}
+	</select>
+    <!--获取某段时间已发货订单数据-->
+    <select id="getDeliveryLists" resultType="com.diaoyun.zion.chinafrica.entity.TbCfItemShippedEntity">
 		select
 		DISTINCT
 		r.order_item_id orderId,