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

order-application-service/src/main/java/cn/freemud/entities/dto/blacklist/BlacklistDto.java

+package cn.freemud.entities.dto.blacklist;
+
+import lombok.Data;
+
+/**
+ * @author : xh.Z
+ * @email : fisherman0510@163.com
+ * @Date : 2022/5/27 13:40
+ * @description :
+ */
+@Data
+public class BlacklistDto {
+    /**
+     * 商户号
+     */
+    private String partnerId;
+
+    /**
+     * 用户id
+     */
+    private String memberId;
+
+
+    /**
+     * 当前这一笔订单需要消费的金额
+     */
+    private Long amount;
+}

order-application-service/src/main/java/cn/freemud/entities/dto/blacklist/OrderBlacklistResp.java

+package cn.freemud.entities.dto.blacklist;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author : xh.Z
+ * @email : fisherman0510@163.com
+ * @Date : 2022/5/27 15:06
+ * @description : 返回前端提示数据
+ */
+@Data
+public class OrderBlacklistResp {
+
+    @ApiModelProperty(value = "客服电话")
+    private String moblie;
+
+    @ApiModelProperty(value = "金额限制(单位:分)")
+    private Long surplusAmount;
+}

order-application-service/src/main/java/cn/freemud/entities/dto/blacklist/Result.java

+package cn.freemud.entities.dto.blacklist;
+
+import lombok.Data;
+
+import java.util.Objects;
+
+/**
+ * @author : xh.Z
+ * @email : fisherman0510@163.com
+ * @Date : 2022/5/27 14:49
+ * @description :
+ */
+@Data
+public class Result<T> {
+    private boolean status = false;
+    private String message;
+    private T result;
+    private String statusCode;
+
+    public boolean isOk() {
+        return Objects.equals(statusCode, "200");
+    }
+}

order-application-service/src/main/java/cn/freemud/entities/dto/blacklist/req/BlackListQueryByClient.java

+package cn.freemud.entities.dto.blacklist.req;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.hibernate.validator.constraints.Range;
+
+import javax.validation.constraints.NotBlank;
+
+/**
+ * @author : xh.Z
+ * @email : fisherman0510@163.com
+ * @Date : 2022/5/27 14:34
+ * @description :
+ */
+@Data
+public class BlackListQueryByClient {
+
+    /**
+     * 0储值卡黑名单
+     */
+    public static final int RECORD_TYPE_SVC = 0;
+
+    /**
+     * 1消费黑名单
+     */
+    public static final int RECORD_TYPE_CUSTOMER = 1;
+
+
+    @ApiModelProperty(value = "商户id")
+    @NotBlank(message = "商户id不能为空")
+    private String partnerId;
+
+    @ApiModelProperty("会员id")
+    private String memberId;
+
+    @ApiModelProperty("添加的黑名单类型 0储值卡黑名单 1消费黑名单")
+    @Range(min = 0, max = 1, message = "添加的黑名单类型 0储值卡黑名单 1消费黑名单")
+    private Integer recordType;
+}

order-application-service/src/main/java/cn/freemud/entities/dto/blacklist/resp/MemberBlacklistVO.java

+package cn.freemud.entities.dto.blacklist.resp;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author : xh.Z
+ * @email : fisherman0510@163.com
+ * @Date : 2022/5/27 14:35
+ * @description :
+ */
+@Data
+public class MemberBlacklistVO {
+
+    /**
+     * 是否存在黑名单中
+     */
+    private boolean exist;
+
+    // ---------> 消费黑名单才有下面的配置
+
+    @ApiModelProperty(value = "客服电话")
+    private String moblie;
+
+    @ApiModelProperty(value = "金额限制(单位:分)")
+    private Long limitAmount;
+
+    @ApiModelProperty(value = "已经消费的累积金额(单位:分)")
+    private Long shoppingTotalAmount;
+
+}

order-application-service/src/main/java/cn/freemud/enums/ResponseResult.java

@@ -195,6 +195,7 @@ public enum ResponseResult {
     ORDER_BIZ_TYPE_ERROR("45086", "订单业务类型异常",""),
     COUPON_ORDER_VERIFY_FAIL("45087","买券订单校验异常",""),
     COUPON_ORDER_COMMON_VERIFY_FAIL("45088","卖券订单基础校验失败",""),
+    TOUCH_SHOPPING_BLACK_LIST("45089","触发消费黑名单",""),
 
     /**
      * 售后单

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

+package cn.freemud.handler;
+
+import cn.freemud.entities.dto.blacklist.BlacklistDto;
+import cn.freemud.entities.dto.blacklist.OrderBlacklistResp;
+import cn.freemud.entities.dto.blacklist.Result;
+import cn.freemud.entities.dto.blacklist.req.BlackListQueryByClient;
+import cn.freemud.entities.dto.blacklist.resp.MemberBlacklistVO;
+import cn.freemud.service.thirdparty.DataCenterClient;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+/**
+ * @author : xh.Z
+ * @email : fisherman0510@163.com
+ * @Date : 2022/5/27 11:59
+ * @description :
+ */
+@Component
+public class MemberBlacklistHandler {
+
+    @Autowired
+    private DataCenterClient dataCenterClient;
+
+    /**
+     * 查询用户是否在黑名单中
+     *
+     * @param blacklistDto
+     */
+    public String checkisTrueBlacklist(BlacklistDto blacklistDto) {
+        //step1 查询是否存在
+        BlackListQueryByClient req = new BlackListQueryByClient();
+        req.setPartnerId(blacklistDto.getPartnerId());
+        req.setMemberId(blacklistDto.getMemberId());
+        // 默认只查询消费黑名单
+        req.setRecordType(BlackListQueryByClient.RECORD_TYPE_CUSTOMER);
+        Result<MemberBlacklistVO> memberBlacklistVOResult = dataCenterClient.queryByMemberId(req);
+        if (!memberBlacklistVOResult.isOk()) {
+            return null;
+        }
+        MemberBlacklistVO result = memberBlacklistVOResult.getResult();
+        if (!result.isExist()) {
+            return null;
+        }
+        //step2 存在校验剩余余额
+        Long limitAmount = result.getLimitAmount();
+        Long shoppingTotalAmount = result.getShoppingTotalAmount();
+        if (limitAmount.compareTo(shoppingTotalAmount + blacklistDto.getAmount()) >= 0) {
+            // 满足
+            return null;
+        }
+        // step3 余额不足组装前端参数  考虑负数默认0
+        long surplusAmount = limitAmount - shoppingTotalAmount;
+
+//        OrderBlacklistResp orderBlacklistResp = new OrderBlacklistResp();
+//        orderBlacklistResp.setMoblie(result.getMoblie());
+//        orderBlacklistResp.setSurplusAmount(surplusAmount < 0 ? 0L : surplusAmount);
+//        return orderBlacklistResp;
+        // 您的消费额度还有3元，暂无法支付，如有疑问，详询客服热线4008899096
+        StringBuilder sb = new StringBuilder();
+        long amount = surplusAmount < 0L ? 0L : surplusAmount * 100;
+        sb.append("您的消费额度还有")
+                .append(amount)
+                .append("元，暂无法支付，如有疑问，详询客服热线")
+                .append(result.getMoblie());
+        return sb.toString();
+
+    }
+}

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

@@ -9,6 +9,7 @@ import cn.freemud.constant.RedisKeyConstant;
 import cn.freemud.constant.ResponseCodeConstant;
 import cn.freemud.entities.bo.CreateOrderBONew;
 import cn.freemud.entities.dto.*;
+import cn.freemud.entities.dto.blacklist.BlacklistDto;
 import cn.freemud.entities.dto.ecology.VirtualBindStoreResponse;
 import cn.freemud.entities.dto.ecology.VirtualStoreRequest;
 import cn.freemud.entities.dto.order.CreateOrderOperateDto;
@@ -24,6 +25,7 @@ import cn.freemud.entities.dto.wechat.GetAuthorizerRequestDto;
 import cn.freemud.entities.dto.wechat.GetTokenResponseDto;
 import cn.freemud.entities.vo.*;
 import cn.freemud.enums.*;
+import cn.freemud.handler.MemberBlacklistHandler;
 import cn.freemud.interceptor.ServiceException;
 import cn.freemud.management.entities.dto.request.pay.PayRefundRequestDto;
 import cn.freemud.management.entities.dto.response.pay.OrderRefundResponse;
@@ -149,6 +151,9 @@ public class MallOrderServiceImpl implements MallOrderService {
     @Autowired
     private SpellGroupOrderDataManager spellGroupOrderDataManager;
 
+    @Autowired
+    private MemberBlacklistHandler memberBlacklistHandler;
+
     /**
      * 创建订单
      */
@@ -287,6 +292,22 @@ public class MallOrderServiceImpl implements MallOrderService {
             createOrderRequest.setBaseCreateOrderRequest(baseCreateOrderRequest);
             createOrderRequest.getBaseCreateOrderRequest().setUserName(userLoginInfoDto.getNickName());
             createOrderRequest.setTrackingNo(LogThreadLocal.getTrackingNo());
+
+            // fisherman -> 微商城消费黑名单限制
+
+            BlacklistDto blacklistDto = new BlacklistDto();
+            blacklistDto.setAmount(baseCreateOrderRequest.getAmount());
+            blacklistDto.setPartnerId(createOrderVo.getPartnerId());
+            blacklistDto.setMemberId(createOrderVo.getUserId());
+            String touchStr = memberBlacklistHandler.checkisTrueBlacklist(blacklistDto);
+            if (StringUtils.isNotEmpty(touchStr)) {
+                CreateOrderResponse baseOrderResponse = new CreateOrderResponse();
+                baseOrderResponse.setErrcode(Integer.valueOf(ResponseResult.TOUCH_SHOPPING_BLACK_LIST.getCode()));
+                baseOrderResponse.setErrmsg(touchStr);
+                baseOrderResponse.setData(null);
+                return baseOrderResponse;
+            }
+
             return orderBusinessService.createOrderFlow(createOrderRequest);
         });
 

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

@@ -24,6 +24,8 @@ import cn.freemud.entities.dto.*;
 import cn.freemud.entities.dto.activity.PayGiftCheckAndJoinResponseDto;
 import cn.freemud.entities.dto.activity.PayGiftCheckAndJoinResponseObj;
 import cn.freemud.entities.dto.activity.PayGitCheckAndJoinRequestDto;
+import cn.freemud.entities.dto.blacklist.BlacklistDto;
+import cn.freemud.entities.dto.blacklist.OrderBlacklistResp;
 import cn.freemud.entities.dto.coupon.CheckAndCancelRequest;
 import cn.freemud.entities.dto.coupon.CheckAndCancelResponseDTO;
 import cn.freemud.entities.dto.coupon.CouponResponseDTO;
@@ -50,6 +52,7 @@ import cn.freemud.entities.dto.user.UserCouponCheckRequest;
 import cn.freemud.entities.vo.*;
 import cn.freemud.entities.vo.order.*;
 import cn.freemud.enums.*;
+import cn.freemud.handler.MemberBlacklistHandler;
 import cn.freemud.handler.WeChatLiveMsgHandle;
 import cn.freemud.interceptor.ServiceException;
 import cn.freemud.management.entities.dto.request.BatchOrderRefundV2Request;
@@ -295,6 +298,9 @@ public class OrderServiceImpl implements Orderservice {
     private StockHandle stockHandle;
 
     @Autowired
+    private MemberBlacklistHandler memberBlacklistHandler;
+
+    @Autowired
     private OrderManagerAdapter orderManagerAdapter;
 
     @Value("${sellcoupon.test.order.refund.fail:}")
@@ -2489,6 +2495,18 @@ public class OrderServiceImpl implements Orderservice {
 
         //组装老的创建订单数据模型
         BaseCreateOrderRequest baseCreateOrderRequest = orderAdapter.convent2CreateOrderDto(createOrderVo, shoppingCartGoodsDto, storeResponseDto);
+
+        // fisherman 订单支付价格 _> 处理 消费黑面名单逻辑
+        Long amount = baseCreateOrderRequest.getAmount();
+        BlacklistDto blacklistDto = new BlacklistDto();
+        blacklistDto.setAmount(amount);
+        blacklistDto.setPartnerId(createOrderVo.getPartnerId());
+        blacklistDto.setMemberId(createOrderVo.getUserId());
+        String touchStr = memberBlacklistHandler.checkisTrueBlacklist(blacklistDto);
+        if (StringUtils.isNotEmpty(touchStr)) {
+            return ResponseUtil.error(ResponseResult.TOUCH_SHOPPING_BLACK_LIST.getCode(), touchStr);
+        }
+
         // 预先前置 设置 支付方式
         this.preSetPayChannelType(baseCreateOrderRequest, createOrderVo);
 

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

@@ -12,6 +12,7 @@ import cn.freemud.constant.ResponseCodeConstant;
 import cn.freemud.entities.Active;
 import cn.freemud.entities.bo.CreateOrderBONew;
 import cn.freemud.entities.dto.*;
+import cn.freemud.entities.dto.blacklist.BlacklistDto;
 import cn.freemud.entities.dto.coupon.CouponResponseDTO;
 import cn.freemud.entities.dto.coupon.FastBatchQueryTemplateInfoRequest;
 import cn.freemud.entities.dto.coupon.FastTemplateInfoResponseVO;
@@ -29,6 +30,7 @@ import cn.freemud.entities.dto.store.StoreMixResponseDto;
 import cn.freemud.entities.live.WeChatReportVO;
 import cn.freemud.entities.vo.*;
 import cn.freemud.enums.*;
+import cn.freemud.handler.MemberBlacklistHandler;
 import cn.freemud.handler.WeChatLiveMsgHandle;
 import cn.freemud.interceptor.ServiceException;
 import cn.freemud.manager.BuyProductOnceManager;
@@ -180,6 +182,10 @@ public class SellCouponOrderServiceImpl implements OrderFactoryService {
 
     @Autowired
     private CouponOnlineClient couponOnlineClient;
+
+    @Autowired
+    private MemberBlacklistHandler memberBlacklistHandler;
+
     /**
      * 抖音卖券
      */
@@ -380,6 +386,18 @@ public class SellCouponOrderServiceImpl implements OrderFactoryService {
         //标准化平台虚拟商品特价活动计算，不包含蜜雪APP买虚拟商品
         List<SubtractStockVO> stockBeanDtos = calculationDiscount(partnerId, storeId, userLoginInfoDto.getMemberId(), productInfosDto.getData().getProducts().get(0), createOrderRequest);
 
+        // fisherman --> 校验是否存在用户消费黑名单 需要校验 !=null && >0
+        Long amount = createOrderRequest.getActualPayAmount();
+        if (Objects.nonNull(amount) && amount.compareTo(0L) > 0) {
+            BlacklistDto blacklistDto = new BlacklistDto();
+            blacklistDto.setAmount(amount);
+            blacklistDto.setPartnerId(createOrderRequest.getPartnerId());
+            blacklistDto.setMemberId(createOrderRequest.getUserId());
+            String touchStr = memberBlacklistHandler.checkisTrueBlacklist(blacklistDto);
+            if (StringUtils.isNotEmpty(touchStr)) {
+                return ResponseUtil.error(ResponseResult.TOUCH_SHOPPING_BLACK_LIST.getCode(), touchStr);
+            }
+        }
         OrderBaseResp<OrderInfoReqs> orderInfoReqsBaseResponse = orderSdkService.createOrder(createOrderRequest, trackingNo);
         CreateOrderResponse createOrderResponse = orderSdkAdapter.convent2NEWOrderInfoReqs(orderInfoReqsBaseResponse);
         if (createOrderResponse == null || createOrderResponse.getErrcode() != 100) {

order-application-service/src/main/java/cn/freemud/service/thirdparty/DataCenterClient.java

+package cn.freemud.service.thirdparty;
+
+import cn.freemud.entities.dto.blacklist.Result;
+import cn.freemud.entities.dto.blacklist.req.BlackListQueryByClient;
+import cn.freemud.entities.dto.blacklist.resp.MemberBlacklistVO;
+import com.freemud.application.sdk.api.ordercenter.annotation.LogIgnoreFeign;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.http.MediaType;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+/**
+ * @author : xh.Z
+ * @email : fisherman0510@163.com
+ * @Date : 2022/5/27 14:17
+ * @description :
+ */
+@FeignClient(name = "data-center")
+@RequestMapping(produces = {MediaType.APPLICATION_JSON_UTF8_VALUE})
+public interface DataCenterClient {
+
+    /**
+     * 查询用户是否在黑名单中
+     */
+    @LogIgnoreFeign(logMessage="queryByMemberId")
+    @PostMapping("/blacklist/query-by-memberId")
+    Result<MemberBlacklistVO> queryByMemberId(@RequestBody BlackListQueryByClient req);
+
+}

order-management/src/main/java/cn/freemud/management/service/handle/DeliveryHandle.java

@@ -102,7 +102,6 @@ public class DeliveryHandle {
         }
         // 调用配送系统创建配送单
         CreateDeliveryOrderRequestDto requestDto = deliverySdkAdapter.buildDeliveryOrderRequestDto(orderBean, storeInfo, deliveryCallBackUrl);
-        logUtil.info("fisherman -> 配送计算金额 ",orderBean.getOid(),JSON.toJSONString(requestDto),JSON.toJSONString(orderBean.getProductList()));
         CreateDeliveryOrderResponseDto deliveryResponse = deliveryService.deliveryOrderAdd(requestDto, LogThreadLocal.getTrackingNo());
 
         String operator = request == null || StringUtils.isBlank(request.getOperator()) ? "系统" : request.getOperator();