修改获取订单数量的接口,添加两个参数

feifan-module-mall/feifan-module-trade-biz/src/main/java/cn/newfeifan/mall/module/trade/controller/admin/order/TradeOrderController.java

@@ -204,15 +204,15 @@ public class TradeOrderController {
 
     @GetMapping("/get-count")
     @Operation(summary = "获得交易订单数量")
-    public CommonResult<Map<Integer, Long>> getOrderCount() {
+    public CommonResult<Map<Integer, Long>> getOrderCount(@RequestParam("shopId") Long shopId,@RequestParam("merId") Long merId) {
         Map<Integer, Long> orderCount = Maps.newLinkedHashMapWithExpectedSize(6);
         orderCount.put(-1,tradeOrderQueryService.getOrderCount(null));
         orderCount.put(-2,afterSaleService.getApplyingAfterSaleCount(null));
-        orderCount.put(TradeOrderStatusEnum.UNPAID.getStatus(),tradeOrderQueryService.getOrderCount(TradeOrderStatusEnum.UNPAID.getStatus()));
-        orderCount.put(TradeOrderStatusEnum.UNDELIVERED.getStatus(),tradeOrderQueryService.getOrderCount(TradeOrderStatusEnum.UNDELIVERED.getStatus()));
-        orderCount.put(TradeOrderStatusEnum.DELIVERED.getStatus(),tradeOrderQueryService.getOrderCount(TradeOrderStatusEnum.DELIVERED.getStatus()));
-        orderCount.put(TradeOrderStatusEnum.COMPLETED.getStatus(),tradeOrderQueryService.getOrderCount(TradeOrderStatusEnum.COMPLETED.getStatus()));
-        orderCount.put(TradeOrderStatusEnum.CANCELED.getStatus(),tradeOrderQueryService.getOrderCount(TradeOrderStatusEnum.CANCELED.getStatus()));
+        orderCount.put(TradeOrderStatusEnum.UNPAID.getStatus(),tradeOrderQueryService.getOrderCount(TradeOrderStatusEnum.UNPAID.getStatus(),shopId,merId));
+        orderCount.put(TradeOrderStatusEnum.UNDELIVERED.getStatus(),tradeOrderQueryService.getOrderCount(TradeOrderStatusEnum.UNDELIVERED.getStatus(),shopId,merId));
+        orderCount.put(TradeOrderStatusEnum.DELIVERED.getStatus(),tradeOrderQueryService.getOrderCount(TradeOrderStatusEnum.DELIVERED.getStatus(),shopId,merId));
+        orderCount.put(TradeOrderStatusEnum.COMPLETED.getStatus(),tradeOrderQueryService.getOrderCount(TradeOrderStatusEnum.COMPLETED.getStatus(),shopId,merId));
+        orderCount.put(TradeOrderStatusEnum.CANCELED.getStatus(),tradeOrderQueryService.getOrderCount(TradeOrderStatusEnum.CANCELED.getStatus(),shopId,merId));
         return success(orderCount);
     }
 

feifan-module-mall/feifan-module-trade-biz/src/main/java/cn/newfeifan/mall/module/trade/dal/mysql/order/TradeOrderMapper.java

@@ -87,6 +87,13 @@ public interface TradeOrderMapper extends BaseMapperX<TradeOrderDO> {
                 .eqIfPresent(TradeOrderDO::getStatus, status));
     }
 
+    default Long selectCountByStatus(Integer status, Long shopId, Long merId) {
+        return selectCount(new LambdaQueryWrapperX<TradeOrderDO>()
+                .eqIfPresent(TradeOrderDO::getStatus, status)
+                .eqIfPresent(TradeOrderDO::getShopId, shopId)
+                .eqIfPresent(TradeOrderDO::getMerchantId, merId));
+    }
+
     ;
 
     default TradeOrderDO selectOrderByIdAndUserId(Long orderId, Long loginUserId) {

feifan-module-mall/feifan-module-trade-biz/src/main/java/cn/newfeifan/mall/module/trade/service/order/TradeOrderQueryService.java

@@ -163,6 +163,17 @@ public interface TradeOrderQueryService {
      */
     Long getOrderCount(Integer status);
 
+
+    /**
+     * 根据状态获取订单数量, 不通过用户ID信息
+     * @param status 订单状态
+     * @param shopId 店铺ID
+     * @param merId 商户ID
+     * @return
+     */
+    Long getOrderCount(Integer status,Long shopId, Long merId);
+
+
     /**
      * 补充订单编号以及商品图片
      * @param list

feifan-module-mall/feifan-module-trade-biz/src/main/java/cn/newfeifan/mall/module/trade/service/order/TradeOrderQueryServiceImpl.java

@@ -162,7 +162,11 @@ public class TradeOrderQueryServiceImpl implements TradeOrderQueryService {
     @Override
     public Long getOrderCount(Integer status) {
         return tradeOrderMapper.selectCountByStatus(status);
+    }
 
+    @Override
+    public Long getOrderCount(Integer status, Long shopId, Long merId) {
+        return tradeOrderMapper.selectCountByStatus(status,shopId,merId);
     }
 
     @Override

feifan-module-sale/feifan-module-sale-biz/src/main/java/cn/newfeifan/mall/sale/service/merchant/MerchantServiceImpl.java

@@ -61,7 +61,7 @@ public class MerchantServiceImpl implements MerchantService {
         if (adminUserDO != null) {
             throw exception(USER_MOBILE_EXISTS);
         }
-        adminUserService.createUserByMobile(merchant.getId(), merchant.getContactNumber(), merchant.getContact());
+        adminUserService.createUserByMobile(merchant.getId(),shopId, merchant.getContactNumber(), merchant.getContact());
         // todo 设置直推人关联关系
         HashMap<String, Long> stringLongHashMap = new HashMap<>();
         stringLongHashMap.put("shopId", shopId);

feifan-module-sale/feifan-module-sale-biz/src/main/java/cn/newfeifan/mall/sale/service/shop/ShopServiceImpl.java

@@ -54,7 +54,9 @@ public class ShopServiceImpl implements ShopService {
                 .website(createReqVO.getWebsite())
                 .name(createReqVO.getName())
                 .merchantId(createReqVO.getId()).build();
-        return build.getId();
+        ShopDO shop = BeanUtils.toBean(build, ShopDO.class);
+        shopMapper.insert(shop);
+        return shop.getId();
     }
 
     @Override

feifan-module-system/feifan-module-system-biz/src/main/java/cn/newfeifan/mall/module/system/dal/dataobject/user/AdminUserDO.java

@@ -110,7 +110,7 @@ public class AdminUserDO extends TenantBaseDO {
      */
     private Long shopId;
 
-
+    private Long merchantId;
 
 
 }

feifan-module-system/feifan-module-system-biz/src/main/java/cn/newfeifan/mall/module/system/service/user/AdminUserService.java

@@ -209,11 +209,12 @@ public interface AdminUserService {
     /**
      * 根据手机号创建用户
      *
-     * @param id
-     * @param contactMobile
-     * @param contactName
+     * @param merId 商户ID
+     * @param shopId 店铺ID
+     * @param contactMobile 用户手机号码
+     * @param contactName 用户名称
      */
-    void createUserByMobile(Long id, String contactMobile, String contactName);
+    void createUserByMobile(Long merId, Long shopId, String contactMobile, String contactName);
 
 
 }

feifan-module-system/feifan-module-system-biz/src/main/java/cn/newfeifan/mall/module/system/service/user/AdminUserServiceImpl.java

@@ -478,7 +478,7 @@ public class AdminUserServiceImpl implements AdminUserService {
     }
 
     @Override
-    public void createUserByMobile(Long id, String contactMobile, String contactName) {
+    public void createUserByMobile(Long merId, Long shopId, String contactMobile, String contactName) {
         Set<Long> roleIds = new HashSet<>();
 
         // 查询商户管理员的ID
@@ -496,7 +496,8 @@ public class AdminUserServiceImpl implements AdminUserService {
                 .password("zxpt@" + contactMobile)
                 .categoryId(3L)
                 .roleIds(roleIds)
-                .merchantId(id)
+                .shopId(shopId)
+                .merchantId(merId)
                 .build();
         createUser(build);
     }