Compare commits
No commits in common. "1cee8788f25d056651462d78700002b5b79d7f6e" and "7856c2b6e868d8fa6cf999f519423eb6d6225aad" have entirely different histories.
1cee8788f2
...
7856c2b6e8
@ -269,7 +269,7 @@ wechat:
|
|||||||
mch-id: 1658665710 # 商户号
|
mch-id: 1658665710 # 商户号
|
||||||
mch-serial-no: 6BA681D9B219034D6F7851F57D61BE9317AB48FD # 商户证书序列号
|
mch-serial-no: 6BA681D9B219034D6F7851F57D61BE9317AB48FD # 商户证书序列号
|
||||||
api-v3-key: T9iE71aHSmjtM35z4bDLuU3gFX8s2I2h # APIv3密钥
|
api-v3-key: T9iE71aHSmjtM35z4bDLuU3gFX8s2I2h # APIv3密钥
|
||||||
private-key-path: "classpath:cert/apiclient_key.pem" # 商户私钥文件路径
|
private-key-path: "/java/cert/apiclient_key.pem" # 商户私钥文件路径
|
||||||
transfer-notify-url: https://wuzhongjie.com.cn/prod-api/trans/withdraw/callback # 转账回调地址
|
transfer-notify-url: https://wuzhongjie.com.cn/prod-api/trans/withdraw/callback # 转账回调地址
|
||||||
app-id: wxebcdaea31881caab # 应用ID
|
app-id: wxebcdaea31881caab # 应用ID
|
||||||
secret: 71826d76bad096ec5407897c6ed1391f # 应用密钥
|
secret: 71826d76bad096ec5407897c6ed1391f # 应用密钥
|
||||||
|
@ -13,7 +13,6 @@ public enum RedPacketStatus {
|
|||||||
private int code;
|
private int code;
|
||||||
|
|
||||||
RedPacketStatus(int code) {
|
RedPacketStatus(int code) {
|
||||||
this.code=code;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public int getCode() {
|
public int getCode() {
|
||||||
|
@ -17,7 +17,6 @@ import org.dromara.common.core.exception.ServiceException;
|
|||||||
import org.dromara.system.service.ISysConfigService;
|
import org.dromara.system.service.ISysConfigService;
|
||||||
import org.springframework.stereotype.Component;
|
import org.springframework.stereotype.Component;
|
||||||
|
|
||||||
import java.math.BigDecimal;
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -62,7 +61,7 @@ public class OrderCashier implements CashierExecute {
|
|||||||
if (!order.getStatus().equals(OrderStatusEnum.UNPAID.getValue())) {
|
if (!order.getStatus().equals(OrderStatusEnum.UNPAID.getValue())) {
|
||||||
throw new ServiceException(ResultCode.PAY_BAN);
|
throw new ServiceException(ResultCode.PAY_BAN);
|
||||||
}
|
}
|
||||||
cashierParam.setPrice(order.getTotalAmount().multiply(BigDecimal.valueOf(100)).longValue());
|
cashierParam.setPrice(order.getTotalAmount().longValue());
|
||||||
//
|
//
|
||||||
// try {
|
// try {
|
||||||
// BaseSetting baseSetting = JSONUtil.toBean(settingService.get(SettingEnum.BASE_SETTING.name()).getSettingValue(), BaseSetting.class);
|
// BaseSetting baseSetting = JSONUtil.toBean(settingService.get(SettingEnum.BASE_SETTING.name()).getSettingValue(), BaseSetting.class);
|
||||||
|
Loading…
x
Reference in New Issue
Block a user