Merge branch 'dev' into 'master'

Dev

See merge request !3

mini-app/src/main/java/com/onsiteservice/miniapp/controller/order/ServiceOrderController.java

@@ -30,6 +30,8 @@ import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import javax.validation.constraints.Positive;
 
+import java.util.Map;
+
 import static com.onsiteservice.core.result.ResultGenerator.fail;
 import static com.onsiteservice.core.result.ResultGenerator.success;
 
@@ -68,6 +70,12 @@ public class ServiceOrderController {
         return serviceOrderBizService.getPage(dto, userId);
     }
 
+    @ApiOperation(value = "客服获取各状态订单数量, 1待受理, 3待支付,4待派单,5服务中,6已完成  ")
+    @GetMapping("todo-detail")
+    public Result<Map<Integer, Integer>> getTodoNum(@CurrentUserId Long userId) {
+        return success(serviceOrderBizService.getTodoNum(userId));
+    }
+
     @Dict(code = DictConstants.ORDER_STATUS, name = "orderStatus")
     @ApiOperation(value = "我的订单-分页查询订单")
     @PostMapping("mine-page")

mini-app/src/main/java/com/onsiteservice/miniapp/mapper/order/ServiceOrderBizMapper.java

@@ -19,4 +19,6 @@ public interface ServiceOrderBizMapper {
 
     Map<String, Long> getMyOrderNum(@Param("accountNo") Long userId);
 
+    Map<Integer, Integer> getTodoNum();
+
 }

mini-app/src/main/java/com/onsiteservice/miniapp/service/order/ServiceOrderBizService.java

@@ -35,18 +35,16 @@ import com.onsiteservice.miniapp.controller.order.dto.CancelServiceOrderDTO;
 import com.onsiteservice.miniapp.controller.order.dto.PageServiceOrderDTO;
 import com.onsiteservice.miniapp.controller.order.dto.ReserveServiceOrderDTO;
 import com.onsiteservice.miniapp.controller.order.vo.ServiceOrderDefDetailVO;
+import com.onsiteservice.miniapp.mapper.order.ServiceOrderBizMapper;
 import com.onsiteservice.miniapp.service.weixin.pay.WechatNativePay;
 import com.onsiteservice.service.order.ServiceOrderService;
 import com.onsiteservice.util.AttrCopyUtils;
-import com.onsiteservice.util.DateUtils;
 import com.onsiteservice.util.RandomUtils;
-import com.onsiteservice.util.aliyun.SmsUtils;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.tuple.Pair;
 import org.springframework.amqp.core.AmqpTemplate;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
@@ -95,6 +93,8 @@ public class ServiceOrderBizService extends AbstractMapper<ServiceOrder> {
     private SysUserMapper sysUserMapper;
     @Resource
     private AmqpTemplate amqpTemplate;
+    @Resource
+    private ServiceOrderBizMapper serviceOrderBizMapper;
 
 
     public ServiceOrderVO selectById(Long id, Long userId) {
@@ -423,4 +423,18 @@ public class ServiceOrderBizService extends AbstractMapper<ServiceOrder> {
     }
 
 
+    /**
+     * 获取各个状态（前端状态）下的待办数量
+     * @param userId
+     * @return
+     */
+    public Map<Integer, Integer> getTodoNum(Long userId) {
+        User user = userMapper.selectByPrimaryKey(userId);
+        if(!ServiceUserTypeEnum.ADMIN.getId().equals(user.getRoleType())) {
+            return Map.of(1, 0, 3, 0, 4, 0, 5, 0, 6, 0);
+        }
+
+        return serviceOrderBizMapper.getTodoNum();
+    }
+
 }

mini-app/src/main/java/com/onsiteservice/miniapp/service/user/UserService.java

@@ -132,7 +132,7 @@ public class UserService extends AbstractMapper<User> {
         // 待处理数量
         if (Objects.equals(user.getRoleType(), ServiceUserTypeEnum.ADMIN.getId())) {
             Condition condition = new Condition(ServiceOrder.class);
-            condition.createCriteria().andEqualTo("orderStatus", ServiceOrderStatusEnum.RESERVE.getStatus());
+            condition.createCriteria().andIn("orderStatus", List.of(ServiceOrderStatusEnum.RESERVE.getStatus(), ServiceOrderStatusEnum.PAY.getStatus()));
             int num = serviceOrderMapper.selectCountByCondition(condition);
             vo.setTodo(num);
         }

mini-app/src/main/resources/mapper/order/ServiceOrderBizMapper.xml

@@ -22,6 +22,14 @@
          from service_order
         where account_no = #{accountNo}
     </select>
+    <select id="getTodoNum" resultType="java.util.Map">
+        select count(if(t.order_status in (1, 2), 1, null)) `1`,
+               count(if(t.order_status = 3, 1, null))       `3`,
+               count(if(t.order_status = 4, 1, null))       `4`,
+               count(if(t.order_status = 5, 1, null))       `5`,
+               count(if(t.order_status in (6, 7), 1, null)) `6`
+        from service_order t
+    </select>
 
 
 </mapper>