修改stripe支付接口

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

@@ -31,6 +31,7 @@ import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.stereotype.Service;
+import sun.plugin.com.Utils;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
@@ -310,7 +311,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 +598,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/main/resources/properties/domain.properties

@@ -35,9 +35,16 @@ tencent.wordpos.app_url=https://api.ai.qq.com/fcgi-bin/nlp/nlp_wordpos
 
 ################腾讯翻译配置 END###################
 
+
+##################新11.05(stripe公钥(不加密)和私钥(已用 AESUtils 加密))################################
+#stripe.pk=pk_live_FP6ipnw3lt0e1AmS5IVdpJWd00s5PLdbVa
+#stripe.sk=YWA9aMOPvCfq0KWda2Wsh567lLl600+QK/X8ZEFDPj6UDNd3icKr6fJ+X3ey8X+T
+stripe.pk=pk_test_y5dXLjyUyBD11Ta9g2DGynxN0048vnmpGz
+stripe.sk=+RFm7p84hym4liN1/MSoshYMiy4rWgUFoZ3S5+ucxRTyzblQL2Pi0y1TDQoSE96z
 ##################stripe公钥(不加密)和私钥(已用 AESUtils 加密)################################
-stripe.pk=pk_live_5MdXU4N1cvmU1yatYp5v0E0n00C7tAXpGB
-stripe.sk=d87UqTQ6QUjuNkXrjH51Gl/Zqnfy98HRl23xljism2hpaXjSNTwdl6pv6FM7D4tT
+#stripe.pk=pk_live_5MdXU4N1cvmU1yatYp5v0E0n00C7tAXpGB
+#stripe.sk=d87UqTQ6QUjuNkXrjH51Gl/Zqnfy98HRl23xljism2hpaXjSNTwdl6pv6FM7D4tT
+
 #stripe.pk=pk_test_rXUSgU8Kw7DLhDzMbHM0r55O00JAzVBBJR
 #stripe.sk=3ff57yz9S5INBexBOnzi/ZaxClXkXlJ+FZ6XLc/f2vpESScG7YOaQaG2YNRic3HF
 ######################outlook的账户公钥密钥#####################
@@ -45,6 +52,7 @@ stripe.sk=d87UqTQ6QUjuNkXrjH51Gl/Zqnfy98HRl23xljism2hpaXjSNTwdl6pv6FM7D4tT
 #stripe.sk=BbLXgo+ohgrAP7p3tB52YTqNwhAiTYzYWAX0W+/1PES6kOupxwc/7xpAR8QsG6gP
 ######################outlook的账户公钥密钥 END#####################
 ##################stripe公钥和私钥 END###############################
+
 #############################第三方物流公司接口#################################
 express.info.api=http://shd.kjwlxt.com/api/track.php
 express.info.user_no=shd806

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);
     }