|
@@ -301,6 +301,8 @@ public class ApiOrderNewServiceImpl implements ApiOrderNewService {
|
|
|
}
|
|
|
// 非自运力下单、或自运力达达收付配送商下单, 校验猎豹账户余额
|
|
|
if ((!isMine || isDadaRapDelivery) && order.getPayAmount().compareTo(member.getAmount()) > 0 && PaymentTypeEnum.BALANCE.type.equals(req.getPaymentType())) {
|
|
|
+ // 余额不足推送消息通知
|
|
|
+ checkAmount(member.getId());
|
|
|
log.error("余额不足, memberId: {}, orderSn: {}", member.getId(), order.getOrderSn());
|
|
|
// throw new CustomAppException(ExceptionEnum.AMOUNT_ERROR);
|
|
|
return "amount_not_enough";
|
|
@@ -746,7 +748,7 @@ public class ApiOrderNewServiceImpl implements ApiOrderNewService {
|
|
|
List<Member> members = iMemberService.selectListByMerchantId(member.getMerchantId().intValue());
|
|
|
List<Long> mIds = new ArrayList<>();
|
|
|
log.info("推送用户===" + JSONObject.toJSONString(members));
|
|
|
- if (member.getAmount().compareTo(new BigDecimal(50)) == -1) {
|
|
|
+ if (member.getAmount().compareTo(new BigDecimal(50)) < 0) {
|
|
|
// 自动配送关闭,关闭该商家的所有门店
|
|
|
for (Member m : members) {
|
|
|
// 判断用户是否开启自配送
|
|
@@ -765,7 +767,7 @@ public class ApiOrderNewServiceImpl implements ApiOrderNewService {
|
|
|
}
|
|
|
return;
|
|
|
}
|
|
|
- if (member.getAmount().compareTo(new BigDecimal(100)) == -1) {
|
|
|
+ if (member.getAmount().compareTo(new BigDecimal(100)) < 0) {
|
|
|
for (Member m : members) {
|
|
|
mIds.add(m.getId());
|
|
|
}
|