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

[分账][新增]

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

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

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

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

pay:
real: true
real: true
share: false

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

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

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

pay:
real: true
real: true
share: false

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

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


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

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

pay:
real: true
share: false

+ 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, WxAppinfo appInfo, WxCUser user, WxPayOrder record, EnumPayWay payWay);
ResultData createPayOrder(boolean isReal, boolean isShare, WxAppinfo appInfo, WxCUser user, WxPayOrder record, EnumPayWay payWay);

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


+ 5
- 2
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<String, String> 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<String, String> returnMap = WxPayment.xmlToMap(response);


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