From 39db7359e9eb6a057be88524fb21fe8ae8210ee9 Mon Sep 17 00:00:00 2001 From: "Stormeye.Wu" Date: Mon, 3 Sep 2018 06:32:33 +0800 Subject: [PATCH] =?UTF-8?q?[=E5=88=86=E8=B4=A6][=E6=96=B0=E5=A2=9E]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/simple/config/PayProperty.java | 13 +++++++++++++ mallinkAdmin/src/main/resources/application.yml | 3 ++- .../main/java/com/simple/config/PayProperty.java | 13 +++++++++++++ mallinkBApi/src/main/resources/application.yml | 3 ++- .../main/java/com/simple/config/PayProperty.java | 13 +++++++++++++ .../com/simple/controller/WxPayOrderController.java | 2 +- mallinkCApi/src/main/resources/application.yml | 1 + .../java/com/simple/service/WxPayOrderService.java | 2 +- .../simple/service/impl/WxPayOrderServiceImpl.java | 7 +++++-- 9 files changed, 51 insertions(+), 6 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/simple/config/PayProperty.java b/mallinkAdmin/src/main/java/com/simple/config/PayProperty.java index d19332327..d7df4bd79 100644 --- a/mallinkAdmin/src/main/java/com/simple/config/PayProperty.java +++ b/mallinkAdmin/src/main/java/com/simple/config/PayProperty.java @@ -14,6 +14,11 @@ public class PayProperty { */ private boolean real; + /** + * 是否分账 + */ + private boolean share; + public boolean isReal() { return real; } @@ -21,4 +26,12 @@ public class PayProperty { public void setReal(boolean real) { this.real = real; } + + public boolean isShare() { + return share; + } + + public void setShare(boolean share) { + this.share = share; + } } diff --git a/mallinkAdmin/src/main/resources/application.yml b/mallinkAdmin/src/main/resources/application.yml index d0ab85172..15347830d 100644 --- a/mallinkAdmin/src/main/resources/application.yml +++ b/mallinkAdmin/src/main/resources/application.yml @@ -39,4 +39,5 @@ mapper: - com.simple.common.CommonMapper pay: - real: true \ No newline at end of file + real: true + share: false \ No newline at end of file diff --git a/mallinkBApi/src/main/java/com/simple/config/PayProperty.java b/mallinkBApi/src/main/java/com/simple/config/PayProperty.java index d19332327..d7df4bd79 100644 --- a/mallinkBApi/src/main/java/com/simple/config/PayProperty.java +++ b/mallinkBApi/src/main/java/com/simple/config/PayProperty.java @@ -14,6 +14,11 @@ public class PayProperty { */ private boolean real; + /** + * 是否分账 + */ + private boolean share; + public boolean isReal() { return real; } @@ -21,4 +26,12 @@ public class PayProperty { public void setReal(boolean real) { this.real = real; } + + public boolean isShare() { + return share; + } + + public void setShare(boolean share) { + this.share = share; + } } diff --git a/mallinkBApi/src/main/resources/application.yml b/mallinkBApi/src/main/resources/application.yml index 663167d37..d650406d2 100644 --- a/mallinkBApi/src/main/resources/application.yml +++ b/mallinkBApi/src/main/resources/application.yml @@ -39,4 +39,5 @@ mapper: - com.simple.common.CommonMapper pay: - real: true \ No newline at end of file + real: true + share: false \ No newline at end of file diff --git a/mallinkCApi/src/main/java/com/simple/config/PayProperty.java b/mallinkCApi/src/main/java/com/simple/config/PayProperty.java index 2a4d23e73..0cc4b420f 100644 --- a/mallinkCApi/src/main/java/com/simple/config/PayProperty.java +++ b/mallinkCApi/src/main/java/com/simple/config/PayProperty.java @@ -16,6 +16,11 @@ public class PayProperty { */ private boolean real; + /** + * 是否分账 + */ + private boolean share; + public boolean isReal() { return real; } @@ -23,4 +28,12 @@ public class PayProperty { public void setReal(boolean real) { this.real = real; } + + public boolean isShare() { + return share; + } + + public void setShare(boolean share) { + this.share = share; + } } diff --git a/mallinkCApi/src/main/java/com/simple/controller/WxPayOrderController.java b/mallinkCApi/src/main/java/com/simple/controller/WxPayOrderController.java index 425817198..8f12e98b0 100644 --- a/mallinkCApi/src/main/java/com/simple/controller/WxPayOrderController.java +++ b/mallinkCApi/src/main/java/com/simple/controller/WxPayOrderController.java @@ -72,7 +72,7 @@ public class WxPayOrderController extends BaseController { try { record.setIp(IPUtil.getIpAddr(request)); - return wxPayOrderService.createPayOrder(payProperty.isReal(), appInfo, user, record, EnumPayWay.PAY_WAY_WECHAT); + return wxPayOrderService.createPayOrder(payProperty.isReal(), payProperty.isShare(), appInfo, user, record, EnumPayWay.PAY_WAY_WECHAT); } catch (MallinkException e) { logger.error("payment wechat, order create error, req 2: " + record.toString() + ", e:" + e.getMessage()); return new ResultData(e.getErrorCode(), e.getMessage()); diff --git a/mallinkCApi/src/main/resources/application.yml b/mallinkCApi/src/main/resources/application.yml index 6f51968a0..15c1bee3c 100644 --- a/mallinkCApi/src/main/resources/application.yml +++ b/mallinkCApi/src/main/resources/application.yml @@ -40,3 +40,4 @@ mapper: pay: real: true + share: false diff --git a/mallinkService/src/main/java/com/simple/service/WxPayOrderService.java b/mallinkService/src/main/java/com/simple/service/WxPayOrderService.java index 8ed43e065..09bd8b5dd 100644 --- a/mallinkService/src/main/java/com/simple/service/WxPayOrderService.java +++ b/mallinkService/src/main/java/com/simple/service/WxPayOrderService.java @@ -18,7 +18,7 @@ public interface WxPayOrderService { * @param payWay * @return */ - ResultData createPayOrder(boolean isReal, WxAppinfo appInfo, WxCUser user, WxPayOrder record, EnumPayWay payWay); + ResultData createPayOrder(boolean isReal, boolean isShare, WxAppinfo appInfo, WxCUser user, WxPayOrder record, EnumPayWay payWay); /** * 微信支付订单查询 diff --git a/mallinkService/src/main/java/com/simple/service/impl/WxPayOrderServiceImpl.java b/mallinkService/src/main/java/com/simple/service/impl/WxPayOrderServiceImpl.java index 08b41f77a..26ab7a48e 100644 --- a/mallinkService/src/main/java/com/simple/service/impl/WxPayOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/simple/service/impl/WxPayOrderServiceImpl.java @@ -84,7 +84,7 @@ public class WxPayOrderServiceImpl implements WxPayOrderService { "\"XML_FORMAT_ERROR\":{\"detail\":\"XML格式错误\t\",\"reason\":\"XML格式错误\",\"reason\":\"请检查XML参数格式是否正确\"}}"); @Override - public ResultData createPayOrder(boolean isReal, WxAppinfo appInfo, WxCUser user, WxPayOrder record, EnumPayWay payWay) { + public ResultData createPayOrder(boolean isReal, boolean isShare, WxAppinfo appInfo, WxCUser user, WxPayOrder record, EnumPayWay payWay) { final IdWorker idworker = IdWorker.get(); try { @@ -152,7 +152,10 @@ public class WxPayOrderServiceImpl implements WxPayOrderService { Date futureDate = new Date(); futureDate.setTime(currentDate.getTime() + 15*60*1000); wxPayOrderP.setTime_expire(Utility.getDataFormatStringYYYYMMDDHHmmss(futureDate)); // 15分钟后结束 - wxPayOrderP.setSign(WxPayment.createSign(BeanUtils.toStringMap(wxPayOrderP), payAccount.getApiKey())); + Map payOrderMap = BeanUtils.toStringMap(wxPayOrderP); + if(isShare) + payOrderMap.put("profit_sharing", "Y"); + wxPayOrderP.setSign(WxPayment.createSign(payOrderMap, payAccount.getApiKey())); String response = WxPay.pushOrder(BeanUtils.toStringMap(wxPayOrderP)); logger.info("pay order, wechat pushOrder, " + wxPayOrderP.toString() + ", response: " + response.toString()); Map returnMap = WxPayment.xmlToMap(response);