Merge branch 'KA-消费黑名单订单限制-20220527' into qa

order-application-service/src/main/java/cn/freemud/handler/MemberBlacklistHandler.java

@@ -67,10 +67,14 @@ public class MemberBlacklistHandler {
         // 您的消费额度还有3元，暂无法支付，如有疑问，详询客服热线4008899096
 
         BigDecimal amount = new BigDecimal(Math.max(surplusAmount, 0L)).divide(new BigDecimal("100"), 2, BigDecimal.ROUND_DOWN);
+        if (amount.compareTo(BigDecimal.ZERO) <= 0) {
+            sb.append("您的消费金额额度已用完，暂无法支付，如有疑问，详询客服热线").append(result.getMoblie());
+        } else {
             sb.append("您的消费额度还有")
                     .append(amount)
                     .append("元，暂无法支付，如有疑问，详询客服热线")
                     .append(result.getMoblie());
+        }
         return sb.toString();
 
     }

order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java

@@ -96,6 +96,7 @@ import com.freemud.api.assortment.datamanager.manager.customer.AssortmentCustome
 import com.freemud.api.assortment.datamanager.meal.MealCacheManager;
 import com.freemud.application.sdk.api.constant.ResponseConstant;
 import com.freemud.application.sdk.api.constant.ResponseResultEnum;
+import com.freemud.application.sdk.api.log.ApiLog;
 import com.freemud.application.sdk.api.log.ErrorLog;
 import com.freemud.application.sdk.api.log.LogThreadLocal;
 import com.freemud.application.sdk.api.ordercenter.common.OrderAndShoppingCommonRedisKey;
@@ -2495,7 +2496,7 @@ public class OrderServiceImpl implements Orderservice {
 
         //组装老的创建订单数据模型
         BaseCreateOrderRequest baseCreateOrderRequest = orderAdapter.convent2CreateOrderDto(createOrderVo, shoppingCartGoodsDto, storeResponseDto);
-
+        ApiLog.printLog("fisherman -> 查看日志",JSON.toJSONString(baseCreateOrderRequest),null,null);
         // fisherman 订单支付价格 _> 处理 消费黑面名单逻辑
         Long amount = baseCreateOrderRequest.getAmount();
         BlacklistDto blacklistDto = new BlacklistDto();