订单消息 与发货状态机和推进处理

mall-service/src/main/java/com/txz/mall/controller/OrderController.java

@@ -292,4 +292,8 @@ public class OrderController {
         return Result.success();
     }
 
+
+
+
+
 }

mall-service/src/main/java/com/txz/mall/controller/appcontroller/AppOrderController.java

@@ -18,6 +18,7 @@ import org.slf4j.LoggerFactory;
 import org.springframework.util.ObjectUtils;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
 import vo.MyRecord;
 import vo.StoreOrderCountItemVO;
 import vo.StoreOrderVO;
@@ -25,6 +26,7 @@ import vo.StoreOrderVO;
 import javax.annotation.Resource;
 import java.util.Date;
 import java.util.List;
+import java.util.Map;
 
 /**
  * Created by CodeGenerator on 2025/07/15.
@@ -261,4 +263,14 @@ public class AppOrderController {
     //        storeOrderService.importDelivery(file);
     //        return Result.success();
     //    }
+
+
+        @ApiOperation("待处理红点数")
+        @PostMapping("/pendingRedDots")
+        public Result pendingRedDots() {
+            Map<Integer, Integer> integerIntegerMap = storeOrderService.pendingRedDots();
+            return Result.success(integerIntegerMap);
+        }
+
+
 }

mall-service/src/main/java/com/txz/mall/service/StoreOrderService.java

@@ -9,6 +9,7 @@ import vo.*;
 
 import javax.servlet.http.HttpServletResponse;
 import java.util.List;
+import java.util.Map;
 
 
 /**
@@ -164,6 +165,11 @@ public interface StoreOrderService extends Service<StoreOrder> {
 
     void batchSigning();
 
+    /**
+     * 待处理红点数
+     * @return
+     */
+    Map<Integer,Integer> pendingRedDots();
 
     List<StoreCombinationRankVO> getRank();
 

mall-service/src/main/java/com/txz/mall/service/impl/StoreOrderServiceImpl.java

@@ -2390,6 +2390,36 @@ public class StoreOrderServiceImpl extends AbstractService<StoreOrder> implement
 
     }
 
+    /**
+     * -待支付：To Pay状态订单；
+     * -拼团成功：拼团成功&中奖订单，Paid状态订单；中奖状态：中奖；
+     * -拼团失败：拼团成功&未中奖订单，Paid状态订单；
+     * -拼团奖励：拼团成功&中奖订单&选择收货订单，包含To Ship、To Recevie2个订单状态；
+     *
+     * 只给1、2、4项订单状态进行中订单数量红点
+     * @return
+     */
+    @Override
+    public Map<Integer, Integer> pendingRedDots() {
+//        Map<Integer,Integer> resultMap = new HashMap<>();
+//
+//        //待支付数量
+//        Condition conditionStoreOrderToPay = new Condition(StoreOrder.class);
+//        Example.Criteria criteriaStoreOrderToPay = conditionStoreOrderToPay.createCriteria();
+//        criteriaStoreOrderToPay.andEqualTo("status", PinkOrderStatusEnum.GROUP_ORDER_TO_PAY);
+//        criteriaStoreOrderToPay.andEqualTo("isDelete", 0);
+//        int i = storeOrderMapper.selectCountByCondition(conditionStoreOrder);
+//        resultMap.put(1,i);
+
+
+
+
+
+
+
+        return resultMap;
+    }
+
     @Override
     public List<StoreCombinationRankVO> getRank() {