feats

src/main/java/com/yunzhi/nanyang/common/WxPayUtils.java

@@ -32,7 +32,7 @@ public class WxPayUtils {
      * @return
      * @throws Exception
      */
-    public WxPayUnifiedOrderV3Result.JsapiResult createOrder(WxPayUnifiedOrderV3Request request, String client) throws WxPayException {
+    public WxPayUnifiedOrderV3Result createOrder(WxPayUnifiedOrderV3Request request, String client) throws WxPayException {
         // 北京时间
         LocalDateTime now = LocalDateTime.now(ZoneOffset.ofHours(8));
         WxPayService payService = wxUtils.getPayService();
@@ -44,8 +44,10 @@ public class WxPayUtils {
             tradeType = TradeTypeEnum.APP;
         }
 
-        WxPayUnifiedOrderV3Result wxPayUnifiedOrderV3Result = payService.unifiedOrderV3(tradeType, request);
-        return wxPayUnifiedOrderV3Result.getPayInfo(tradeType, request.getAppid(), request.getMchid(), payService.getConfig().getPrivateKey());
+        return payService.unifiedOrderV3(tradeType, request);
+
+//        WxPayUnifiedOrderV3Result wxPayUnifiedOrderV3Result =
+//        return wxPayUnifiedOrderV3Result.getPayInfo(tradeType, request.getAppid(), request.getMchid(), payService.getConfig().getPrivateKey());
     }
 
     /**

src/main/java/com/yunzhi/nanyang/controller/TaPayController.java

@@ -1,10 +1,10 @@
 package com.yunzhi.nanyang.controller;
 
 import com.github.binarywang.wxpay.bean.result.WxPayUnifiedOrderV3Result;
-import com.yunzhi.nanyang.common.BaseController;
-import com.yunzhi.nanyang.common.Constants;
-import com.yunzhi.nanyang.common.ResponseBean;
-import com.yunzhi.nanyang.common.StringUtils;
+import com.github.binarywang.wxpay.bean.result.enums.TradeTypeEnum;
+import com.github.binarywang.wxpay.config.WxPayConfig;
+import com.github.binarywang.wxpay.service.WxPayService;
+import com.yunzhi.nanyang.common.*;
 import com.yunzhi.nanyang.entity.TaOrder;
 import com.yunzhi.nanyang.service.ITaOrderService;
 import com.yunzhi.nanyang.service.ITaPayService;
@@ -22,6 +22,9 @@ import java.util.Map;
 @RequestMapping("/")
 public class TaPayController extends BaseController {
 
+    @Autowired
+    WxUtils wxUtils;
+
     @Autowired
     ITaPayService iTaPayService;
 
@@ -50,8 +53,17 @@ public class TaPayController extends BaseController {
             return ResponseBean.error("订单已支付");
         }
 
-        WxPayUnifiedOrderV3Result.JsapiResult result = iTaPayService.createPay(client, clientId, taOrder);
-        return ResponseBean.success(result);
+        WxPayUnifiedOrderV3Result payResult = iTaPayService.createPay(client, clientId, taOrder);
+
+        WxPayConfig payConfig = wxUtils.getPayService().getConfig();
+
+        if ("wx".equals(client)) {
+            WxPayUnifiedOrderV3Result.JsapiResult result = payResult.getPayInfo(TradeTypeEnum.JSAPI, payConfig.getAppId(), payConfig.getMchId(), payConfig.getPrivateKey());
+            return ResponseBean.success(result);
+        } else {
+            WxPayUnifiedOrderV3Result.AppResult result = payResult.getPayInfo(TradeTypeEnum.APP, payConfig.getAppId(), payConfig.getMchId(), payConfig.getPrivateKey());
+            return ResponseBean.success(result);
+        }
     }
 
 

src/main/java/com/yunzhi/nanyang/service/ITaPayService.java

@@ -8,9 +8,9 @@ import com.yunzhi.nanyang.entity.TaPay;
 
 public interface ITaPayService extends IBaseService<TaPay> {
 
-    WxPayUnifiedOrderV3Result.JsapiResult createPay(String client, String clientId, TaOrder taOrder) throws Exception;
+    WxPayUnifiedOrderV3Result createPay(String client, String clientId, TaOrder taOrder) throws Exception;
 
-    WxPayUnifiedOrderV3Result.JsapiResult prePay(TaPay taPay, String client) throws Exception;
+    WxPayUnifiedOrderV3Result prePay(TaPay taPay, String client) throws Exception;
 
     TaPay getByOrderNo(String orderNo);
 

src/main/java/com/yunzhi/nanyang/service/impl/TaPayServiceImpl.java

@@ -50,7 +50,7 @@ public class TaPayServiceImpl extends BaseServiceImpl<TaPayMapper, TaPay> implem
     TaAccountMapper taAccountMapper;
 
     @Override
-    public WxPayUnifiedOrderV3Result.JsapiResult createPay(String client, String clientId, TaOrder taOrder) throws Exception {
+    public WxPayUnifiedOrderV3Result createPay(String client, String clientId, TaOrder taOrder) throws Exception {
         TaPay taPay = getByOrderNo(taOrder.getOrderNo());
         if (null == taPay) {
             taPay = new TaPay();
@@ -70,14 +70,14 @@ public class TaPayServiceImpl extends BaseServiceImpl<TaPayMapper, TaPay> implem
         }
 
         try {
-            WxPayUnifiedOrderV3Result.JsapiResult jsapiResult = prePay(taPay, client);
+            WxPayUnifiedOrderV3Result payResult = prePay(taPay, client);
             if (StringUtils.isEmpty(taPay.getPayId())) {
                 taPay.setPayId(StringUtils.uuid());
                 if (!save(taPay)) {
                     throw new Exception("系统出错请重试");
                 }
             }
-            return jsapiResult;
+            return payResult;
         } catch (WxPayException e) {
             e.printStackTrace();
 
@@ -104,7 +104,7 @@ public class TaPayServiceImpl extends BaseServiceImpl<TaPayMapper, TaPay> implem
     }
 
     @Override
-    public WxPayUnifiedOrderV3Result.JsapiResult prePay(TaPay taPay, String client) throws WxPayException {
+    public WxPayUnifiedOrderV3Result prePay(TaPay taPay, String client) throws WxPayException {
         // 生成订单
         if ("wx".equals(taPay.getPayType())) {
             WxPayUnifiedOrderV3Request.Amount amount = new  WxPayUnifiedOrderV3Request.Amount();
@@ -117,7 +117,10 @@ public class TaPayServiceImpl extends BaseServiceImpl<TaPayMapper, TaPay> implem
             req.setDescription(taPay.getDescription());
             req.setOutTradeNo(taPay.getOrderNo());
             req.setAmount(amount);
-            req.setPayer(payer);
+
+            if ("wx".equals(client)) {
+                req.setPayer(payer);
+            }
 
             return wxPayUtils.createOrder(req, client);
         }