feat-596: 订单V值首单逻辑修改

yudao-module-member/yudao-module-member-impl/src/main/java/cn/iocoder/yudao/module/member/mq/consumer/score/core/OrderVStrategy.java

@@ -212,8 +212,8 @@ public class OrderVStrategy extends AbstractScoreRuleStrategy {
                 userId = 0L;
             }
         }
-        // 校验首单
-        if (!isFirstOrderValid(userId, extraInfo)) {
+        // 校验首单：发货和收货都算首单，按客户查，只有发货人收货人都是首单才算首单
+        if (!isFirstOrderValid(consignorId, consigneeId, extraInfo)) {
             return null;
         }
         // 校验积分上限，添加加分用户列表
@@ -260,14 +260,14 @@ public class OrderVStrategy extends AbstractScoreRuleStrategy {
     /**
      * 校验是否为首单且首单是否有效
      */
-    private boolean isFirstOrderValid(Long userId, ScoreRuleOrderVExtraVO extraInfo) {
+    private boolean isFirstOrderValid(Long consignorId, Long consigneeId, ScoreRuleOrderVExtraVO extraInfo) {
         if (extraInfo.getFirstOrder() == YesOrNoTypeEnum.YES.ordinal()) {
-            if (userId == null || userId <= 0) {
-                log.info("Order in shipping listener: The user is not member,userId:{}", userId);
+            if (!orderApi.isFirstOrder(consignorId)) {
+                log.info("Order in shipping listener: consignor not first order,consignorId:{}", consignorId);
                 return false;
             }
-            if (!orderApi.isFirstOrder(userId)) {
-                log.info("Order in shipping listener: Not first order,userId:{}", userId);
+            if (!orderApi.isFirstOrder(consigneeId)) {
+                log.info("Order in shipping listener: consignee not first order,consigneeId:{}", consigneeId);
                 return false;
             }
         }

yudao-module-order/yudao-module-order-api/src/main/java/cn/iocoder/boot/module/order/api/OrderApi.java

@@ -14,9 +14,9 @@ public interface OrderApi {
      */
     OrderRespDTO getOrder(Long id, String orderNo);
     /**
-     * 判断是否用户首单
+     * 判断客户是否首单
      */
-    boolean isFirstOrder(Long userId);
+    boolean isFirstOrder(Long customerId);
     /**
      * 根据订单id获取所有订单项
      */

yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/api/OrderApiImpl.java

@@ -3,7 +3,6 @@ package cn.iocoder.yudao.module.order.api;
 import cn.hutool.core.collection.CollectionUtil;
 import cn.iocoder.boot.module.order.api.OrderApi;
 import cn.iocoder.boot.module.order.api.dto.*;
-import cn.iocoder.yudao.module.order.convert.orderConsignor.OrderConsignorConvert;
 import cn.iocoder.yudao.module.order.dal.dataobject.order.OrderDO;
 import cn.iocoder.yudao.module.order.dal.dataobject.orderConsignee.OrderConsigneeDO;
 import cn.iocoder.yudao.module.order.dal.dataobject.orderConsignor.OrderConsignorDO;
@@ -79,9 +78,9 @@ public class OrderApiImpl implements OrderApi {
     }
 
     @Override
-    public boolean isFirstOrder(Long userId) {
-        Long count = orderService.selectCount(new LambdaQueryWrapper<OrderDO>().eq(OrderDO::getUserId, userId));
-        return count <= 0;
+    public boolean isFirstOrder(Long customerId) {
+        // 只要发过货或者收过货都不算首单
+        return orderConsignorService.selectCount("customer_id", customerId) <= 1 && orderConsigneeService.selectCount("customer_id", customerId) <= 1;
     }
 
     @Override