区分APP和小程序支付类型

pz-system/src/main/java/com/pz/system/domain/bo/TotalOrderBo.java

@@ -117,4 +117,9 @@ public class TotalOrderBo extends BaseEntity {
      * pc是否同意退款1-完成退款，2-取消退款
      * pc是否同意退款1-完成退款，2-取消退款
      */
      */
     private Integer isPcRefundStatus;
     private Integer isPcRefundStatus;
+
+    /**
+     * 区分APP和小程序支付（0小程序1APP）
+     */
+    private Integer paymentType;
 }
 }

pz-system/src/main/java/com/pz/system/service/impl/TotalOrderServiceImpl.java

@@ -745,13 +745,21 @@ public class TotalOrderServiceImpl implements ITotalOrderService {
             orderRequest.setBody(bo.getOrderTitle());
             orderRequest.setBody(bo.getOrderTitle());
             orderRequest.setOutTradeNo(totalOrder.getOrderSn());
             orderRequest.setOutTradeNo(totalOrder.getOrderSn());
             orderRequest.setTotalFee(money);// 元转成分
             orderRequest.setTotalFee(money);// 元转成分
-            if(StringUtils.isNotEmpty(openId)){
+            if(null != bo.getPaymentType()){
+                if(bo.getPaymentType() == 0){
                     orderRequest.setOpenid(openId);
                     orderRequest.setOpenid(openId);
+                    orderRequest.setTradeType("JSAPI");
+                }else if(bo.getPaymentType() == 1){
+                    orderRequest.setTradeType("APP");
+                }
+            }else {
+                orderRequest.setOpenid(openId);
+                orderRequest.setTradeType("JSAPI");
             }
             }
             orderRequest.setSpbillCreateIp("127.0.0.1");
             orderRequest.setSpbillCreateIp("127.0.0.1");
             orderRequest.setNotifyUrl("https://peizheng.shanpeikj.com/api/applet/totalOrder/orderPayCallBack");
             orderRequest.setNotifyUrl("https://peizheng.shanpeikj.com/api/applet/totalOrder/orderPayCallBack");
 
 
-            orderRequest.setTradeType("JSAPI");
+
             payment = iPayService.createOrder(orderRequest);
             payment = iPayService.createOrder(orderRequest);
         } catch (Exception e) {
         } catch (Exception e) {