互医微信刷单

fs-service/src/main/java/com/fs/core/utils/OrderCodeUtils.java

@@ -45,6 +45,7 @@ public class OrderCodeUtils {
     }
     public static String getOrderSn(){
         String url= FSConfig.getCommonApi()+ "/app/common/genOrderCode";
+//        String url= "http://127.0.0.1:7771"+ "/app/common/genOrderCode";
 //        String url= "42.194.245.189:8010/app/common/genOrderCode";
         String json = HttpRequest.get(url)
                 .execute().body();

fs-service/src/main/java/com/fs/his/service/impl/FsPackageOrderServiceImpl.java

@@ -1065,7 +1065,9 @@ public class FsPackageOrderServiceImpl implements IFsPackageOrderService
                         payConfig.setSubAppId(org.apache.commons.lang3.StringUtils.trimToNull(null));
                         payConfig.setSubMchId(org.apache.commons.lang3.StringUtils.trimToNull(null));
                         payConfig.setKeyPath(null);
-                        payConfig.setNotifyUrl(wxPayProperties.getNotifyUrl());
+                        // 路径取配制 去掉/store
+                        String path = merchantAppConfig.getCallbackUrl().replace("/store", "");
+                        payConfig.setNotifyUrl(path);
                         wxPayService.setConfig(payConfig);
                         WxPayUnifiedOrderRequest orderRequest = new WxPayUnifiedOrderRequest();
                         orderRequest.setOpenid(openId);//公众号支付提供用户openid

fs-service/src/main/java/com/fs/his/service/impl/FsStorePaymentServiceImpl.java

@@ -1865,7 +1865,10 @@ public class FsStorePaymentServiceImpl implements IFsStorePaymentService {
                 payConfig.setSubAppId(org.apache.commons.lang3.StringUtils.trimToNull(null));
                 payConfig.setSubMchId(org.apache.commons.lang3.StringUtils.trimToNull(null));
                 payConfig.setKeyPath(null);
-                payConfig.setNotifyUrl(fsPayConfig.getNotifyUrlScrm());
+                // 路径取配制 去掉/store
+                String path = merchantAppConfig.getCallbackUrl().replace("/store", "");
+                payConfig.setNotifyUrl(path);
+//                payConfig.setNotifyUrl(fsPayConfig.getNotifyUrlScrm());
                 wxPayService.setConfig(payConfig);
                 WxPayUnifiedOrderRequest orderRequest = new WxPayUnifiedOrderRequest();
                 orderRequest.setOpenid(openId);//公众号支付提供用户openid
@@ -1878,7 +1881,7 @@ public class FsStorePaymentServiceImpl implements IFsStorePaymentService {
                 //调用统一下单接口，获取"预支付交易会话标识"
                 try {
                     WxPayMpOrderResult orderResult = wxPayService.createOrder(orderRequest);
-                    return R.ok().put("data", orderResult).put("type", "wx").put("isPay", 0);
+                    return R.ok().put("result", orderResult).put("type", "wx").put("isPay", 0);
                 } catch (WxPayException e) {
                     e.printStackTrace();
                     throw new CustomException("支付失败" + e.getMessage());

fs-user-app/src/main/java/com/fs/app/controller/InquiryOrderController.java

@@ -373,7 +373,9 @@ public class InquiryOrderController extends  AppBaseController {
                     payConfig.setSubAppId(org.apache.commons.lang3.StringUtils.trimToNull(null));
                     payConfig.setSubMchId(org.apache.commons.lang3.StringUtils.trimToNull(null));
                     payConfig.setKeyPath(null);
-                    payConfig.setNotifyUrl(wxPayProperties.getNotifyUrl());
+                    // 路径取配制 去掉/store
+                    String path = merchantAppConfig.getCallbackUrl().replace("/store", "");
+                    payConfig.setNotifyUrl(path);
                     wxPayService.setConfig(payConfig);
                     WxPayUnifiedOrderRequest orderRequest = new WxPayUnifiedOrderRequest();
                     orderRequest.setOpenid(openId);//公众号支付提供用户openid