修改商店排序方式

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

@@ -64,10 +64,10 @@ public class FlutterWaveServiceImpl implements FlutterWaveService {
     //退款API
     private String FLUTTERWAVE_REFUND_URL = "https://api.ravepay.co/gpx/merchant/transactions/refund";
 
-//    //校验API
-//    private String VERIFY_PAY_URL = "https://api.ravepay.co/flwv3-pug/getpaidx/api/v2/verify";
+    //    //校验API
+    private String VERIFY_PAY_URL = "https://api.ravepay.co/flwv3-pug/getpaidx/api/v2/verify";
     //测试API
-    private String VERIFY_PAY_URL = "https://ravesandboxapi.flutterwave.com/flwv3-pug/getpaidx/api/v2/verify";
+//    private String VERIFY_PAY_URL = "https://ravesandboxapi.flutterwave.com/flwv3-pug/getpaidx/api/v2/verify";
 
     /**
      * 使用卡号支付(预支付)
@@ -80,7 +80,7 @@ public class FlutterWaveServiceImpl implements FlutterWaveService {
     public Result payForOrder(String orderId, FlutterWaveCard flutterWaveCard) {
         RaveConstant.PUBLIC_KEY = domainProperties.getProperty("flutterwave.public.key");
         RaveConstant.SECRET_KEY = domainProperties.getProperty("flutterwave.secret.key");
-        RaveConstant.ENVIRONMENT = Environment.STAGING; //or live
+        RaveConstant.ENVIRONMENT = Environment.LIVE; //or live
         Result result = new Result();
         TbCfOrderVo tbCfOrderVo = (TbCfOrderVo) orderRedisCache.get(KeyConstant.ORDER_DET + orderId);
         TbCfOrderEntity orderEntity = tbCfOrderDao.queryObject(orderId);

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

@@ -49,7 +49,7 @@ public class TbCfItemDetailServiceImpl implements TbCfItemDetailService {
     private TbCfExpTemKeywordDao tbCfExpTemKeywordDao;
 
 
-    @Resource(name="redisTokenManager")
+    @Resource(name = "redisTokenManager")
     private TokenManager tokenManager;
 
     @Autowired
@@ -99,8 +99,7 @@ public class TbCfItemDetailServiceImpl implements TbCfItemDetailService {
     public Result addToCart(TbCfItemDetailVo tbCfItemDetailVo) throws InterruptedException, ExecutionException, TimeoutException {
         String token = jwtTokenProvider.resolveToken(request);
         TbCfUserInfoVo tbCfUserInfoVo = tokenManager.validate(token);
-        int i = tbCfItemDetailVo.getItemPrice().compareTo(BigDecimal.ZERO);
-        if(i!=0) {
+        if (tbCfItemDetailVo.getItemPrice().toString() != null) {
             //填充新商品必要信息
             TbCfCartRecordREntity tbCfCartRecord = tbCfCartRecordRDao.querySkuAndUrl(tbCfItemDetailVo.getItemSku(), tbCfItemDetailVo.getSourceItemId());
             if (tbCfCartRecord != null) {
@@ -145,7 +144,7 @@ public class TbCfItemDetailServiceImpl implements TbCfItemDetailService {
                 tbCfCartRecordRDao.update(tbCfCartRecordREntity);
             }
             return new Result(ResultCodeEnum.SUCCESS.getDesc());
-        }else{
+        } else {
             return new Result(ResultCodeEnum.ERROR.getCode()).setMessage("Cannot add to cart");
         }
     }
@@ -155,8 +154,8 @@ public class TbCfItemDetailServiceImpl implements TbCfItemDetailService {
         TbCfItemDetailEntity tbCfItemDetailEntity = new TbCfItemDetailEntity();
         tbCfItemDetailEntity.setItemId(itemId);
         tbCfItemDetailEntity.setItemNum(itemNum);
-        int res=tbCfItemDetailDao.update(tbCfItemDetailEntity);
-        if(res>0) {
+        int res = tbCfItemDetailDao.update(tbCfItemDetailEntity);
+        if (res > 0) {
             return new Result(ResultCodeEnum.SUCCESS.getDesc());
         } else {
             return new Result().setCode(ResultCodeEnum.ERROR.getCode()).setMessage("fail to edit");
@@ -169,15 +168,15 @@ public class TbCfItemDetailServiceImpl implements TbCfItemDetailService {
         //获取用户
         String token = jwtTokenProvider.resolveToken(request);
         TbCfUserInfoVo tbCfUserInfoVo = tokenManager.validate(token);
-        String userId=tbCfUserInfoVo.getUserId();
-        return tbCfItemDetailDao.getCartItemList(userId,null);
+        String userId = tbCfUserInfoVo.getUserId();
+        return tbCfItemDetailDao.getCartItemList(userId, null);
     }
 
     @Override
     public Result changeItemState(String cartRecordId, Integer checkFlag) {
-        Result result=new Result(ResultCodeEnum.SUCCESS.getDesc());
-        int res=tbCfItemDetailDao.changeItemState(cartRecordId,checkFlag);
-        if(res<1) {
+        Result result = new Result(ResultCodeEnum.SUCCESS.getDesc());
+        int res = tbCfItemDetailDao.changeItemState(cartRecordId, checkFlag);
+        if (res < 1) {
             result.setCode(ResultCodeEnum.ERROR.getCode()).setMessage("fail to edit");
         }
         return result;
@@ -211,12 +210,12 @@ public class TbCfItemDetailServiceImpl implements TbCfItemDetailService {
                 List<TbCfExpressTemplateEntity> tbCfExpressTemplateList = tbCfExpTemKeywordDao.getTemplateByKeyword(keyword);
                 totalTemplateSet.addAll(tbCfExpressTemplateList);
                 //TODO 后续优化
-                if(ValidateUtils.isContainChinese(keyword)) {
+                if (ValidateUtils.isContainChinese(keyword)) {
                     if ("0".equals(tbCfExpressTemplateList.size())) {
                         String[] split = keyword.split("");
                         for (int i = 0; i < split.length; i++) {
-                            if(i+1<=split.length){
-                                List<TbCfExpressTemplateEntity> tbCfExpressTemplateLists = tbCfExpTemKeywordDao.getTemplateByKeyword(split[i]+split[i+1]);
+                            if (i + 1 <= split.length) {
+                                List<TbCfExpressTemplateEntity> tbCfExpressTemplateLists = tbCfExpTemKeywordDao.getTemplateByKeyword(split[i] + split[i + 1]);
                                 totalTemplateSet.addAll(tbCfExpressTemplateLists);
                             }
                         }
@@ -238,6 +237,7 @@ public class TbCfItemDetailServiceImpl implements TbCfItemDetailService {
 
     /**
      * 分词
+     *
      * @param text
      * @return
      */

src/main/resources/properties/domain.properties

@@ -72,12 +72,12 @@ paypal.client.secret=EIyDryMDyM0BDWp2mtuGFdSU2WOkWtmSuGGaRnUiIom7kxuM7JhuSFfETbC
 #flutterwave.encryption.key=38ec6860f49e0d9d488a83b1
 #flutterwave.merchant.id=3950728
 #################################flutterwave真实(miumiu@afrieshop.com)######################################################
-#flutterwave.public.key=FLWPUBK-ee0f5d653f5f33fc89e6caf9de6a4c34-X
-#flutterwave.secret.key=FLWSECK-c06cdc19526077f3855b76045ca77de3-X
-#flutterwave.encryption.key=c06cdc1952600626ec8779ed
-#flutterwave.merchant.id=6577084
+flutterwave.public.key=FLWPUBK-ee0f5d653f5f33fc89e6caf9de6a4c34-X
+flutterwave.secret.key=FLWSECK-c06cdc19526077f3855b76045ca77de3-X
+flutterwave.encryption.key=c06cdc1952600626ec8779ed
+flutterwave.merchant.id=6577084
 #################################flutterwave测试(TEST)######################################################
-flutterwave.public.key=FLWPUBK_TEST-e3cc948e7cb24b2128fca3b781f6fce0-X
-flutterwave.secret.key=FLWSECK_TEST-f88371ca63a989a4af95625475a0d22d-X
-flutterwave.encryption.key=FLWSECK_TEST001d4c34f798
-flutterwave.merchant.id=1508207
+#flutterwave.public.key=FLWPUBK_TEST-e3cc948e7cb24b2128fca3b781f6fce0-X
+#flutterwave.secret.key=FLWSECK_TEST-f88371ca63a989a4af95625475a0d22d-X
+#flutterwave.encryption.key=FLWSECK_TEST001d4c34f798
+#flutterwave.merchant.id=1508207