chuangte/smart-switch-java
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

订单金额修改

Browse Source
This commit is contained in:
磷叶 2024-09-11 20:58:13 +08:00
parent 57720d713c
commit e556b37c7c
4 changed files with 20 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
smart-switch-service/src/main/java/com/ruoyi/ss/suit/domain/Suit.java
View File

@ -52,7 +52,7 @@ public class Suit extends BaseEntity
@Excel(name = "价格/押金")
@JsonView({DeviceView.SuitList.class, JsonViewProfile.AppMch.class})
@NotNull(message = "价格/押金不允许为空", groups = {ValidGroup.Create.class, ValidGroup.FrontCreate.class})
@DecimalMin(value = "0.1", message = "价格/押金不允许小于0.1")
@Min(value = 0, message = "价格/押金不允许小于0")
private BigDecimal price;
/** 详细说明 */

12
smart-switch-service/src/main/java/com/ruoyi/ss/suit/service/impl/SuitValidatorImpl.java
View File

@ -13,6 +13,8 @@ import com.ruoyi.ss.suit.domain.enums.SuitFeeMode;
import com.ruoyi.ss.suit.domain.enums.SuitFeeType;
import com.ruoyi.ss.suit.service.SuitService;
import com.ruoyi.ss.suit.service.SuitValidator;
import com.ruoyi.system.domain.enums.config.ConfigKey;
import com.ruoyi.system.service.ISysConfigService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@ -33,6 +35,9 @@ public class SuitValidatorImpl extends BaseValidator implements SuitValidator {
@Autowired
private SuitService suitService;
@Autowired
private ISysConfigService sysConfigService;
@Override
public ValidateResult preLogicDel(List<Long> suitIds) {
if (CollectionUtils.isEmptyElement(suitIds)) {
@ -166,6 +171,13 @@ public class SuitValidatorImpl extends BaseValidator implements SuitValidator {
}
}
if (create || suit.getPrice() != null) {
BigDecimal minService = sysConfigService.getBigDecimal(ConfigKey.RECHARGE_MIN_SERVICE);
if (suit.getPrice().compareTo(minService) < 0) {
return error("价格/押金不允许低于" + minService + "元");
}
}
return success();
}
}

7
smart-switch-service/src/main/java/com/ruoyi/ss/transactionBill/service/impl/TransactionBillServiceImpl.java
View File

@ -293,10 +293,15 @@ public class TransactionBillServiceImpl implements TransactionBillService, After
// 非分时订单，处理最低服务费
if (!SuitFeeType.timingList().contains(order.getSuitFeeType())) {
BigDecimal minService = sysConfigService.getBigDecimal(ConfigKey.RECHARGE_MIN_SERVICE);
ServiceUtil.assertion(order.getMoney().compareTo(minService) < 0, "当前套餐金额小于最低服务费，请联系商户处理");
// ServiceUtil.assertion(order.getMoney().compareTo(minService) < 0, "当前套餐金额小于最低服务费，请联系商户处理");
// 当服务费不满足最低服务费时，设置为最低服务费
if (serviceCharge.compareTo(minService) < 0) {
serviceCharge = minService;
}
// 当金额不满足服务费时，将全收
if (order.getMoney().compareTo(serviceCharge) < 0) {
serviceCharge = order.getMoney();
}
}
order.setServiceCharge(serviceCharge);

2
smart-switch-web/src/main/resources/application-dev.yml
View File

@ -26,7 +26,7 @@ wx:
# 转账回调地址
transferNotifyUrl: https://kg-dev.chuangtewl.com/dev-api/app/pay/notify/wx/transfer
# 密钥所在位置
privateKeyPath: D:/project/证书/wxpay-kg/apiclient_key.pem
privateKeyPath: H:/project/创特/证书/wxpay-kg/apiclient_key.pem
# 证书序列号
merchantSerialNumber: 6AD69237C0F22A9AE51A64F1927E3A0962AC1FB0