修改状态

src/main/java/com/chaozhanggui/system/cashierservice/controller/NotifyController.java

@@ -53,11 +53,13 @@ public class NotifyController {
         Map<String, Object> map= getParameterMap(request);
         log.info("fstmemberInCallBack回调返回信息:{}",JSONUtil.toJsonStr(map));
         if(ObjectUtil.isNotEmpty(map)&&map.containsKey("code")&&"000000".equals(map.get("code")+"")){
-                Map<String,Object> object=(Map)map.get("bizData");
+//                Map<String,Object> object=(Map)map.get("bizData");
+
+                JSONObject object=JSONUtil.parseObj(map.get("bizData").toString());
                 if(ObjectUtil.isNotEmpty(object)&&object.containsKey("state")){
                     if("TRADE_SUCCESS".equals(object.get("state").toString())){
-                        String orderNo=map.get("mchOrderNo").toString();
+                        String orderNo=object.get("mchOrderNo").toString();
-                        String tradeNo=map.get("payOrderId").toString();
+                        String tradeNo=object.get("payOrderId").toString();
                         return payService.fstMemberInSuccess(orderNo,tradeNo);
                     }
                 }
@@ -90,11 +92,12 @@ public class NotifyController {
         Map<String, Object> map= getParameterMap(request);
         log.info("notifyfstCallBack回调返回信息:{}",JSONUtil.toJsonStr(map));
         if(ObjectUtil.isNotEmpty(map)&&map.containsKey("code")&&"000000".equals(map.get("code")+"")){
-            Map<String,Object> object=(Map)map.get("bizData");
+
+            JSONObject object=JSONUtil.parseObj(map.get("bizData").toString());
             if(ObjectUtil.isNotEmpty(object)&&object.containsKey("state")){
                 if("TRADE_SUCCESS".equals(object.get("state").toString())){
-                    String orderNo=map.get("mchOrderNo").toString();
+                    String orderNo=object.get("mchOrderNo").toString();
-                    String tradeNo=map.get("payOrderId").toString();
+                    String tradeNo=object.get("payOrderId").toString();
                     return payService.callBackPayFST(tradeNo);
                 }
             }

src/main/java/com/chaozhanggui/system/cashierservice/controller/PayController.java

@@ -127,6 +127,10 @@ public class PayController {
     }
 
 
+//    public Result getActive(@RequestHeader("token") String token,@RequestParam("shopId") String shopId,@RequestParam("page") int page,@RequestParam("pageSize") int pageSize){
+//
+//    }
+
     /**
      * 充值
      *

src/main/java/com/chaozhanggui/system/cashierservice/service/PayService.java

@@ -114,8 +114,11 @@ public class PayService {
 
 
 
-    @Value("${thirdPay.callBack}")
+    @Value("${thirdPay.callInBack}")
-    private String callBack;
+    private String callInBack;
+
+    @Value("${thirdPay.callFSTBack}")
+    private String callFSTBack;
 
     @Autowired
     ThirdPayService thirdPayService;
@@ -240,7 +243,7 @@ public class PayService {
                 reqbody=body.toString();
             }
 
-            PublicResp<WxScanPayResp> publicResp= thirdPayService.scanpay(thirdUrl,thirdApply.getAppId(),reqbody,reqbody,payment.getAmount().setScale(2, BigDecimal.ROUND_DOWN).multiply(new BigDecimal(100)).longValue(),"WECHAT",thirdApply.getSmallAppid(),openId,ip,DateUtils.getsdfTimesSS(),thirdApply.getStoreId(),callBack,null,thirdApply.getAppToken());
+            PublicResp<WxScanPayResp> publicResp= thirdPayService.scanpay(thirdUrl,thirdApply.getAppId(),reqbody,reqbody,payment.getAmount().setScale(2, BigDecimal.ROUND_DOWN).multiply(new BigDecimal(100)).longValue(),"WECHAT",thirdApply.getSmallAppid(),openId,ip,DateUtils.getsdfTimesSS(),thirdApply.getStoreId(),callFSTBack,null,thirdApply.getAppToken());
             if(ObjectUtil.isNotNull(publicResp)&&ObjectUtil.isNotEmpty(publicResp)){
                 if("000000".equals(publicResp.getCode())){
                     WxScanPayResp wxScanPayResp= publicResp.getObjData();
@@ -784,7 +787,7 @@ public class PayService {
                 }
             }
         }else {
-            PublicResp<WxScanPayResp> publicResp= thirdPayService.scanpay(thirdUrl,thirdApply.getAppId(),"会员充值","会员充值",new BigDecimal(amount).setScale(2, BigDecimal.ROUND_DOWN).multiply(new BigDecimal(100)).longValue(),"WECHAT",thirdApply.getSmallAppid(),userId,ip, DateUtils.getsdfTimesSS(),thirdApply.getStoreId(),callBack,null,thirdApply.getAppToken());
+            PublicResp<WxScanPayResp> publicResp= thirdPayService.scanpay(thirdUrl,thirdApply.getAppId(),"会员充值","会员充值",new BigDecimal(amount).setScale(2, BigDecimal.ROUND_DOWN).multiply(new BigDecimal(100)).longValue(),"WECHAT",thirdApply.getSmallAppid(),userId,ip, DateUtils.getsdfTimesSS(),thirdApply.getStoreId(),callInBack,null,thirdApply.getAppToken());
             if(ObjectUtil.isNotNull(publicResp)&&ObjectUtil.isNotEmpty(publicResp)){
                 if("000000".equals(publicResp.getCode())){
                     WxScanPayResp wxScanPayResp= publicResp.getObjData();
@@ -918,6 +921,10 @@ public class PayService {
         return null;
     }
 
+
+
+
+
     /**
      * 生成长度为12的随机串
      *

src/main/resources/application-dev.yml

@@ -59,7 +59,7 @@ ysk:
   callBackIn: https://p40312246f.goho.co/cashierService/notify/memberInCallBack
   default: 18710449883
 server:
-  port: 9888
+  port: 9889
 prod: dev1
 queue: cart_queue_putdev1
 

src/main/resources/application.yml

@@ -57,5 +57,6 @@ aliyun:
 
 thirdPay:
   payType: fushangtong
-  callBack: https://cashierclient.sxczgkj.cn${server.servlet.context-path}notify/fstmemberInCallBack
+  callInBack: https://wxcashiertest.sxczgkj.cn${server.servlet.context-path}notify/fstmemberInCallBack
+  callFSTBack:  https://wxcashiertest.sxczgkj.cn${server.servlet.context-path}notify/notifyfstCallBack
   url: https://paymentapi.sxczgkj.cn