feats

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

@@ -1,12 +1,10 @@
 package com.yunzhi.nanyang.common;
 
-import com.github.binarywang.wxpay.bean.order.WxPayMpOrderResult;
 import com.github.binarywang.wxpay.bean.request.WxPayRefundV3Request;
 import com.github.binarywang.wxpay.bean.request.WxPayUnifiedOrderV3Request;
 import com.github.binarywang.wxpay.bean.result.WxPayRefundV3Result;
 import com.github.binarywang.wxpay.bean.result.WxPayUnifiedOrderV3Result;
 import com.github.binarywang.wxpay.bean.result.enums.TradeTypeEnum;
-import com.github.binarywang.wxpay.constant.WxPayConstants;
 import com.github.binarywang.wxpay.exception.WxPayException;
 import com.github.binarywang.wxpay.service.WxPayService;
 import com.yunzhi.nanyang.config.WeixinConfig;
@@ -34,15 +32,20 @@ public class WxPayUtils {
      * @return
      * @throws Exception
      */
-    public WxPayUnifiedOrderV3Result.JsapiResult createOrder(WxPayUnifiedOrderV3Request request) throws WxPayException {
+    public WxPayUnifiedOrderV3Result.JsapiResult createOrder(WxPayUnifiedOrderV3Request request, String client) throws WxPayException {
         // 北京时间
         LocalDateTime now = LocalDateTime.now(ZoneOffset.ofHours(8));
         WxPayService payService = wxUtils.getPayService();
 
         request.setNotifyUrl(servBase + "/wxpay/notify/order");
 
-        WxPayUnifiedOrderV3Result wxPayUnifiedOrderV3Result = payService.unifiedOrderV3(TradeTypeEnum.JSAPI, request);
-        return wxPayUnifiedOrderV3Result.getPayInfo(TradeTypeEnum.JSAPI, request.getAppid(), request.getMchid(), payService.getConfig().getPrivateKey());
+        TradeTypeEnum tradeType = TradeTypeEnum.JSAPI;
+        if ("ios".equals(client) || "android".equals(client)) {
+            tradeType = TradeTypeEnum.APP;
+        }
+
+        WxPayUnifiedOrderV3Result wxPayUnifiedOrderV3Result = payService.unifiedOrderV3(tradeType, request);
+        return wxPayUnifiedOrderV3Result.getPayInfo(tradeType, request.getAppid(), request.getMchid(), payService.getConfig().getPrivateKey());
     }
 
     /**

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

@@ -10,7 +10,7 @@ public interface ITaPayService extends IBaseService<TaPay> {
 
     WxPayUnifiedOrderV3Result.JsapiResult createPay(String client, String clientId, TaOrder taOrder) throws Exception;
 
-    WxPayUnifiedOrderV3Result.JsapiResult prePay(TaPay taPay) throws Exception;
+    WxPayUnifiedOrderV3Result.JsapiResult prePay(TaPay taPay, String client) throws Exception;
 
     TaPay getByOrderNo(String orderNo);
 

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

@@ -70,7 +70,7 @@ public class TaPayServiceImpl extends BaseServiceImpl<TaPayMapper, TaPay> implem
         }
 
         try {
-            WxPayUnifiedOrderV3Result.JsapiResult jsapiResult = prePay(taPay);
+            WxPayUnifiedOrderV3Result.JsapiResult jsapiResult = prePay(taPay, client);
             if (StringUtils.isEmpty(taPay.getPayId())) {
                 taPay.setPayId(StringUtils.uuid());
                 if (!save(taPay)) {
@@ -104,7 +104,7 @@ public class TaPayServiceImpl extends BaseServiceImpl<TaPayMapper, TaPay> implem
     }
 
     @Override
-    public WxPayUnifiedOrderV3Result.JsapiResult prePay(TaPay taPay) throws WxPayException {
+    public WxPayUnifiedOrderV3Result.JsapiResult prePay(TaPay taPay, String client) throws WxPayException {
         // 生成订单
         if ("wx".equals(taPay.getPayType())) {
             WxPayUnifiedOrderV3Request.Amount amount = new  WxPayUnifiedOrderV3Request.Amount();
@@ -119,7 +119,7 @@ public class TaPayServiceImpl extends BaseServiceImpl<TaPayMapper, TaPay> implem
             req.setAmount(amount);
             req.setPayer(payer);
 
-            return wxPayUtils.createOrder(req);
+            return wxPayUtils.createOrder(req, client);
         }
 
         return null;

src/main/resources/application.yml

@@ -38,7 +38,7 @@ sms:
 
 ###
 hatc:
-  ### 海康接口服务, 自己写的
+  ### 海康接口服务
   apiServer: http://localhost:7081
 
 ###