diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/thirdpay/req/MainScanReq.java b/src/main/java/com/chaozhanggui/system/cashierservice/thirdpay/req/MainScanReq.java index 502d535..bb2688c 100644 --- a/src/main/java/com/chaozhanggui/system/cashierservice/thirdpay/req/MainScanReq.java +++ b/src/main/java/com/chaozhanggui/system/cashierservice/thirdpay/req/MainScanReq.java @@ -3,6 +3,7 @@ package com.chaozhanggui.system.cashierservice.thirdpay.req; import lombok.Data; import java.io.Serializable; +import java.util.ArrayList; @Data public class MainScanReq implements Serializable { @@ -25,7 +26,13 @@ public class MainScanReq implements Serializable { private String notifyUrl; - public MainScanReq(String subject, String body, Long amount, String subAppid, String currency, String authCode, String mchOrderNo, String storeId, String notifyUrl) { + private int divisionMode; + + private ArrayList divList; + + private String divTemplateNo; + + public MainScanReq(String subject, String body, Long amount, String subAppid, String currency, String authCode, String mchOrderNo, String storeId, String notifyUrl,int divisionMode,String divTemplateNo,ArrayList divList) { this.subject = subject; this.body = body; this.amount = amount; @@ -35,6 +42,9 @@ public class MainScanReq implements Serializable { this.mchOrderNo = mchOrderNo; this.storeId = storeId; this.notifyUrl = notifyUrl; + this.divisionMode=divisionMode; + this.divList=divList; + this.divTemplateNo=divTemplateNo; } diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/thirdpay/service/ThirdPayService.java b/src/main/java/com/chaozhanggui/system/cashierservice/thirdpay/service/ThirdPayService.java index 374e64c..d65d07e 100644 --- a/src/main/java/com/chaozhanggui/system/cashierservice/thirdpay/service/ThirdPayService.java +++ b/src/main/java/com/chaozhanggui/system/cashierservice/thirdpay/service/ThirdPayService.java @@ -47,8 +47,17 @@ public class ThirdPayService { public PublicResp mainScan(String url,String appId, String subject, String body, Long amount, String subAppId, String authCode, String orderNo, String storeId, String notifyUrl, String key ) { + MainScanReq mainScanReq=null; + if("66bab943ae82f63b50ae3cff".equals(appId)){ + + mainScanReq = new MainScanReq(subject, body, amount, subAppId, "cny", authCode, orderNo, storeId, notifyUrl,1,"TA1824003985261588482",null); + url="https://paymentweb.sxczgkj.cn"; + }else { + mainScanReq = new MainScanReq(subject, body, amount, subAppId, "cny", authCode, orderNo, storeId, notifyUrl,0,null,null); + } + + - MainScanReq mainScanReq = new MainScanReq(subject, body, amount, subAppId, "cny", authCode, orderNo, storeId, notifyUrl); PublicParam param = new PublicParam(appId, "", SignTypeEnum.MD5.getValue(), null, DateUtils.getSdfTimes(), "1.0", String.valueOf(System.currentTimeMillis())); @@ -101,7 +110,7 @@ public class ThirdPayService { String key){ WxScanPayReq scanPayReq=null; if("66bab943ae82f63b50ae3cff".equals(appId)){ - scanPayReq=new WxScanPayReq(subject,body,amount,"cny",payType,subAppId,userId,clinetIp,orderNo,storeId,0,null,null,notifyUrl,returnUrl); + scanPayReq=new WxScanPayReq(subject,body,amount,"cny",payType,subAppId,userId,clinetIp,orderNo,storeId,1,null,"TA1824003985261588482",notifyUrl,returnUrl); url="https://paymentweb.sxczgkj.cn"; }else { scanPayReq=new WxScanPayReq(subject,body,amount,"cny",payType,subAppId,userId,clinetIp,orderNo,storeId,0,null,null,notifyUrl,returnUrl);