From 605df3398a372be5a7f4353e367bdb3249e38b6a Mon Sep 17 00:00:00 2001 From: "Stormeye.Wu" Date: Thu, 6 Sep 2018 16:01:39 +0800 Subject: [PATCH] =?UTF-8?q?[=E5=88=86=E8=B4=A6=E6=A8=A1=E5=BC=8F=E6=94=AF?= =?UTF-8?q?=E6=8C=81][=E4=BF=AE=E6=94=B9]?= 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 ------------- .../simple/controller/WxPayOrderController.java | 2 +- mallinkCApi/src/main/resources/application.yml | 1 - .../java/com/simple/domain/po/WxPayAccount.java | 14 +++++++++++--- .../java/com/simple/service/WxPayOrderService.java | 2 +- .../simple/service/impl/WxPayOrderServiceImpl.java | 4 ++-- 10 files changed, 17 insertions(+), 51 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/simple/config/PayProperty.java b/mallinkAdmin/src/main/java/com/simple/config/PayProperty.java index d7df4bd79..d19332327 100644 --- a/mallinkAdmin/src/main/java/com/simple/config/PayProperty.java +++ b/mallinkAdmin/src/main/java/com/simple/config/PayProperty.java @@ -14,11 +14,6 @@ public class PayProperty { */ private boolean real; - /** - * 是否分账 - */ - private boolean share; - public boolean isReal() { return real; } @@ -26,12 +21,4 @@ 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 15347830d..d0ab85172 100644 --- a/mallinkAdmin/src/main/resources/application.yml +++ b/mallinkAdmin/src/main/resources/application.yml @@ -39,5 +39,4 @@ mapper: - com.simple.common.CommonMapper pay: - real: true - share: false \ No newline at end of file + real: true \ 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 d7df4bd79..d19332327 100644 --- a/mallinkBApi/src/main/java/com/simple/config/PayProperty.java +++ b/mallinkBApi/src/main/java/com/simple/config/PayProperty.java @@ -14,11 +14,6 @@ public class PayProperty { */ private boolean real; - /** - * 是否分账 - */ - private boolean share; - public boolean isReal() { return real; } @@ -26,12 +21,4 @@ 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 d650406d2..663167d37 100644 --- a/mallinkBApi/src/main/resources/application.yml +++ b/mallinkBApi/src/main/resources/application.yml @@ -39,5 +39,4 @@ mapper: - com.simple.common.CommonMapper pay: - real: true - share: false \ No newline at end of file + real: true \ 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 0cc4b420f..2a4d23e73 100644 --- a/mallinkCApi/src/main/java/com/simple/config/PayProperty.java +++ b/mallinkCApi/src/main/java/com/simple/config/PayProperty.java @@ -16,11 +16,6 @@ public class PayProperty { */ private boolean real; - /** - * 是否分账 - */ - private boolean share; - public boolean isReal() { return real; } @@ -28,12 +23,4 @@ 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 8f12e98b0..425817198 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(), payProperty.isShare(), appInfo, user, record, EnumPayWay.PAY_WAY_WECHAT); + return wxPayOrderService.createPayOrder(payProperty.isReal(), 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 15c1bee3c..6f51968a0 100644 --- a/mallinkCApi/src/main/resources/application.yml +++ b/mallinkCApi/src/main/resources/application.yml @@ -40,4 +40,3 @@ mapper: pay: real: true - share: false diff --git a/mallinkService/src/main/java/com/simple/domain/po/WxPayAccount.java b/mallinkService/src/main/java/com/simple/domain/po/WxPayAccount.java index 1afd6d0df..7545a7682 100644 --- a/mallinkService/src/main/java/com/simple/domain/po/WxPayAccount.java +++ b/mallinkService/src/main/java/com/simple/domain/po/WxPayAccount.java @@ -62,6 +62,9 @@ public class WxPayAccount implements Serializable { /**商户模式**/ @io.swagger.annotations.ApiModelProperty(value="商户模式-0:普通商户模式1:服务商模式",name="type") private Integer type; + /**是否开启分账**/ + @io.swagger.annotations.ApiModelProperty(value="0:未开启分账1:开启分账",name="type") + private boolean share; public String getTenantId() { return tenantId; @@ -104,15 +107,18 @@ public class WxPayAccount implements Serializable { public void setCertPath(String _certPath) { certPath = _certPath; } - public Integer getType() { return type; } - public void setType(Integer type) { this.type = type; } - + public boolean isShare() { + return share; + } + public void setShare(boolean share) { + this.share = share; + } public String getPayNotifyUrl() { return notifyUrl + "/pay"; } @@ -123,6 +129,7 @@ public class WxPayAccount implements Serializable { return notifyUrl + "/separate"; } + public static enum Field { Id_ASC("`id` ASC"),Id_DESC("`id` DESC") @@ -133,6 +140,7 @@ public class WxPayAccount implements Serializable { ,NotifyUrl_ASC("`notify_url` ASC"),NotifyUrl_DESC("`notify_url` DESC") ,CertPath_ASC("`cert_path` ASC"),CertPath_DESC("`cert_path` DESC") ,Type_ASC("`type` ASC"),Type_DESC("`type` DESC") + ,Share_ASC("`share` ASC"),Share_DESC("`share` DESC") ; private String value; Field(String value){ diff --git a/mallinkService/src/main/java/com/simple/service/WxPayOrderService.java b/mallinkService/src/main/java/com/simple/service/WxPayOrderService.java index 1d110f4a6..1065e3d5f 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, boolean isShare, WxAppinfo appInfo, WxCUser user, WxPayOrder record, EnumPayWay payWay); + ResultData createPayOrder(boolean isReal, 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 7a60a0f3c..1c7b47fcd 100644 --- a/mallinkService/src/main/java/com/simple/service/impl/WxPayOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/simple/service/impl/WxPayOrderServiceImpl.java @@ -94,7 +94,7 @@ public class WxPayOrderServiceImpl implements WxPayOrderService { "\"XML_FORMAT_ERROR\":{\"detail\":\"XML格式错误\t\",\"reason\":\"XML格式错误\",\"reason\":\"请检查XML参数格式是否正确\"}}"); @Override - public ResultData createPayOrder(boolean isReal, boolean isShare, WxAppinfo appInfo, WxCUser user, WxPayOrder record, EnumPayWay payWay) { + public ResultData createPayOrder(boolean isReal, WxAppinfo appInfo, WxCUser user, WxPayOrder record, EnumPayWay payWay) { final IdWorker idworker = IdWorker.get(); try { @@ -224,7 +224,7 @@ public class WxPayOrderServiceImpl implements WxPayOrderService { wxPayOrderSP.setTime_expire(Utility.getDataFormatStringYYYYMMDDHHmmss(futureDate)); // 15分钟后结束 wxPayOrderSP.setSign_type("HMAC-SHA256"); Map payOrderMap = BeanUtils.toStringMap(wxPayOrderSP); - if(isShare) { + if(payAccount.isShare()) { payOrderMap.put("profit_sharing", "Y"); } wxPayOrderSP.setSign(WxPayment.createSignHMAC(payOrderMap, payAccount.getApiKey()));