From ee3efaff6ad384558906fd14764bf388b557fad9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=9F=A9=E9=B9=8F=E8=BE=89?= <18322780655@163.com>
Date: Tue, 4 Jun 2024 16:03:39 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BC=9A=E5=91=98=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E6=8A=A5=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cashierservice/service/MemberService.java     | 15 ++++-----------
 1 file changed, 4 insertions(+), 11 deletions(-)

diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/service/MemberService.java b/src/main/java/com/chaozhanggui/system/cashierservice/service/MemberService.java
index 5d9a941..6033bfb 100644
--- a/src/main/java/com/chaozhanggui/system/cashierservice/service/MemberService.java
+++ b/src/main/java/com/chaozhanggui/system/cashierservice/service/MemberService.java
@@ -179,12 +179,15 @@ public class MemberService {
         String qpay = null;
         String payTypeCode = authCode.substring(0, 2);// 判断收款码
 
+        String wechatpay="";
+
 
 
         if(Integer.valueOf(payTypeCode)>=25&&Integer.valueOf(payTypeCode)<=30){
             qpay = "scanCode";
         }else if(Integer.valueOf(payTypeCode)>=10&&Integer.valueOf(payTypeCode)<=19){
             qpay = "scanCode";
+            wechatpay="wxpay";
         }else if("62".equals(payTypeCode)){
             return Result.fail(CodeEnum.ERRORQR);
         }else if("01".equals(payTypeCode)){
@@ -195,16 +198,6 @@ public class MemberService {
 
 
 
-
-        switch (payTypeCode) {
-            case "1":
-                qpay = "scanCode";
-                break;
-            case "2":
-                qpay = "scanCode";
-                break;
-        }
-
         int count = tbShopPayTypeMapper.countSelectByShopIdAndPayType(shopId, qpay);
         if (count < 1) {
             return Result.fail(CodeEnum.PAYTYPENOEXIST);
@@ -292,7 +285,7 @@ public class MemberService {
 
             String orderNo = DateUtils.getSsdfTimes();
 
-            PublicResp<MainScanResp> publicResp = thirdPayService.mainScan(url, thirdApply.getAppId(), "会员充值", "会员充值", amount.setScale(2, RoundingMode.DOWN).multiply(new BigDecimal(100)).longValue(), payTypeCode.equals("1") ? thirdApply.getSmallAppid() : null, authCode, DateUtils.getSsdfTimes(), thirdApply.getStoreId(), callBack, thirdApply.getAppToken());
+            PublicResp<MainScanResp> publicResp = thirdPayService.mainScan(url, thirdApply.getAppId(), "会员充值", "会员充值", amount.setScale(2, RoundingMode.DOWN).multiply(new BigDecimal(100)).longValue(), wechatpay.equals("wxpay") ? thirdApply.getSmallAppid() : null, authCode, DateUtils.getSsdfTimes(), thirdApply.getStoreId(), callBack, thirdApply.getAppToken());
             if (ObjectUtil.isNotNull(publicResp) && ObjectUtil.isNotEmpty(publicResp)) {
                 if ("000000".equals(publicResp.getCode())) {
                     MainScanResp mainScanResp = publicResp.getObjData();