Просмотр исходного кода

[分账模式支持][修改]

release_toaliyun_real
Stormeye.Wu 7 лет назад
Родитель
Сommit
605df3398a
10 измененных файлов: 17 добавлений и 51 удалений
  1. +0
    -13
      mallinkAdmin/src/main/java/com/simple/config/PayProperty.java
  2. +1
    -2
      mallinkAdmin/src/main/resources/application.yml
  3. +0
    -13
      mallinkBApi/src/main/java/com/simple/config/PayProperty.java
  4. +1
    -2
      mallinkBApi/src/main/resources/application.yml
  5. +0
    -13
      mallinkCApi/src/main/java/com/simple/config/PayProperty.java
  6. +1
    -1
      mallinkCApi/src/main/java/com/simple/controller/WxPayOrderController.java
  7. +0
    -1
      mallinkCApi/src/main/resources/application.yml
  8. +11
    -3
      mallinkService/src/main/java/com/simple/domain/po/WxPayAccount.java
  9. +1
    -1
      mallinkService/src/main/java/com/simple/service/WxPayOrderService.java
  10. +2
    -2
      mallinkService/src/main/java/com/simple/service/impl/WxPayOrderServiceImpl.java

+ 0
- 13
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;
}
}

+ 1
- 2
mallinkAdmin/src/main/resources/application.yml Просмотреть файл

@@ -39,5 +39,4 @@ mapper:
- com.simple.common.CommonMapper

pay:
real: true
share: false
real: true

+ 0
- 13
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;
}
}

+ 1
- 2
mallinkBApi/src/main/resources/application.yml Просмотреть файл

@@ -39,5 +39,4 @@ mapper:
- com.simple.common.CommonMapper

pay:
real: true
share: false
real: true

+ 0
- 13
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;
}
}

+ 1
- 1
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());


+ 0
- 1
mallinkCApi/src/main/resources/application.yml Просмотреть файл

@@ -40,4 +40,3 @@ mapper:

pay:
real: true
share: false

+ 11
- 3
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){


+ 1
- 1
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);

/**
* 微信支付订单查询


+ 2
- 2
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<String, String> payOrderMap = BeanUtils.toStringMap(wxPayOrderSP);
if(isShare) {
if(payAccount.isShare()) {
payOrderMap.put("profit_sharing", "Y");
}
wxPayOrderSP.setSign(WxPayment.createSignHMAC(payOrderMap, payAccount.getApiKey()));


Загрузка…
Отмена
Сохранить