Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/main/resources/properties/domain.properties

Test.json

 {
-  "alternate": "\u8FDE\u5E3D\u77ED\u4E0A\u8863 - {alternatecolor} - 女 | H&M CN",
+  "alternate": "\u8FDE\u5E3D\u77ED\u4E0A\u8863 - {alternatecolor} - 濂� | H&M CN",
   "articleCode":"0754698003", "baseProductCode" : "0754698_group_003", "categoryParentKey" : "/1/ladies",
   "productKey": "0754698_group_003_zh_cn",
   "collection": "",
@@ -130,7 +130,7 @@
       }
 
     ],
-    "whitePrice": "¥199.00",
+    "whitePrice": "楼199.00",
     "whitePriceValue": "199.0",
 
     "promoMarkerIcon": "",
@@ -152,7 +152,7 @@
     "composition": [
 
       {
-        "compositionType" : "弹力罗纹",
+        "compositionType" : "寮瑰姏缃楃汗",
         "materials" :[
 
           {
@@ -322,7 +322,7 @@
       }
 
     ],
-    "whitePrice": "¥199.00",
+    "whitePrice": "楼199.00",
     "whitePriceValue": "199.0",
 
     "promoMarkerIcon": "",
@@ -344,7 +344,7 @@
     "composition": [
 
       {
-        "compositionType" : "弹力罗纹",
+        "compositionType" : "寮瑰姏缃楃汗",
         "materials" :[
 
           {
@@ -439,7 +439,7 @@
 
     "0838783001":"manual",
 
-    "selection": "新品",
+    "selection": "鏂板搧",
 
     "description": "\u67D4\u8F6F\u536B\u8863\u9762\u6599\u77ED\u6B3E\u4E0A\u8863\uFF0C\u9970\u5370\u82B1\u56FE\u6848\uFF0C\u8863\u5E3D\u6709\u6C57\u5E03\u886C\u91CC\u548C\u62BD\u7EF3\u3002\u843D\u80A9\u957F\u8896\u8BBE\u8BA1\uFF0C\u7F57\u7EB9\u8896\u53E3\u53CA\u4E0B\u6446\u3002\u67D4\u8F6F\u62C9\u7ED2\u5185\u91CC\u3002",
     "images":[
@@ -527,7 +527,7 @@
       }
 
     ],
-    "whitePrice": "¥199.00",
+    "whitePrice": "楼199.00",
     "whitePriceValue": "199.0",
 
     "promoMarkerIcon": "",

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

@@ -77,8 +77,4 @@ public class ThirdPartyController {
     public Result getOrderDetailThird(@PathVariable("orderId")String orderId) {
         return tbCfOrderService.getOrderDetailThird(orderId);
     }
-
-
-
-
 }

src/main/java/com/diaoyun/zion/chinafrica/controller/LoginController.java

@@ -87,5 +87,4 @@ public class LoginController extends BaseController {
                                     @ApiParam("账号类型") @RequestParam(required = false) String userType) throws UnsupportedEncodingException {
         return tbCfUserInfoService.loginByThirdParty(getIpAddr(request),amount,nick,userType);
     }
-
 }

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

@@ -310,7 +310,12 @@ public class TbCfOrderServiceImpl implements TbCfOrderService {
         return result;
     }
 
-
+    /**
+     * 查询物流信息
+     * @param orderId
+     * @return
+     * @throws IOException
+     */
     @Override
     public Result queryOrderExpressInfo(String orderId) throws IOException {
         String expressUrl = domainProperties.getProperty("express.info.api");
@@ -592,6 +597,7 @@ public class TbCfOrderServiceImpl implements TbCfOrderService {
      */
     private TbCfOrderVo ensureOrder(TbCfUserInfoVo tbCfUserInfoVo, TbCfOrderVo pageOrder, List<TbCfCartItemDetailVo> tbCfCartItemDetailList,String iss_coupon_id) {
         TbCfOrderVo definiteOrder = getGenericOrder(tbCfCartItemDetailList);
+
         /*//获取可以使用的优惠券，后续还有判断此订单是否可以使用
         List<TbCfCouponEntity> tbCfCouponList = tbCfCouponDao.queryUserAvailableCoupon(tbCfUserInfoVo.getUserId(), new Date());
         if (!tbCfCouponList.isEmpty()) {

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

@@ -292,7 +292,6 @@ public class TbCfUserInfoServiceImpl implements TbCfUserInfoService {
                 result.setMessage("Login failed");
             }
           return result;
-
     }
 
     public String getUserPhoneCode(String phone) throws IOException {

src/test/java/com/diaoyun/zion/ZionApplicationTests.java

@@ -440,7 +440,7 @@ public class ZionApplicationTests {
     @Test
     public  void testAesut(){
 
-     String a =  AESUtils.encrypt(KeyConstant.AES_KEY,"sk_live_YbAVymUjl4ZEVGfzeyHyRTKM00JviD18nI");
+     String a =  AESUtils.encrypt(KeyConstant.AES_KEY,"sk_test_tGl2q7Omxehpli7R3Z6xU6G900iL1eX32c");
         System.out.println(a);
     }