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

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

@@ -20,10 +20,7 @@ import com.txz.cif.param.CancelParam;
 import com.txz.cif.param.JoinParam;
 import com.txz.cif.param.OpenParam;
 import com.txz.mall.constants.Constants;
-import com.txz.mall.core.AbstractService;
-import com.txz.mall.core.RedisUtil;
-import com.txz.mall.core.ResultCode;
-import com.txz.mall.core.ServiceException;
+import com.txz.mall.core.*;
 import com.txz.mall.dao.StoreOrderMapper;
 import com.txz.mall.dao.StorePinkMapper;
 import com.txz.mall.dao.StorePinkSummaryMapper;
@@ -2396,24 +2393,26 @@ public class StoreOrderServiceImpl extends AbstractService<StoreOrder> implement
     @Override
     public Map<Integer, Integer> pendingRedDots() {
        Map<Integer,Integer> resultMap = new HashMap<>();
-//
-//        //待支付数量
-//        Condition conditionStoreStorePinkPaid = new Condition(StorePink.class);
-//        Example.Criteria criteriaStorePinkPaid = conditionStoreStorePinkPaid.createCriteria();
-//        criteriaStorePinkPaid.andEqualTo("orderStatus", PinkOrderStatusEnum.GROUP_ORDER_TO_PAY);
-//        criteriaStorePinkPaid.andEqualTo("isDelete", 0);
-//        int i = storePinkMapper.selectCountByCondition(conditionStoreStorePinkPaid);
-//        resultMap.put(1,i);
-//
-//
-//
-//
-//
-//        Condition conditionStoreOrderPaid = new Condition(StoreOrder.class);
-//        Example.Criteria criteriaStoreOrderPaid = conditionStoreOrderPaid.createCriteria();
-//        criteriaStoreOrderPaid.andEqualTo("status", PinkOrderStatusEnum.GROUP_ORDER_PAID);
-//        criteriaStoreOrderPaid.andEqualTo("isDelete", 0);
-//        int i = storeOrderMapper.selectCountByCondition(criteriaStoreOrderToPay);
+        Long tokenUserId = AuthService.getTokenUserId(null);
+        if(ObjectUtils.isEmpty(tokenUserId)){
+            throw new ServiceException("登陆用户不存在tokenUserId："+tokenUserId);
+        }
+        //待支付数量
+        Condition conditionStoreStorePinkToPay = new Condition(StorePink.class);
+        Example.Criteria criteriaStorePinkToPay = conditionStoreStorePinkToPay.createCriteria();
+        criteriaStorePinkToPay.andEqualTo("orderStatus", PinkOrderStatusEnum.GROUP_ORDER_TO_PAY);
+        criteriaStorePinkToPay.andEqualTo("isDelete", 0);
+        criteriaStorePinkToPay.andEqualTo("uid", tokenUserId);
+        int i = storePinkMapper.selectCountByCondition(conditionStoreStorePinkToPay);
+        resultMap.put(1,i);
+
+        //中奖未填写收获地址数量
+        Condition conditionStoreStorePinkPaid = new Condition(StorePink.class);
+        Example.Criteria criteriaStorePinkPaid = conditionStoreStorePinkPaid.createCriteria();
+        criteriaStorePinkPaid.andEqualTo("orderStatus", PinkOrderStatusEnum.GROUP_ORDER_PAID);
+        criteriaStorePinkPaid.andEqualTo("isDelete", 0);
+        criteriaStorePinkToPay.andEqualTo("uid", tokenUserId);
+        int ii = storeOrderMapper.selectCountByCondition(conditionStoreStorePinkPaid);