tea 1 місяць тому
батько
коміт
35e2ce8bb9
84 змінених файлів з 323 додано та 89 видалено
  1. 0 1
      kxmall-admin-api/src/main/java/com/kxmall/web/controller/region/service/impl/KxRegionServiceImpl.java
  2. 2 0
      kxmall-admin/src/main/java/com/kxmall/KxmallShopApplication.java
  3. 12 1
      kxmall-app-api/src/main/java/com/kxmall/web/controller/order/KxAppOrderController.java
  4. 8 0
      kxmall-app-api/src/main/java/com/kxmall/web/controller/order/service/IKxAppOrderService.java
  5. 59 0
      kxmall-app-api/src/main/java/com/kxmall/web/controller/order/service/impl/KxAppOrderService.java
  6. 2 0
      kxmall-system/src/main/java/com/kxmall/activity/mapper/KxStoreActivityMapper.java
  7. 3 1
      kxmall-system/src/main/java/com/kxmall/activity/mapper/KxStoreActivityProductMapper.java
  8. 3 1
      kxmall-system/src/main/java/com/kxmall/address/mapper/KxAddressMapper.java
  9. 3 1
      kxmall-system/src/main/java/com/kxmall/carousel/mapper/KxCarouselMapper.java
  10. 3 1
      kxmall-system/src/main/java/com/kxmall/coupon/mapper/KxStoreCouponIssueMapper.java
  11. 3 1
      kxmall-system/src/main/java/com/kxmall/coupon/mapper/KxStoreCouponIssueUserMapper.java
  12. 3 1
      kxmall-system/src/main/java/com/kxmall/coupon/mapper/KxStoreCouponMapper.java
  13. 3 1
      kxmall-system/src/main/java/com/kxmall/coupon/mapper/KxStoreCouponUserMapper.java
  14. 3 1
      kxmall-system/src/main/java/com/kxmall/decorate/mapper/KxPageTemplateMapper.java
  15. 3 1
      kxmall-system/src/main/java/com/kxmall/dish/mapper/CompositionDishItemMapper.java
  16. 3 2
      kxmall-system/src/main/java/com/kxmall/dish/mapper/CompositionDishMapper.java
  17. 3 1
      kxmall-system/src/main/java/com/kxmall/group/mapper/KxGroupShopMapper.java
  18. 3 1
      kxmall-system/src/main/java/com/kxmall/group/mapper/KxGroupShopProductMapper.java
  19. 3 1
      kxmall-system/src/main/java/com/kxmall/newtimes/mapper/KxNewTimesMapper.java
  20. 3 0
      kxmall-system/src/main/java/com/kxmall/order/domain/bo/OrderPriceBo.java
  21. 5 0
      kxmall-system/src/main/java/com/kxmall/order/domain/bo/OrderRequestBo.java
  22. 3 2
      kxmall-system/src/main/java/com/kxmall/order/mapper/KxDeliveryConfigMapper.java
  23. 3 2
      kxmall-system/src/main/java/com/kxmall/order/mapper/KxOrderDeliveryMapper.java
  24. 2 0
      kxmall-system/src/main/java/com/kxmall/order/mapper/KxOrderScreenshotMapper.java
  25. 3 1
      kxmall-system/src/main/java/com/kxmall/order/mapper/KxOrderSnapshotMapper.java
  26. 3 1
      kxmall-system/src/main/java/com/kxmall/order/mapper/KxStoreAfterSalesItemMapper.java
  27. 3 1
      kxmall-system/src/main/java/com/kxmall/order/mapper/KxStoreAfterSalesMapper.java
  28. 3 1
      kxmall-system/src/main/java/com/kxmall/order/mapper/KxStoreAfterSalesStatusMapper.java
  29. 3 1
      kxmall-system/src/main/java/com/kxmall/order/mapper/KxStoreAppraiseMapper.java
  30. 3 1
      kxmall-system/src/main/java/com/kxmall/order/mapper/KxStoreCartMapper.java
  31. 4 1
      kxmall-system/src/main/java/com/kxmall/order/mapper/KxStoreOrderMapper.java
  32. 4 1
      kxmall-system/src/main/java/com/kxmall/order/mapper/KxStoreOrderProductMapper.java
  33. 3 1
      kxmall-system/src/main/java/com/kxmall/product/mapper/KxStoreCategoryMapper.java
  34. 3 1
      kxmall-system/src/main/java/com/kxmall/product/mapper/KxStoreProductAttrMapper.java
  35. 3 1
      kxmall-system/src/main/java/com/kxmall/product/mapper/KxStoreProductAttrResultMapper.java
  36. 3 1
      kxmall-system/src/main/java/com/kxmall/product/mapper/KxStoreProductAttrValueMapper.java
  37. 3 1
      kxmall-system/src/main/java/com/kxmall/product/mapper/KxStoreProductMapper.java
  38. 3 1
      kxmall-system/src/main/java/com/kxmall/product/mapper/KxStoreProductRuleMapper.java
  39. 3 1
      kxmall-system/src/main/java/com/kxmall/recommend/mapper/KxRecommendMapper.java
  40. 3 1
      kxmall-system/src/main/java/com/kxmall/rider/mapper/KxRiderAuthAttachmentMapper.java
  41. 3 1
      kxmall-system/src/main/java/com/kxmall/rider/mapper/KxRiderCycleMapper.java
  42. 3 1
      kxmall-system/src/main/java/com/kxmall/rider/mapper/KxRiderItemMapper.java
  43. 3 1
      kxmall-system/src/main/java/com/kxmall/rider/mapper/KxRiderMapper.java
  44. 3 1
      kxmall-system/src/main/java/com/kxmall/rider/mapper/KxRiderOrderMapper.java
  45. 3 2
      kxmall-system/src/main/java/com/kxmall/rider/mapper/KxRiderWalletTransactionMapper.java
  46. 3 1
      kxmall-system/src/main/java/com/kxmall/rider/mapper/KxRiderWithdrawalMapper.java
  47. 3 1
      kxmall-system/src/main/java/com/kxmall/seckill/mapper/KxStoreSeckillMapper.java
  48. 3 1
      kxmall-system/src/main/java/com/kxmall/storage/mapper/KxGoodsInStockMapper.java
  49. 3 1
      kxmall-system/src/main/java/com/kxmall/storage/mapper/KxGoodsOutStockMapper.java
  50. 3 1
      kxmall-system/src/main/java/com/kxmall/storage/mapper/KxInStockProductMapper.java
  51. 3 1
      kxmall-system/src/main/java/com/kxmall/storage/mapper/KxOutStockProductMapper.java
  52. 3 1
      kxmall-system/src/main/java/com/kxmall/storage/mapper/KxRoleStorageMapper.java
  53. 3 1
      kxmall-system/src/main/java/com/kxmall/storage/mapper/KxStockMapper.java
  54. 3 1
      kxmall-system/src/main/java/com/kxmall/storage/mapper/KxStorageMapper.java
  55. 3 1
      kxmall-system/src/main/java/com/kxmall/system/mapper/SysConfigMapper.java
  56. 3 1
      kxmall-system/src/main/java/com/kxmall/system/mapper/SysDeptMapper.java
  57. 3 1
      kxmall-system/src/main/java/com/kxmall/system/mapper/SysDictDataMapper.java
  58. 3 1
      kxmall-system/src/main/java/com/kxmall/system/mapper/SysDictTypeMapper.java
  59. 3 1
      kxmall-system/src/main/java/com/kxmall/system/mapper/SysExpressMapper.java
  60. 3 1
      kxmall-system/src/main/java/com/kxmall/system/mapper/SysLogininforMapper.java
  61. 3 1
      kxmall-system/src/main/java/com/kxmall/system/mapper/SysMenuMapper.java
  62. 3 1
      kxmall-system/src/main/java/com/kxmall/system/mapper/SysNoticeMapper.java
  63. 3 1
      kxmall-system/src/main/java/com/kxmall/system/mapper/SysOperLogMapper.java
  64. 3 1
      kxmall-system/src/main/java/com/kxmall/system/mapper/SysOssConfigMapper.java
  65. 3 1
      kxmall-system/src/main/java/com/kxmall/system/mapper/SysOssMapper.java
  66. 3 1
      kxmall-system/src/main/java/com/kxmall/system/mapper/SysPostMapper.java
  67. 3 1
      kxmall-system/src/main/java/com/kxmall/system/mapper/SysRegionMapper.java
  68. 3 1
      kxmall-system/src/main/java/com/kxmall/system/mapper/SysRoleDeptMapper.java
  69. 3 1
      kxmall-system/src/main/java/com/kxmall/system/mapper/SysRoleMapper.java
  70. 3 1
      kxmall-system/src/main/java/com/kxmall/system/mapper/SysRoleMenuMapper.java
  71. 3 1
      kxmall-system/src/main/java/com/kxmall/system/mapper/SysUserMapper.java
  72. 3 1
      kxmall-system/src/main/java/com/kxmall/system/mapper/SysUserPostMapper.java
  73. 3 1
      kxmall-system/src/main/java/com/kxmall/system/mapper/SysUserRoleMapper.java
  74. 3 2
      kxmall-system/src/main/java/com/kxmall/user/mapper/KxUserBillMapper.java
  75. 3 1
      kxmall-system/src/main/java/com/kxmall/user/mapper/KxUserCollectMapper.java
  76. 3 1
      kxmall-system/src/main/java/com/kxmall/user/mapper/KxUserExtractMapper.java
  77. 3 1
      kxmall-system/src/main/java/com/kxmall/user/mapper/KxUserFootprintMapper.java
  78. 3 1
      kxmall-system/src/main/java/com/kxmall/user/mapper/KxUserLevelMapper.java
  79. 3 1
      kxmall-system/src/main/java/com/kxmall/user/mapper/KxUserLevelSettingMapper.java
  80. 3 1
      kxmall-system/src/main/java/com/kxmall/user/mapper/KxUserMapper.java
  81. 3 1
      kxmall-system/src/main/java/com/kxmall/user/mapper/KxUserSignMapper.java
  82. 2 2
      kxmall-system/src/main/java/com/kxmall/user/mapper/KxUserTaskFinishMapper.java
  83. 2 0
      kxmall-system/src/main/java/com/kxmall/user/mapper/KxUserTaskMapper.java
  84. 8 8
      需求列表.md

+ 0 - 1
kxmall-admin-api/src/main/java/com/kxmall/web/controller/region/service/impl/KxRegionServiceImpl.java

@@ -31,7 +31,6 @@ public class KxRegionServiceImpl implements IKxRegionService {
 
     private final KxRegionMapper baseMapper;
 
-
     private static final Integer PROVINCE_LEVEL = 1;
     private static final Integer CITY_LEVEL = 2;
     private static final Integer COUNTY_LEVEL = 3;

+ 2 - 0
kxmall-admin/src/main/java/com/kxmall/KxmallShopApplication.java

@@ -1,5 +1,6 @@
 package com.kxmall;
 
+import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.context.metrics.buffering.BufferingApplicationStartup;
@@ -11,6 +12,7 @@ import org.springframework.boot.context.metrics.buffering.BufferingApplicationSt
  */
 
 @SpringBootApplication
+@MapperScan("com.kxmall.**.mapper")
 public class KxmallShopApplication {
 
     public static void main(String[] args) {

+ 12 - 1
kxmall-app-api/src/main/java/com/kxmall/web/controller/order/KxAppOrderController.java

@@ -17,6 +17,7 @@ import com.kxmall.common.utils.redis.RedisUtils;
 import com.kxmall.order.domain.KxStoreOrder;
 import com.kxmall.order.domain.bo.DeliveryRequestBo;
 import com.kxmall.order.domain.bo.OrderRequestBo;
+import com.kxmall.order.domain.bo.OrderPriceBo;
 import com.kxmall.order.domain.vo.KxStoreOrderVo;
 import com.kxmall.storage.domain.vo.KxStorageVo;
 import com.kxmall.web.controller.order.builder.OrderBuilder;
@@ -158,10 +159,20 @@ public class KxAppOrderController extends BaseAppController {
      */
     @PostMapping("/getFreightMoney")
     public R<DeliveryRequestBo> getFreightMoney(@RequestBody OrderRequestBo orderRequestBo) {
-        Long userId = getAppLoginUser().getUserId();
         return R.ok(appOrderService.getFreightMoney(orderRequestBo));
     }
 
+    /**
+     * 计算订单总价(含商品、优惠券、运费、加急费用)
+     *
+     * @param orderRequestBo
+     * @return
+     */
+    @PostMapping("/calculateOrderPrice")
+    public R<OrderPriceBo> calculateOrderPrice(@RequestBody OrderRequestBo orderRequestBo) {
+        return R.ok(appOrderService.calculateOrderPrice(orderRequestBo));
+    }
+
     /**
      * 用户申请退款
      *

+ 8 - 0
kxmall-app-api/src/main/java/com/kxmall/web/controller/order/service/IKxAppOrderService.java

@@ -5,6 +5,7 @@ import com.kxmall.common.core.page.TableDataInfo;
 import com.kxmall.order.domain.KxStoreOrder;
 import com.kxmall.order.domain.bo.DeliveryRequestBo;
 import com.kxmall.order.domain.bo.OrderRequestBo;
+import com.kxmall.order.domain.bo.OrderPriceBo;
 import com.kxmall.order.domain.vo.KxStoreOrderVo;
 
 import java.util.List;
@@ -83,6 +84,13 @@ public interface IKxAppOrderService {
      */
     DeliveryRequestBo getFreightMoney(OrderRequestBo orderRequestBo);
 
+    /**
+     * 计算订单总价(含商品、优惠券、运费、加急费用)
+     * @param orderRequestBo
+     * @return
+     */
+    OrderPriceBo calculateOrderPrice(OrderRequestBo orderRequestBo);
+
     /**
      * 用户申请退款
      *

+ 59 - 0
kxmall-app-api/src/main/java/com/kxmall/web/controller/order/service/impl/KxAppOrderService.java

@@ -27,6 +27,7 @@ import com.kxmall.order.domain.KxStoreOrderProduct;
 import com.kxmall.order.domain.bo.DeliveryRequestBo;
 import com.kxmall.order.domain.bo.OrderRequestBo;
 import com.kxmall.order.domain.bo.OrderRequestProductBo;
+import com.kxmall.order.domain.bo.OrderPriceBo;
 import com.kxmall.order.domain.vo.KxStoreOrderProductVo;
 import com.kxmall.order.domain.vo.KxStoreOrderVo;
 import com.kxmall.order.mapper.KxStoreOrderMapper;
@@ -318,6 +319,64 @@ public class KxAppOrderService implements IKxAppOrderService {
         result.setMsg("不予配送");
         return result;
     }
+
+    @Override
+    public OrderPriceBo calculateOrderPrice(OrderRequestBo orderRequestBo) {
+        OrderPriceBo orderPriceBo = new OrderPriceBo();
+        
+        // 1. 计算商品总价
+        BigDecimal productTotalPrice = BigDecimal.ZERO;
+        BigDecimal productOriginalPrice = BigDecimal.ZERO;
+        
+        for (OrderRequestProductBo product : orderRequestBo.getProductList()) {
+            BigDecimal price = ObjectUtils.isEmpty(product.getVipPrice()) ? product.getPrice() : product.getVipPrice();
+            BigDecimal itemTotal = price.multiply(BigDecimal.valueOf(product.getCartNum()));
+            productTotalPrice = productTotalPrice.add(itemTotal);
+            
+            // 原价计算(如果需要显示优惠信息)
+            BigDecimal originalPrice = product.getPrice().multiply(BigDecimal.valueOf(product.getCartNum()));
+            productOriginalPrice = productOriginalPrice.add(originalPrice);
+        }
+        
+        // 2. 计算配送费
+        BigDecimal freightPrice = BigDecimal.ZERO;
+        if (orderRequestBo.getShippingType() == 1) {
+            DeliveryRequestBo deliveryResult = getFreightMoney(orderRequestBo);
+            freightPrice = deliveryResult.getTotalPrice().compareTo(BigDecimal.ZERO) < 0 ? BigDecimal.ZERO : deliveryResult.getTotalPrice();
+        }
+        
+        // 3. 获取加急费用
+        BigDecimal urgentFee = orderRequestBo.getUrgentFee() != null ? orderRequestBo.getUrgentFee() : BigDecimal.ZERO;
+        
+        // 4. 计算优惠券抵扣
+        BigDecimal couponPrice = BigDecimal.ZERO;
+        if (orderRequestBo.getCoupon() != null) {
+            couponPrice = orderRequestBo.getCoupon().getCouponPrice();
+        }
+        
+        // 5. 计算最终价格 = 商品总价 - 优惠券 + 配送费 + 加急费用
+        BigDecimal actualPrice = productTotalPrice.subtract(couponPrice).add(freightPrice).add(urgentFee);
+        
+        // 确保最终价格不为负数
+        if (actualPrice.compareTo(BigDecimal.ZERO) < 0) {
+            actualPrice = BigDecimal.ZERO;
+        }
+        
+        // 组装返回结果
+        orderPriceBo.setProductTotalPrice(productTotalPrice);
+        orderPriceBo.setProductOriginalTotalPrice(productOriginalPrice);
+        orderPriceBo.setFreightPrice(freightPrice);
+        orderPriceBo.setUrgentFee(urgentFee);
+        orderPriceBo.setCouponPrice(couponPrice);
+        orderPriceBo.setActualPrice(actualPrice);
+        
+        if (orderRequestBo.getCoupon() != null) {
+            orderPriceBo.setCouponId(orderRequestBo.getCoupon().getId());
+        }
+        
+        return orderPriceBo;
+    }
+
     @Override
     @Transactional(rollbackFor = Exception.class)
     public String refund(String orderId, Long userId, String reason) {

+ 2 - 0
kxmall-system/src/main/java/com/kxmall/activity/mapper/KxStoreActivityMapper.java

@@ -4,6 +4,7 @@ package com.kxmall.activity.mapper;
 import com.kxmall.activity.domain.KxStoreActivity;
 import com.kxmall.activity.domain.vo.KxStoreActivityVo;
 import com.kxmall.common.core.mapper.BaseMapperPlus;
+import org.springframework.stereotype.Repository;
 
 /**
  * 活动商品Mapper接口
@@ -11,6 +12,7 @@ import com.kxmall.common.core.mapper.BaseMapperPlus;
  * @author kxmall
  * @date 2024-08-07
  */
+@Repository
 public interface KxStoreActivityMapper extends BaseMapperPlus<KxStoreActivityMapper, KxStoreActivity, KxStoreActivityVo> {
 
 }

+ 3 - 1
kxmall-system/src/main/java/com/kxmall/activity/mapper/KxStoreActivityProductMapper.java

@@ -7,6 +7,7 @@ import com.kxmall.activity.domain.KxStoreActivityProduct;
 import com.kxmall.activity.domain.vo.KxStoreActivityProductVo;
 import com.kxmall.common.core.mapper.BaseMapperPlus;
 import org.apache.ibatis.annotations.Param;
+import org.springframework.stereotype.Repository;
 
 import java.util.List;
 
@@ -16,6 +17,7 @@ import java.util.List;
  * @author kxmall
  * @date 2024-08-07
  */
+@Repository
 public interface KxStoreActivityProductMapper extends BaseMapperPlus<KxStoreActivityProductMapper, KxStoreActivityProduct, KxStoreActivityProductVo> {
 
     Page<KxStoreActivityProductVo> selectVoPageBySQL(@Param("page") Page<KxStoreActivityProduct> page, @Param(Constants.WRAPPER) Wrapper<KxStoreActivityProduct> lqw);
@@ -23,4 +25,4 @@ public interface KxStoreActivityProductMapper extends BaseMapperPlus<KxStoreActi
     List<KxStoreActivityProductVo> getActivityProductByStorage(@Param("storageId") Long storageId,@Param("activityId")  String activityId,@Param("offset")  Integer offset,@Param("size") Integer size);
 
     Long getActivityProductByStorageCount(@Param("storageId") Long storageId,@Param("activityId")  String activityId);
-}
+}

+ 3 - 1
kxmall-system/src/main/java/com/kxmall/address/mapper/KxAddressMapper.java

@@ -3,6 +3,7 @@ package com.kxmall.address.mapper;
 import com.kxmall.address.domain.KxAddress;
 import com.kxmall.address.domain.vo.KxAddressVo;
 import com.kxmall.common.core.mapper.BaseMapperPlus;
+import org.springframework.stereotype.Repository;
 
 /**
  * 用户下单地址Mapper接口
@@ -10,6 +11,7 @@ import com.kxmall.common.core.mapper.BaseMapperPlus;
  * @author kxmall
  * @date 2023-04-06
  */
+@Repository
 public interface KxAddressMapper extends BaseMapperPlus<KxAddressMapper, KxAddress, KxAddressVo> {
 
-}
+}

+ 3 - 1
kxmall-system/src/main/java/com/kxmall/carousel/mapper/KxCarouselMapper.java

@@ -3,6 +3,7 @@ package com.kxmall.carousel.mapper;
 import com.kxmall.carousel.domain.KxCarousel;
 import com.kxmall.carousel.domain.vo.KxCarouselVo;
 import com.kxmall.common.core.mapper.BaseMapperPlus;
+import org.springframework.stereotype.Repository;
 
 /**
  * 商铺广告Mapper接口
@@ -10,6 +11,7 @@ import com.kxmall.common.core.mapper.BaseMapperPlus;
  * @author kxmall
  * @date 2023-08-27
  */
+@Repository
 public interface KxCarouselMapper extends BaseMapperPlus<KxCarouselMapper, KxCarousel, KxCarouselVo> {
 
-}
+}

+ 3 - 1
kxmall-system/src/main/java/com/kxmall/coupon/mapper/KxStoreCouponIssueMapper.java

@@ -3,6 +3,7 @@ package com.kxmall.coupon.mapper;
 import com.kxmall.coupon.domain.vo.KxStoreCouponIssueVo;
 import com.kxmall.coupon.domain.KxStoreCouponIssue;
 import com.kxmall.common.core.mapper.BaseMapperPlus;
+import org.springframework.stereotype.Repository;
 
 /**
  * 优惠券前台领取Mapper接口
@@ -10,8 +11,9 @@ import com.kxmall.common.core.mapper.BaseMapperPlus;
  * @author kxmall
  * @date 2023-02-17
  */
+@Repository
 public interface KxStoreCouponIssueMapper extends BaseMapperPlus<KxStoreCouponIssueMapper, KxStoreCouponIssue, KxStoreCouponIssueVo> {
 
 
     void decCoupon(Long couponId);
-}
+}

+ 3 - 1
kxmall-system/src/main/java/com/kxmall/coupon/mapper/KxStoreCouponIssueUserMapper.java

@@ -3,6 +3,7 @@ package com.kxmall.coupon.mapper;
 import com.kxmall.coupon.domain.vo.KxStoreCouponIssueUserVo;
 import com.kxmall.coupon.domain.KxStoreCouponIssueUser;
 import com.kxmall.common.core.mapper.BaseMapperPlus;
+import org.springframework.stereotype.Repository;
 
 /**
  * 优惠券前台用户领取记录Mapper接口
@@ -10,6 +11,7 @@ import com.kxmall.common.core.mapper.BaseMapperPlus;
  * @author kxmall
  * @date 2023-02-17
  */
+@Repository
 public interface KxStoreCouponIssueUserMapper extends BaseMapperPlus<KxStoreCouponIssueUserMapper, KxStoreCouponIssueUser, KxStoreCouponIssueUserVo> {
 
-}
+}

+ 3 - 1
kxmall-system/src/main/java/com/kxmall/coupon/mapper/KxStoreCouponMapper.java

@@ -3,6 +3,7 @@ package com.kxmall.coupon.mapper;
 import com.kxmall.coupon.domain.vo.KxStoreCouponVo;
 import com.kxmall.coupon.domain.KxStoreCoupon;
 import com.kxmall.common.core.mapper.BaseMapperPlus;
+import org.springframework.stereotype.Repository;
 
 /**
  * 优惠券Mapper接口
@@ -10,6 +11,7 @@ import com.kxmall.common.core.mapper.BaseMapperPlus;
  * @author kxmall
  * @date 2023-02-17
  */
+@Repository
 public interface KxStoreCouponMapper extends BaseMapperPlus<KxStoreCouponMapper, KxStoreCoupon, KxStoreCouponVo> {
 
-}
+}

+ 3 - 1
kxmall-system/src/main/java/com/kxmall/coupon/mapper/KxStoreCouponUserMapper.java

@@ -6,6 +6,7 @@ import com.kxmall.coupon.domain.vo.KxStoreCouponIssueVo;
 import com.kxmall.coupon.domain.vo.KxStoreCouponUserVo;
 import com.kxmall.model.KVModel;
 import org.apache.ibatis.annotations.Param;
+import org.springframework.stereotype.Repository;
 
 import java.math.BigInteger;
 import java.util.List;
@@ -16,6 +17,7 @@ import java.util.List;
  * @author kxmall
  * @date 2023-02-17
  */
+@Repository
 public interface KxStoreCouponUserMapper extends BaseMapperPlus<KxStoreCouponUserMapper, KxStoreCouponUser, KxStoreCouponUserVo> {
 
     List<KxStoreCouponUserVo> getUserCoupons(@Param("userId") Long userId, @Param("status") Integer status);
@@ -23,4 +25,4 @@ public interface KxStoreCouponUserMapper extends BaseMapperPlus<KxStoreCouponUse
     List<KxStoreCouponIssueVo> getActiveCoupons();
 
     List<KVModel<BigInteger, Long>> getUserCouponsCount(@Param("userId") Long userId, @Param("couponIds") List<Long> activeCouponIds);
-}
+}

+ 3 - 1
kxmall-system/src/main/java/com/kxmall/decorate/mapper/KxPageTemplateMapper.java

@@ -3,6 +3,7 @@ package com.kxmall.decorate.mapper;
 import com.kxmall.decorate.domain.KxPageTemplate;
 import com.kxmall.decorate.domain.vo.KxPageTemplateVo;
 import com.kxmall.common.core.mapper.BaseMapperPlus;
+import org.springframework.stereotype.Repository;
 
 /**
  * 首页页面模板Mapper接口
@@ -10,6 +11,7 @@ import com.kxmall.common.core.mapper.BaseMapperPlus;
  * @author kxmall
  * @date 2023-11-05
  */
+@Repository
 public interface KxPageTemplateMapper extends BaseMapperPlus<KxPageTemplateMapper, KxPageTemplate, KxPageTemplateVo> {
 
-}
+}

+ 3 - 1
kxmall-system/src/main/java/com/kxmall/dish/mapper/CompositionDishItemMapper.java

@@ -3,10 +3,12 @@ package com.kxmall.dish.mapper;
 import com.kxmall.common.core.mapper.BaseMapperPlus;
 import com.kxmall.dish.domain.CompositionDishItemDO;
 import com.kxmall.dish.domain.vo.CompositionDishItemVo;
+import org.springframework.stereotype.Repository;
 
 /**
  * Generate Code By kxmall
  */
+@Repository
 public interface CompositionDishItemMapper extends BaseMapperPlus<CompositionDishItemMapper, CompositionDishItemDO, CompositionDishItemVo> {
 
-}
+}

+ 3 - 2
kxmall-system/src/main/java/com/kxmall/dish/mapper/CompositionDishMapper.java

@@ -1,13 +1,14 @@
 package com.kxmall.dish.mapper;
 
-
 import com.kxmall.common.core.mapper.BaseMapperPlus;
 import com.kxmall.dish.domain.CompositionDishDO;
 import com.kxmall.dish.domain.bo.CompositionDishDTO;
+import org.springframework.stereotype.Repository;
 
 /**
  * Generate Code By kxmall
  */
+@Repository
 public interface CompositionDishMapper extends BaseMapperPlus<CompositionDishMapper, CompositionDishDO, CompositionDishDTO> {
 
-}
+}

+ 3 - 1
kxmall-system/src/main/java/com/kxmall/group/mapper/KxGroupShopMapper.java

@@ -4,6 +4,7 @@ import com.kxmall.group.domain.KxGroupShop;
 import com.kxmall.group.domain.vo.KxGroupShopVo;
 import com.kxmall.common.core.mapper.BaseMapperPlus;
 import org.apache.ibatis.annotations.Param;
+import org.springframework.stereotype.Repository;
 
 import java.util.List;
 
@@ -13,6 +14,7 @@ import java.util.List;
  * @author kxmall
  * @date 2023-10-07
  */
+@Repository
 public interface KxGroupShopMapper extends BaseMapperPlus<KxGroupShopMapper, KxGroupShop, KxGroupShopVo> {
 
 
@@ -21,4 +23,4 @@ public interface KxGroupShopMapper extends BaseMapperPlus<KxGroupShopMapper, KxG
     KxGroupShopVo detail(@Param("groupShopId") Long groupShopId, @Param("storageId") Long storageId);
 
     Integer incCurrentNum(@Param("id") Long id,@Param("num") Integer num);
-}
+}

+ 3 - 1
kxmall-system/src/main/java/com/kxmall/group/mapper/KxGroupShopProductMapper.java

@@ -3,6 +3,7 @@ package com.kxmall.group.mapper;
 import com.kxmall.group.domain.KxGroupShopProduct;
 import com.kxmall.group.domain.vo.KxGroupShopProductVo;
 import com.kxmall.common.core.mapper.BaseMapperPlus;
+import org.springframework.stereotype.Repository;
 
 /**
  * 团购商品Mapper接口
@@ -10,6 +11,7 @@ import com.kxmall.common.core.mapper.BaseMapperPlus;
  * @author kxmall
  * @date 2023-10-07
  */
+@Repository
 public interface KxGroupShopProductMapper extends BaseMapperPlus<KxGroupShopProductMapper, KxGroupShopProduct, KxGroupShopProductVo> {
 
-}
+}

+ 3 - 1
kxmall-system/src/main/java/com/kxmall/newtimes/mapper/KxNewTimesMapper.java

@@ -3,6 +3,7 @@ package com.kxmall.newtimes.mapper;
 import com.kxmall.newtimes.domain.KxNewTimes;
 import com.kxmall.newtimes.domain.vo.KxNewTimesVo;
 import com.kxmall.common.core.mapper.BaseMapperPlus;
+import org.springframework.stereotype.Repository;
 
 /**
  * 新鲜时报Mapper接口
@@ -10,6 +11,7 @@ import com.kxmall.common.core.mapper.BaseMapperPlus;
  * @author kxmall
  * @date 2023-10-05
  */
+@Repository
 public interface KxNewTimesMapper extends BaseMapperPlus<KxNewTimesMapper, KxNewTimes, KxNewTimesVo> {
 
-}
+}

+ 3 - 0
kxmall-system/src/main/java/com/kxmall/order/domain/bo/OrderPriceBo.java

@@ -23,6 +23,9 @@ public class OrderPriceBo implements Serializable {
     /*** 运费*/
     private BigDecimal freightPrice;
 
+    /*** 加急费用*/
+    private BigDecimal urgentFee;
+
     /*** 优惠券*/
     private BigDecimal couponPrice;
 

+ 5 - 0
kxmall-system/src/main/java/com/kxmall/order/domain/bo/OrderRequestBo.java

@@ -96,4 +96,9 @@ public class OrderRequestBo {
      */
     private List<String> photos;
 
+    /**
+     * 加急费用
+     */
+    private BigDecimal urgentFee;
+
 }

+ 3 - 2
kxmall-system/src/main/java/com/kxmall/order/mapper/KxDeliveryConfigMapper.java

@@ -1,16 +1,17 @@
 package com.kxmall.order.mapper;
 
-
 import com.kxmall.common.core.mapper.BaseMapperPlus;
 import com.kxmall.order.domain.KxDeliveryConfig;
 import com.kxmall.order.domain.vo.KxDeliveryConfigVo;
 import org.apache.ibatis.annotations.Param;
+import org.springframework.stereotype.Repository;
 
 import java.util.List;
 
 /**
  * 配送配置Mapper接口
  */
+@Repository
 public interface KxDeliveryConfigMapper extends BaseMapperPlus<KxDeliveryConfigMapper, KxDeliveryConfig, KxDeliveryConfigVo> {
 
     List<KxDeliveryConfigVo> selectByMerchantId(@Param("merchantId") Long merchantId);
@@ -18,4 +19,4 @@ public interface KxDeliveryConfigMapper extends BaseMapperPlus<KxDeliveryConfigM
     KxDeliveryConfigVo selectByMerchantAndType(@Param("merchantId") Long merchantId, @Param("deliveryType") String deliveryType);
 
     int setOtherNotDefault(@Param("merchantId") Long merchantId, @Param("id") Long id);
-}
+}

+ 3 - 2
kxmall-system/src/main/java/com/kxmall/order/mapper/KxOrderDeliveryMapper.java

@@ -1,12 +1,13 @@
 package com.kxmall.order.mapper;
 
-
 import com.kxmall.common.core.mapper.BaseMapperPlus;
 import com.kxmall.order.domain.KxOrderDelivery;
+import org.springframework.stereotype.Repository;
 
 /**
  * 配送配置Mapper接口
  */
+@Repository
 public interface KxOrderDeliveryMapper extends BaseMapperPlus<KxOrderDeliveryMapper, KxOrderDelivery, KxOrderDelivery> {
 
-}
+}

+ 2 - 0
kxmall-system/src/main/java/com/kxmall/order/mapper/KxOrderScreenshotMapper.java

@@ -3,6 +3,7 @@ package com.kxmall.order.mapper;
 import com.kxmall.common.core.mapper.BaseMapperPlus;
 import com.kxmall.order.domain.KxOrderScreenshot;
 import com.kxmall.order.domain.vo.KxOrderScreenshotVo;
+import org.springframework.stereotype.Repository;
 
 /**
  * 订单截图Mapper接口
@@ -10,6 +11,7 @@ import com.kxmall.order.domain.vo.KxOrderScreenshotVo;
  * @author kxmall
  * @date 2024-12-01
  */
+@Repository
 public interface KxOrderScreenshotMapper extends BaseMapperPlus<KxOrderScreenshotMapper, KxOrderScreenshot, KxOrderScreenshotVo> {
 
 }

+ 3 - 1
kxmall-system/src/main/java/com/kxmall/order/mapper/KxOrderSnapshotMapper.java

@@ -2,6 +2,7 @@ package com.kxmall.order.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.kxmall.order.domain.KxOrderSnapshot;
+import org.springframework.stereotype.Repository;
 
 /**
  * <p>
@@ -11,6 +12,7 @@ import com.kxmall.order.domain.KxOrderSnapshot;
  * @author tea
  * @since 2025-09-04
  */
+@Repository
 public interface KxOrderSnapshotMapper extends BaseMapper<KxOrderSnapshot> {
 
-}
+}

+ 3 - 1
kxmall-system/src/main/java/com/kxmall/order/mapper/KxStoreAfterSalesItemMapper.java

@@ -3,6 +3,7 @@ package com.kxmall.order.mapper;
 import com.kxmall.common.core.mapper.BaseMapperPlus;
 import com.kxmall.order.domain.KxStoreAfterSalesItem;
 import com.kxmall.order.domain.vo.KxStoreAfterSalesItemVo;
+import org.springframework.stereotype.Repository;
 
 /**
  * 售后子Mapper接口
@@ -10,6 +11,7 @@ import com.kxmall.order.domain.vo.KxStoreAfterSalesItemVo;
  * @author kxmall
  * @date 2024-11-23
  */
+@Repository
 public interface KxStoreAfterSalesItemMapper extends BaseMapperPlus<KxStoreAfterSalesItemMapper, KxStoreAfterSalesItem, KxStoreAfterSalesItemVo> {
 
-}
+}

+ 3 - 1
kxmall-system/src/main/java/com/kxmall/order/mapper/KxStoreAfterSalesMapper.java

@@ -3,6 +3,7 @@ package com.kxmall.order.mapper;
 import com.kxmall.common.core.mapper.BaseMapperPlus;
 import com.kxmall.order.domain.KxStoreAfterSales;
 import com.kxmall.order.domain.vo.KxStoreAfterSalesVo;
+import org.springframework.stereotype.Repository;
 
 /**
  * 售后订单Mapper接口
@@ -10,6 +11,7 @@ import com.kxmall.order.domain.vo.KxStoreAfterSalesVo;
  * @author kxmall
  * @date 2024-11-23
  */
+@Repository
 public interface KxStoreAfterSalesMapper extends BaseMapperPlus<KxStoreAfterSalesMapper, KxStoreAfterSales, KxStoreAfterSalesVo> {
 
-}
+}

+ 3 - 1
kxmall-system/src/main/java/com/kxmall/order/mapper/KxStoreAfterSalesStatusMapper.java

@@ -3,6 +3,7 @@ package com.kxmall.order.mapper;
 import com.kxmall.common.core.mapper.BaseMapperPlus;
 import com.kxmall.order.domain.KxStoreAfterSalesStatus;
 import com.kxmall.order.domain.vo.KxStoreAfterSalesStatusVo;
+import org.springframework.stereotype.Repository;
 
 /**
  * 售后订单操作详情Mapper接口
@@ -10,6 +11,7 @@ import com.kxmall.order.domain.vo.KxStoreAfterSalesStatusVo;
  * @author kxmall
  * @date 2024-11-23
  */
+@Repository
 public interface KxStoreAfterSalesStatusMapper extends BaseMapperPlus<KxStoreAfterSalesStatusMapper, KxStoreAfterSalesStatus, KxStoreAfterSalesStatusVo> {
 
-}
+}

+ 3 - 1
kxmall-system/src/main/java/com/kxmall/order/mapper/KxStoreAppraiseMapper.java

@@ -4,6 +4,7 @@ import com.kxmall.order.domain.KxStoreAppraise;
 import com.kxmall.order.domain.vo.KxStoreAppraiseVo;
 import com.kxmall.common.core.mapper.BaseMapperPlus;
 import org.apache.ibatis.annotations.Param;
+import org.springframework.stereotype.Repository;
 
 import java.util.List;
 
@@ -13,6 +14,7 @@ import java.util.List;
  * @author kxmall
  * @date 2023-08-27
  */
+@Repository
 public interface KxStoreAppraiseMapper extends BaseMapperPlus<KxStoreAppraiseMapper, KxStoreAppraise, KxStoreAppraiseVo> {
 
     /**
@@ -24,4 +26,4 @@ public interface KxStoreAppraiseMapper extends BaseMapperPlus<KxStoreAppraiseMap
      * @return
      */
     List<KxStoreAppraiseVo> selectProductAppraiseByPage(@Param("productId") Long productId, @Param("offset") Integer offset, @Param("size") Integer pageSize, @Param("state") Integer state);
-}
+}

+ 3 - 1
kxmall-system/src/main/java/com/kxmall/order/mapper/KxStoreCartMapper.java

@@ -4,6 +4,7 @@ import com.kxmall.order.domain.KxStoreCart;
 import com.kxmall.order.domain.vo.KxStoreCartVo;
 import com.kxmall.common.core.mapper.BaseMapperPlus;
 import org.apache.ibatis.annotations.Param;
+import org.springframework.stereotype.Repository;
 
 import java.util.List;
 
@@ -13,6 +14,7 @@ import java.util.List;
  * @author kxmall
  * @date 2023-02-15
  */
+@Repository
 public interface KxStoreCartMapper extends BaseMapperPlus<KxStoreCartMapper, KxStoreCart, KxStoreCartVo> {
 
     /**
@@ -24,4 +26,4 @@ public interface KxStoreCartMapper extends BaseMapperPlus<KxStoreCartMapper, KxS
      * 获取购物车商品列表
      */
     List<KxStoreCartVo> getCartList(@Param("userId") Long userId, @Param("storageId") Long storageId);
-}
+}

+ 4 - 1
kxmall-system/src/main/java/com/kxmall/order/mapper/KxStoreOrderMapper.java

@@ -12,6 +12,7 @@ import com.kxmall.order.domain.vo.KxOrderStatisticalVo;
 import com.kxmall.order.domain.vo.KxStoreOrderVo;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
+import org.springframework.stereotype.Repository;
 
 import java.time.LocalDate;
 import java.util.Date;
@@ -24,6 +25,7 @@ import java.util.Set;
  * @author kxmall
  * @date 2023-02-15
  */
+@Repository
 public interface KxStoreOrderMapper extends BaseMapperPlus<KxStoreOrderMapper, KxStoreOrder, KxStoreOrderVo> {
 
     List<KxStoreOrderVo> selectOrderPages(@Param("status") List<Integer> status, @Param("offset") Integer offset, @Param("limit") Integer limit, @Param("userId") Long userId);
@@ -36,6 +38,7 @@ public interface KxStoreOrderMapper extends BaseMapperPlus<KxStoreOrderMapper, K
 
 
 
+
     /**
      * 获取一级类目销量排名
      *
@@ -113,4 +116,4 @@ public interface KxStoreOrderMapper extends BaseMapperPlus<KxStoreOrderMapper, K
     @Select("select IFNULL(sum(pay_price),0) from kx_store_order " +
             "where is_del=0 and refund_status=0 and uid=#{uid}")
     double sumPrice(@Param("uid") Long uid);
-}
+}

+ 4 - 1
kxmall-system/src/main/java/com/kxmall/order/mapper/KxStoreOrderProductMapper.java

@@ -3,6 +3,9 @@ package com.kxmall.order.mapper;
 import com.kxmall.common.core.mapper.BaseMapperPlus;
 import com.kxmall.order.domain.KxStoreOrderProduct;
 import com.kxmall.order.domain.vo.KxStoreOrderProductVo;
+import org.springframework.stereotype.Repository;
 
+@Repository
 public interface KxStoreOrderProductMapper extends BaseMapperPlus<KxStoreOrderProductMapper, KxStoreOrderProduct, KxStoreOrderProductVo> {
-}
+
+}

+ 3 - 1
kxmall-system/src/main/java/com/kxmall/product/mapper/KxStoreCategoryMapper.java

@@ -3,6 +3,7 @@ package com.kxmall.product.mapper;
 import com.kxmall.product.domain.KxStoreCategory;
 import com.kxmall.product.domain.vo.KxStoreCategoryVo;
 import com.kxmall.common.core.mapper.BaseMapperPlus;
+import org.springframework.stereotype.Repository;
 
 /**
  * 商品分类Mapper接口
@@ -10,6 +11,7 @@ import com.kxmall.common.core.mapper.BaseMapperPlus;
  * @author kxmall
  * @date 2023-02-07
  */
+@Repository
 public interface KxStoreCategoryMapper extends BaseMapperPlus<KxStoreCategoryMapper, KxStoreCategory, KxStoreCategoryVo> {
 
-}
+}

+ 3 - 1
kxmall-system/src/main/java/com/kxmall/product/mapper/KxStoreProductAttrMapper.java

@@ -3,6 +3,7 @@ package com.kxmall.product.mapper;
 import com.kxmall.product.domain.vo.KxStoreProductAttrVo;
 import com.kxmall.product.domain.KxStoreProductAttr;
 import com.kxmall.common.core.mapper.BaseMapperPlus;
+import org.springframework.stereotype.Repository;
 
 /**
  * 商品属性Mapper接口
@@ -10,6 +11,7 @@ import com.kxmall.common.core.mapper.BaseMapperPlus;
  * @author kxmall
  * @date 2023-02-13
  */
+@Repository
 public interface KxStoreProductAttrMapper extends BaseMapperPlus<KxStoreProductAttrMapper, KxStoreProductAttr, KxStoreProductAttrVo> {
 
-}
+}

+ 3 - 1
kxmall-system/src/main/java/com/kxmall/product/mapper/KxStoreProductAttrResultMapper.java

@@ -3,6 +3,7 @@ package com.kxmall.product.mapper;
 import com.kxmall.product.domain.KxStoreProductAttrResult;
 import com.kxmall.product.domain.vo.KxStoreProductAttrResultVo;
 import com.kxmall.common.core.mapper.BaseMapperPlus;
+import org.springframework.stereotype.Repository;
 
 /**
  * 商品属性详情Mapper接口
@@ -10,6 +11,7 @@ import com.kxmall.common.core.mapper.BaseMapperPlus;
  * @author kxmall
  * @date 2023-02-13
  */
+@Repository
 public interface KxStoreProductAttrResultMapper extends BaseMapperPlus<KxStoreProductAttrResultMapper, KxStoreProductAttrResult, KxStoreProductAttrResultVo> {
 
-}
+}

+ 3 - 1
kxmall-system/src/main/java/com/kxmall/product/mapper/KxStoreProductAttrValueMapper.java

@@ -3,6 +3,7 @@ package com.kxmall.product.mapper;
 import com.kxmall.product.domain.KxStoreProductAttrValue;
 import com.kxmall.product.domain.vo.KxStoreProductAttrValueVo;
 import com.kxmall.common.core.mapper.BaseMapperPlus;
+import org.springframework.stereotype.Repository;
 
 /**
  * 商品属性值Mapper接口
@@ -10,6 +11,7 @@ import com.kxmall.common.core.mapper.BaseMapperPlus;
  * @author kxmall
  * @date 2023-02-13
  */
+@Repository
 public interface KxStoreProductAttrValueMapper extends BaseMapperPlus<KxStoreProductAttrValueMapper, KxStoreProductAttrValue, KxStoreProductAttrValueVo> {
 
-}
+}

+ 3 - 1
kxmall-system/src/main/java/com/kxmall/product/mapper/KxStoreProductMapper.java

@@ -4,6 +4,7 @@ import com.kxmall.common.core.mapper.BaseMapperPlus;
 import com.kxmall.product.domain.KxStoreProduct;
 import com.kxmall.product.domain.vo.KxStoreProductVo;
 import org.apache.ibatis.annotations.Param;
+import org.springframework.stereotype.Repository;
 
 import java.util.LinkedList;
 import java.util.List;
@@ -14,6 +15,7 @@ import java.util.List;
  * @author kxmall
  * @date 2023-02-13
  */
+@Repository
 public interface KxStoreProductMapper extends BaseMapperPlus<KxStoreProductMapper, KxStoreProduct, KxStoreProductVo> {
 
     List<KxStoreProductVo> selectPageByStorage(@Param("offset") Integer offset,
@@ -98,4 +100,4 @@ public interface KxStoreProductMapper extends BaseMapperPlus<KxStoreProductMappe
     List<KxStoreProductVo> getRecommend(@Param("storageId") Long storageId, @Param("offset") Integer offset, @Param("size") Integer size);
 
     Long getRecommendCount(@Param("storageId") Long storageId);
-}
+}

+ 3 - 1
kxmall-system/src/main/java/com/kxmall/product/mapper/KxStoreProductRuleMapper.java

@@ -3,6 +3,7 @@ package com.kxmall.product.mapper;
 import com.kxmall.product.domain.KxStoreProductRule;
 import com.kxmall.product.domain.vo.KxStoreProductRuleVo;
 import com.kxmall.common.core.mapper.BaseMapperPlus;
+import org.springframework.stereotype.Repository;
 
 /**
  * 商品规格Mapper接口
@@ -10,6 +11,7 @@ import com.kxmall.common.core.mapper.BaseMapperPlus;
  * @author kxmall
  * @date 2023-02-08
  */
+@Repository
 public interface KxStoreProductRuleMapper extends BaseMapperPlus<KxStoreProductRuleMapper, KxStoreProductRule, KxStoreProductRuleVo> {
 
-}
+}

+ 3 - 1
kxmall-system/src/main/java/com/kxmall/recommend/mapper/KxRecommendMapper.java

@@ -7,6 +7,7 @@ import com.kxmall.common.core.mapper.BaseMapperPlus;
 import com.kxmall.recommend.domain.KxRecommend;
 import com.kxmall.recommend.domain.vo.KxRecommendVo;
 import org.apache.ibatis.annotations.Param;
+import org.springframework.stereotype.Repository;
 
 import java.util.List;
 
@@ -16,6 +17,7 @@ import java.util.List;
  * @author kxmall
  * @date 2023-08-27
  */
+@Repository
 public interface KxRecommendMapper extends BaseMapperPlus<KxRecommendMapper, KxRecommend, KxRecommendVo> {
 
     /**
@@ -32,4 +34,4 @@ public interface KxRecommendMapper extends BaseMapperPlus<KxRecommendMapper, KxR
     Long getRecommendByStorageCount(@Param("storageId") Long storageId, @Param("recommendType") Integer recommendType);
 
     Page<KxRecommendVo> selectVoPageBySQL(@Param("page") Page<KxRecommend> page, @Param(Constants.WRAPPER) Wrapper<KxRecommend> lqw);
-}
+}

+ 3 - 1
kxmall-system/src/main/java/com/kxmall/rider/mapper/KxRiderAuthAttachmentMapper.java

@@ -2,6 +2,7 @@ package com.kxmall.rider.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.kxmall.rider.domain.KxRiderAuthAttachment;
+import org.springframework.stereotype.Repository;
 
 /**
  * <p>
@@ -11,6 +12,7 @@ import com.kxmall.rider.domain.KxRiderAuthAttachment;
  * @author tea
  * @since 2025-09-03
  */
+@Repository
 public interface KxRiderAuthAttachmentMapper extends BaseMapper<KxRiderAuthAttachment> {
 
-}
+}

+ 3 - 1
kxmall-system/src/main/java/com/kxmall/rider/mapper/KxRiderCycleMapper.java

@@ -3,6 +3,7 @@ package com.kxmall.rider.mapper;
 import com.kxmall.rider.domain.KxRiderCycle;
 import com.kxmall.rider.domain.vo.KxRiderCycleVo;
 import com.kxmall.common.core.mapper.BaseMapperPlus;
+import org.springframework.stereotype.Repository;
 
 /**
  * 配送员周期Mapper接口
@@ -10,6 +11,7 @@ import com.kxmall.common.core.mapper.BaseMapperPlus;
  * @author kxmall
  * @date 2023-09-21
  */
+@Repository
 public interface KxRiderCycleMapper extends BaseMapperPlus<KxRiderCycleMapper, KxRiderCycle, KxRiderCycleVo> {
 
-}
+}

+ 3 - 1
kxmall-system/src/main/java/com/kxmall/rider/mapper/KxRiderItemMapper.java

@@ -3,6 +3,7 @@ package com.kxmall.rider.mapper;
 import com.kxmall.rider.domain.KxRiderItem;
 import com.kxmall.rider.domain.vo.KxRiderItemVo;
 import com.kxmall.common.core.mapper.BaseMapperPlus;
+import org.springframework.stereotype.Repository;
 
 /**
  * 配送商品信息Mapper接口
@@ -10,6 +11,7 @@ import com.kxmall.common.core.mapper.BaseMapperPlus;
  * @author kxmall
  * @date 2023-09-21
  */
+@Repository
 public interface KxRiderItemMapper extends BaseMapperPlus<KxRiderItemMapper, KxRiderItem, KxRiderItemVo> {
 
-}
+}

+ 3 - 1
kxmall-system/src/main/java/com/kxmall/rider/mapper/KxRiderMapper.java

@@ -4,6 +4,7 @@ import com.kxmall.common.core.mapper.BaseMapperPlus;
 import com.kxmall.rider.domain.KxRider;
 import com.kxmall.rider.domain.vo.KxRiderVo;
 import org.apache.ibatis.annotations.Param;
+import org.springframework.stereotype.Repository;
 
 import java.util.List;
 
@@ -13,6 +14,7 @@ import java.util.List;
  * @author kxmall
  * @date 2023-09-21
  */
+@Repository
 public interface KxRiderMapper extends BaseMapperPlus<KxRiderMapper, KxRider, KxRiderVo> {
 
     /**
@@ -46,4 +48,4 @@ public interface KxRiderMapper extends BaseMapperPlus<KxRiderMapper, KxRider, Kx
     Integer batchUpdateWeekState(@Param("ids") List<Long> ids, @Param("workState") int workState);
 
 
-}
+}

+ 3 - 1
kxmall-system/src/main/java/com/kxmall/rider/mapper/KxRiderOrderMapper.java

@@ -8,6 +8,7 @@ import com.kxmall.rider.domain.vo.KxRiderOrderVo;
 import com.kxmall.common.core.mapper.BaseMapperPlus;
 import com.kxmall.rider.domain.vo.RiderStatisticalDTO;
 import org.apache.ibatis.annotations.Param;
+import org.springframework.stereotype.Repository;
 
 import java.math.BigDecimal;
 import java.util.Date;
@@ -19,6 +20,7 @@ import java.util.List;
  * @author kxmall
  * @date 2023-09-21
  */
+@Repository
 public interface KxRiderOrderMapper extends BaseMapperPlus<KxRiderOrderMapper, KxRiderOrder, KxRiderOrderVo> {
 
     int updateRiderOrderStatus(@Param("orderNo") String orderNo, @Param("status") Integer status, @Param("updateAbnormalFlag") Boolean updateAbnormalFlag);
@@ -34,4 +36,4 @@ public interface KxRiderOrderMapper extends BaseMapperPlus<KxRiderOrderMapper, K
     BigDecimal selectSumIncome(@Param("riderId") Long riderId);
 
     Page<KxRiderOrderVo> selectVoPageList(@Param("page") Page<Object> build, @Param(Constants.WRAPPER) Wrapper<KxRiderOrder> kxRiderOrderWrapper);
-}
+}

+ 3 - 2
kxmall-system/src/main/java/com/kxmall/rider/mapper/KxRiderWalletTransactionMapper.java

@@ -1,14 +1,15 @@
 package com.kxmall.rider.mapper;
 
-
 import com.kxmall.common.core.mapper.BaseMapperPlus;
 import com.kxmall.rider.domain.KxRiderWalletTransaction;
 import com.kxmall.rider.domain.vo.RiderWalletTransactionVo;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
+import org.springframework.stereotype.Repository;
 
 import java.math.BigDecimal;
 
+@Repository
 public interface KxRiderWalletTransactionMapper extends BaseMapperPlus<KxRiderWalletTransactionMapper, KxRiderWalletTransaction, RiderWalletTransactionVo> {
 
     /**
@@ -19,4 +20,4 @@ public interface KxRiderWalletTransactionMapper extends BaseMapperPlus<KxRiderWa
      */
     @Select("select sum(amount) from kx_rider_withdrawal where `status` = 0 and rider_id = #{riderId}")
     BigDecimal sumExpenseByRiderId(@Param("riderId") Long riderId);
-}
+}

+ 3 - 1
kxmall-system/src/main/java/com/kxmall/rider/mapper/KxRiderWithdrawalMapper.java

@@ -2,6 +2,8 @@ package com.kxmall.rider.mapper;
 
 import com.kxmall.common.core.mapper.BaseMapperPlus;
 import com.kxmall.rider.domain.KxRiderWithdrawal;
+import org.springframework.stereotype.Repository;
 
+@Repository
 public interface KxRiderWithdrawalMapper extends BaseMapperPlus<KxRiderWithdrawalMapper, KxRiderWithdrawal, KxRiderWithdrawal> {
-}
+}

+ 3 - 1
kxmall-system/src/main/java/com/kxmall/seckill/mapper/KxStoreSeckillMapper.java

@@ -3,6 +3,7 @@ package com.kxmall.seckill.mapper;
 import com.kxmall.common.core.mapper.BaseMapperPlus;
 import com.kxmall.seckill.domain.KxStoreSeckill;
 import com.kxmall.seckill.domain.vo.KxStoreSeckillVo;
+import org.springframework.stereotype.Repository;
 
 /**
  * 商品秒杀Mapper接口
@@ -10,6 +11,7 @@ import com.kxmall.seckill.domain.vo.KxStoreSeckillVo;
  * @author kxmall
  * @date 2024-05-15
  */
+@Repository
 public interface KxStoreSeckillMapper extends BaseMapperPlus<KxStoreSeckillMapper, KxStoreSeckill, KxStoreSeckillVo> {
 
-}
+}

+ 3 - 1
kxmall-system/src/main/java/com/kxmall/storage/mapper/KxGoodsInStockMapper.java

@@ -4,6 +4,7 @@ import com.kxmall.storage.domain.KxGoodsInStock;
 import com.kxmall.storage.domain.bo.KxGoodsInStockBo;
 import com.kxmall.storage.domain.vo.KxGoodsInStockVo;
 import com.kxmall.common.core.mapper.BaseMapperPlus;
+import org.springframework.stereotype.Repository;
 
 /**
  * 商品入库Mapper接口
@@ -11,7 +12,8 @@ import com.kxmall.common.core.mapper.BaseMapperPlus;
  * @author kxmall
  * @date 2023-08-27
  */
+@Repository
 public interface KxGoodsInStockMapper extends BaseMapperPlus<KxGoodsInStockMapper, KxGoodsInStock, KxGoodsInStockVo> {
 
     KxGoodsInStock selectByMax();
-}
+}

+ 3 - 1
kxmall-system/src/main/java/com/kxmall/storage/mapper/KxGoodsOutStockMapper.java

@@ -3,6 +3,7 @@ package com.kxmall.storage.mapper;
 import com.kxmall.storage.domain.KxGoodsOutStock;
 import com.kxmall.storage.domain.vo.KxGoodsOutStockVo;
 import com.kxmall.common.core.mapper.BaseMapperPlus;
+import org.springframework.stereotype.Repository;
 
 /**
  * 商品出库Mapper接口
@@ -10,6 +11,7 @@ import com.kxmall.common.core.mapper.BaseMapperPlus;
  * @author kxmall
  * @date 2023-08-27
  */
+@Repository
 public interface KxGoodsOutStockMapper extends BaseMapperPlus<KxGoodsOutStockMapper, KxGoodsOutStock, KxGoodsOutStockVo> {
 
 
@@ -19,4 +21,4 @@ public interface KxGoodsOutStockMapper extends BaseMapperPlus<KxGoodsOutStockMap
      * @return
      */
     KxGoodsOutStock selectByMax();
-}
+}

+ 3 - 1
kxmall-system/src/main/java/com/kxmall/storage/mapper/KxInStockProductMapper.java

@@ -3,6 +3,7 @@ package com.kxmall.storage.mapper;
 import com.kxmall.storage.domain.KxInStockProduct;
 import com.kxmall.storage.domain.vo.KxInStockProductVo;
 import com.kxmall.common.core.mapper.BaseMapperPlus;
+import org.springframework.stereotype.Repository;
 
 /**
  * 入库商品Mapper接口
@@ -10,6 +11,7 @@ import com.kxmall.common.core.mapper.BaseMapperPlus;
  * @author kxmall
  * @date 2023-08-29
  */
+@Repository
 public interface KxInStockProductMapper extends BaseMapperPlus<KxInStockProductMapper, KxInStockProduct, KxInStockProductVo> {
 
-}
+}

+ 3 - 1
kxmall-system/src/main/java/com/kxmall/storage/mapper/KxOutStockProductMapper.java

@@ -3,6 +3,7 @@ package com.kxmall.storage.mapper;
 import com.kxmall.storage.domain.KxOutStockProduct;
 import com.kxmall.storage.domain.vo.KxOutStockProductVo;
 import com.kxmall.common.core.mapper.BaseMapperPlus;
+import org.springframework.stereotype.Repository;
 
 /**
  * 出库商品Mapper接口
@@ -10,6 +11,7 @@ import com.kxmall.common.core.mapper.BaseMapperPlus;
  * @author kxmall
  * @date 2023-08-29
  */
+@Repository
 public interface KxOutStockProductMapper extends BaseMapperPlus<KxOutStockProductMapper, KxOutStockProduct, KxOutStockProductVo> {
 
-}
+}

+ 3 - 1
kxmall-system/src/main/java/com/kxmall/storage/mapper/KxRoleStorageMapper.java

@@ -6,6 +6,7 @@ import com.kxmall.storage.domain.KxStorage;
 import com.kxmall.storage.domain.vo.KxStorageVo;
 import com.kxmall.storage.domain.vo.RoleStorageVo;
 import org.apache.ibatis.annotations.Param;
+import org.springframework.stereotype.Repository;
 
 import java.util.List;
 
@@ -15,8 +16,9 @@ import java.util.List;
  * @author kxmall
  * @date 2023-08-27
  */
+@Repository
 public interface KxRoleStorageMapper extends BaseMapperPlus<KxRoleStorageMapper, KxRoleStorage, RoleStorageVo> {
 
 
 
-}
+}

+ 3 - 1
kxmall-system/src/main/java/com/kxmall/storage/mapper/KxStockMapper.java

@@ -5,6 +5,7 @@ import com.kxmall.storage.domain.bo.WarningStockBo;
 import com.kxmall.storage.domain.vo.KxStockVo;
 import com.kxmall.common.core.mapper.BaseMapperPlus;
 import org.apache.ibatis.annotations.Param;
+import org.springframework.stereotype.Repository;
 
 import java.util.List;
 import java.util.Set;
@@ -15,6 +16,7 @@ import java.util.Set;
  * @author kxmall
  * @date 2023-08-27
  */
+@Repository
 public interface KxStockMapper extends BaseMapperPlus<KxStockMapper, KxStock, KxStockVo> {
 
     /**
@@ -89,4 +91,4 @@ public interface KxStockMapper extends BaseMapperPlus<KxStockMapper, KxStock, Kx
                             @Param("storageIds") Set<Long> storageIds);
 
 
-}
+}

+ 3 - 1
kxmall-system/src/main/java/com/kxmall/storage/mapper/KxStorageMapper.java

@@ -4,6 +4,7 @@ import com.kxmall.storage.domain.KxStorage;
 import com.kxmall.storage.domain.vo.KxStorageVo;
 import com.kxmall.common.core.mapper.BaseMapperPlus;
 import org.apache.ibatis.annotations.Param;
+import org.springframework.stereotype.Repository;
 
 import java.util.List;
 import java.util.Set;
@@ -14,6 +15,7 @@ import java.util.Set;
  * @author kxmall
  * @date 2023-08-27
  */
+@Repository
 public interface KxStorageMapper extends BaseMapperPlus<KxStorageMapper, KxStorage, KxStorageVo> {
 
 
@@ -43,4 +45,4 @@ public interface KxStorageMapper extends BaseMapperPlus<KxStorageMapper, KxStora
      */
     List<KxStorageVo> getStorageNameAll(int state, @Param("storageIds") Set<Long> storageIds);
 
-}
+}

+ 3 - 1
kxmall-system/src/main/java/com/kxmall/system/mapper/SysConfigMapper.java

@@ -2,12 +2,14 @@ package com.kxmall.system.mapper;
 
 import com.kxmall.common.core.mapper.BaseMapperPlus;
 import com.kxmall.system.domain.SysConfig;
+import org.springframework.stereotype.Repository;
 
 /**
  * 参数配置 数据层
  *
  * @author kxmall
  */
+@Repository
 public interface SysConfigMapper extends BaseMapperPlus<SysConfigMapper, SysConfig, SysConfig> {
 
-}
+}

+ 3 - 1
kxmall-system/src/main/java/com/kxmall/system/mapper/SysDeptMapper.java

@@ -7,6 +7,7 @@ import com.kxmall.common.annotation.DataPermission;
 import com.kxmall.common.core.domain.entity.SysDept;
 import com.kxmall.common.core.mapper.BaseMapperPlus;
 import org.apache.ibatis.annotations.Param;
+import org.springframework.stereotype.Repository;
 
 import java.util.List;
 
@@ -15,6 +16,7 @@ import java.util.List;
  *
  * @author kxmall
  */
+@Repository
 public interface SysDeptMapper extends BaseMapperPlus<SysDeptMapper, SysDept, SysDept> {
 
     /**
@@ -37,4 +39,4 @@ public interface SysDeptMapper extends BaseMapperPlus<SysDeptMapper, SysDept, Sy
      */
     List<Long> selectDeptListByRoleId(@Param("roleId") Long roleId, @Param("deptCheckStrictly") boolean deptCheckStrictly);
 
-}
+}

+ 3 - 1
kxmall-system/src/main/java/com/kxmall/system/mapper/SysDictDataMapper.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.kxmall.common.constant.UserConstants;
 import com.kxmall.common.core.domain.entity.SysDictData;
 import com.kxmall.common.core.mapper.BaseMapperPlus;
+import org.springframework.stereotype.Repository;
 
 import java.util.List;
 
@@ -12,6 +13,7 @@ import java.util.List;
  *
  * @author kxmall
  */
+@Repository
 public interface SysDictDataMapper extends BaseMapperPlus<SysDictDataMapper, SysDictData, SysDictData> {
 
     default List<SysDictData> selectDictDataByType(String dictType) {
@@ -21,4 +23,4 @@ public interface SysDictDataMapper extends BaseMapperPlus<SysDictDataMapper, Sys
                 .eq(SysDictData::getDictType, dictType)
                 .orderByAsc(SysDictData::getDictSort));
     }
-}
+}

+ 3 - 1
kxmall-system/src/main/java/com/kxmall/system/mapper/SysDictTypeMapper.java

@@ -2,12 +2,14 @@ package com.kxmall.system.mapper;
 
 import com.kxmall.common.core.domain.entity.SysDictType;
 import com.kxmall.common.core.mapper.BaseMapperPlus;
+import org.springframework.stereotype.Repository;
 
 /**
  * 字典表 数据层
  *
  * @author kxmall
  */
+@Repository
 public interface SysDictTypeMapper extends BaseMapperPlus<SysDictTypeMapper, SysDictType, SysDictType> {
 
-}
+}

+ 3 - 1
kxmall-system/src/main/java/com/kxmall/system/mapper/SysExpressMapper.java

@@ -3,6 +3,7 @@ package com.kxmall.system.mapper;
 import com.kxmall.system.domain.SysExpress;
 import com.kxmall.common.core.mapper.BaseMapperPlus;
 import com.kxmall.system.domain.vo.SysExpressVo;
+import org.springframework.stereotype.Repository;
 
 /**
  * 快递公司Mapper接口
@@ -10,6 +11,7 @@ import com.kxmall.system.domain.vo.SysExpressVo;
  * @author kxmall
  * @date 2023-02-17
  */
+@Repository
 public interface SysExpressMapper extends BaseMapperPlus<SysExpressMapper, SysExpress, SysExpressVo> {
 
-}
+}

+ 3 - 1
kxmall-system/src/main/java/com/kxmall/system/mapper/SysLogininforMapper.java

@@ -2,12 +2,14 @@ package com.kxmall.system.mapper;
 
 import com.kxmall.system.domain.SysLogininfor;
 import com.kxmall.common.core.mapper.BaseMapperPlus;
+import org.springframework.stereotype.Repository;
 
 /**
  * 系统访问日志情况信息 数据层
  *
  * @author kxmall
  */
+@Repository
 public interface SysLogininforMapper extends BaseMapperPlus<SysLogininforMapper, SysLogininfor, SysLogininfor> {
 
-}
+}

+ 3 - 1
kxmall-system/src/main/java/com/kxmall/system/mapper/SysMenuMapper.java

@@ -7,6 +7,7 @@ import com.kxmall.common.constant.UserConstants;
 import com.kxmall.common.core.domain.entity.SysMenu;
 import com.kxmall.common.core.mapper.BaseMapperPlus;
 import org.apache.ibatis.annotations.Param;
+import org.springframework.stereotype.Repository;
 
 import java.util.List;
 
@@ -15,6 +16,7 @@ import java.util.List;
  *
  * @author kxmall
  */
+@Repository
 public interface SysMenuMapper extends BaseMapperPlus<SysMenuMapper, SysMenu, SysMenu> {
 
     /**
@@ -79,4 +81,4 @@ public interface SysMenuMapper extends BaseMapperPlus<SysMenuMapper, SysMenu, Sy
      */
     List<Long> selectMenuListByRoleId(@Param("roleId") Long roleId, @Param("menuCheckStrictly") boolean menuCheckStrictly);
 
-}
+}

+ 3 - 1
kxmall-system/src/main/java/com/kxmall/system/mapper/SysNoticeMapper.java

@@ -2,12 +2,14 @@ package com.kxmall.system.mapper;
 
 import com.kxmall.system.domain.SysNotice;
 import com.kxmall.common.core.mapper.BaseMapperPlus;
+import org.springframework.stereotype.Repository;
 
 /**
  * 通知公告表 数据层
  *
  * @author kxmall
  */
+@Repository
 public interface SysNoticeMapper extends BaseMapperPlus<SysNoticeMapper, SysNotice, SysNotice> {
 
-}
+}

+ 3 - 1
kxmall-system/src/main/java/com/kxmall/system/mapper/SysOperLogMapper.java

@@ -2,12 +2,14 @@ package com.kxmall.system.mapper;
 
 import com.kxmall.system.domain.SysOperLog;
 import com.kxmall.common.core.mapper.BaseMapperPlus;
+import org.springframework.stereotype.Repository;
 
 /**
  * 操作日志 数据层
  *
  * @author kxmall
  */
+@Repository
 public interface SysOperLogMapper extends BaseMapperPlus<SysOperLogMapper, SysOperLog, SysOperLog> {
 
-}
+}

+ 3 - 1
kxmall-system/src/main/java/com/kxmall/system/mapper/SysOssConfigMapper.java

@@ -3,6 +3,7 @@ package com.kxmall.system.mapper;
 import com.kxmall.system.domain.SysOssConfig;
 import com.kxmall.common.core.mapper.BaseMapperPlus;
 import com.kxmall.system.domain.vo.SysOssConfigVo;
+import org.springframework.stereotype.Repository;
 
 /**
  * 对象存储配置Mapper接口
@@ -11,6 +12,7 @@ import com.kxmall.system.domain.vo.SysOssConfigVo;
  * @author 孤舟烟雨
  * @date 2021-08-13
  */
+@Repository
 public interface SysOssConfigMapper extends BaseMapperPlus<SysOssConfigMapper, SysOssConfig, SysOssConfigVo> {
 
-}
+}

+ 3 - 1
kxmall-system/src/main/java/com/kxmall/system/mapper/SysOssMapper.java

@@ -3,11 +3,13 @@ package com.kxmall.system.mapper;
 import com.kxmall.system.domain.SysOss;
 import com.kxmall.common.core.mapper.BaseMapperPlus;
 import com.kxmall.system.domain.vo.SysOssVo;
+import org.springframework.stereotype.Repository;
 
 /**
  * 文件上传 数据层
  *
  * @author kxmall
  */
+@Repository
 public interface SysOssMapper extends BaseMapperPlus<SysOssMapper, SysOss, SysOssVo> {
-}
+}

+ 3 - 1
kxmall-system/src/main/java/com/kxmall/system/mapper/SysPostMapper.java

@@ -2,6 +2,7 @@ package com.kxmall.system.mapper;
 
 import com.kxmall.system.domain.SysPost;
 import com.kxmall.common.core.mapper.BaseMapperPlus;
+import org.springframework.stereotype.Repository;
 
 import java.util.List;
 
@@ -10,6 +11,7 @@ import java.util.List;
  *
  * @author kxmall
  */
+@Repository
 public interface SysPostMapper extends BaseMapperPlus<SysPostMapper, SysPost, SysPost> {
 
     /**
@@ -28,4 +30,4 @@ public interface SysPostMapper extends BaseMapperPlus<SysPostMapper, SysPost, Sy
      */
     List<SysPost> selectPostsByUserName(String userName);
 
-}
+}

+ 3 - 1
kxmall-system/src/main/java/com/kxmall/system/mapper/SysRegionMapper.java

@@ -3,6 +3,7 @@ package com.kxmall.system.mapper;
 import com.kxmall.system.domain.SysRegion;
 import com.kxmall.system.domain.vo.SysRegionVo;
 import com.kxmall.common.core.mapper.BaseMapperPlus;
+import org.springframework.stereotype.Repository;
 
 /**
  * 中国地区系统Mapper接口
@@ -10,6 +11,7 @@ import com.kxmall.common.core.mapper.BaseMapperPlus;
  * @author kxmall
  * @date 2023-02-08
  */
+@Repository
 public interface SysRegionMapper extends BaseMapperPlus<SysRegionMapper, SysRegion, SysRegionVo> {
 
-}
+}

+ 3 - 1
kxmall-system/src/main/java/com/kxmall/system/mapper/SysRoleDeptMapper.java

@@ -2,12 +2,14 @@ package com.kxmall.system.mapper;
 
 import com.kxmall.system.domain.SysRoleDept;
 import com.kxmall.common.core.mapper.BaseMapperPlus;
+import org.springframework.stereotype.Repository;
 
 /**
  * 角色与部门关联表 数据层
  *
  * @author kxmall
  */
+@Repository
 public interface SysRoleDeptMapper extends BaseMapperPlus<SysRoleDeptMapper, SysRoleDept, SysRoleDept> {
 
-}
+}

+ 3 - 1
kxmall-system/src/main/java/com/kxmall/system/mapper/SysRoleMapper.java

@@ -8,6 +8,7 @@ import com.kxmall.common.annotation.DataPermission;
 import com.kxmall.common.core.domain.entity.SysRole;
 import com.kxmall.common.core.mapper.BaseMapperPlus;
 import org.apache.ibatis.annotations.Param;
+import org.springframework.stereotype.Repository;
 
 import java.util.List;
 
@@ -16,6 +17,7 @@ import java.util.List;
  *
  * @author kxmall
  */
+@Repository
 public interface SysRoleMapper extends BaseMapperPlus<SysRoleMapper, SysRole, SysRole> {
 
     @DataPermission({
@@ -59,4 +61,4 @@ public interface SysRoleMapper extends BaseMapperPlus<SysRoleMapper, SysRole, Sy
      */
     List<SysRole> selectRolesByUserName(String userName);
 
-}
+}

+ 3 - 1
kxmall-system/src/main/java/com/kxmall/system/mapper/SysRoleMenuMapper.java

@@ -2,12 +2,14 @@ package com.kxmall.system.mapper;
 
 import com.kxmall.system.domain.SysRoleMenu;
 import com.kxmall.common.core.mapper.BaseMapperPlus;
+import org.springframework.stereotype.Repository;
 
 /**
  * 角色与菜单关联表 数据层
  *
  * @author kxmall
  */
+@Repository
 public interface SysRoleMenuMapper extends BaseMapperPlus<SysRoleMenuMapper, SysRoleMenu, SysRoleMenu> {
 
-}
+}

+ 3 - 1
kxmall-system/src/main/java/com/kxmall/system/mapper/SysUserMapper.java

@@ -8,6 +8,7 @@ import com.kxmall.common.annotation.DataPermission;
 import com.kxmall.common.core.domain.entity.SysUser;
 import com.kxmall.common.core.mapper.BaseMapperPlus;
 import org.apache.ibatis.annotations.Param;
+import org.springframework.stereotype.Repository;
 
 import java.util.List;
 
@@ -16,6 +17,7 @@ import java.util.List;
  *
  * @author kxmall
  */
+@Repository
 public interface SysUserMapper extends BaseMapperPlus<SysUserMapper, SysUser, SysUser> {
 
     @DataPermission({
@@ -84,4 +86,4 @@ public interface SysUserMapper extends BaseMapperPlus<SysUserMapper, SysUser, Sy
      */
     SysUser selectUserById(Long userId);
 
-}
+}

+ 3 - 1
kxmall-system/src/main/java/com/kxmall/system/mapper/SysUserPostMapper.java

@@ -2,12 +2,14 @@ package com.kxmall.system.mapper;
 
 import com.kxmall.common.core.mapper.BaseMapperPlus;
 import com.kxmall.system.domain.SysUserPost;
+import org.springframework.stereotype.Repository;
 
 /**
  * 用户与岗位关联表 数据层
  *
  * @author kxmall
  */
+@Repository
 public interface SysUserPostMapper extends BaseMapperPlus<SysUserPostMapper, SysUserPost, SysUserPost> {
 
-}
+}

+ 3 - 1
kxmall-system/src/main/java/com/kxmall/system/mapper/SysUserRoleMapper.java

@@ -2,6 +2,7 @@ package com.kxmall.system.mapper;
 
 import com.kxmall.system.domain.SysUserRole;
 import com.kxmall.common.core.mapper.BaseMapperPlus;
+import org.springframework.stereotype.Repository;
 
 import java.util.List;
 
@@ -10,8 +11,9 @@ import java.util.List;
  *
  * @author kxmall
  */
+@Repository
 public interface SysUserRoleMapper extends BaseMapperPlus<SysUserRoleMapper, SysUserRole, SysUserRole> {
 
     List<Long> selectUserIdsByRoleId(Long roleId);
 
-}
+}

+ 3 - 2
kxmall-system/src/main/java/com/kxmall/user/mapper/KxUserBillMapper.java

@@ -8,6 +8,7 @@ import com.kxmall.user.domain.KxUserBill;
 import com.kxmall.common.core.mapper.BaseMapperPlus;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
+import org.springframework.stereotype.Repository;
 
 /**
  * 用户账单Mapper接口
@@ -15,12 +16,12 @@ import org.apache.ibatis.annotations.Select;
  * @author kxmall
  * @date 2023-02-14
  */
+@Repository
 public interface KxUserBillMapper extends BaseMapperPlus<KxUserBillMapper, KxUserBill, KxUserBillVo> {
 
 
     Page<KxUserBillVo> selectVoPageList(@Param("page") Page<Object> build, @Param(Constants.WRAPPER) QueryWrapper<KxUserBill> lqw);
 
-
     @Select("select IFNULL(sum(number),0) from kx_user_bill " +
             "where status=1 and type='sign' and pm=1 and category='integral' " +
             "and uid=#{uid}")
@@ -31,4 +32,4 @@ public interface KxUserBillMapper extends BaseMapperPlus<KxUserBillMapper, KxUse
             "where status=1 and type='brokerage' and pm=1 and category='now_money' " +
             "and uid=#{uid} and TO_DAYS(NOW()) - TO_DAYS(create_time) <= 1")
     double sumYesterdayPrice(Long userId);
-}
+}

+ 3 - 1
kxmall-system/src/main/java/com/kxmall/user/mapper/KxUserCollectMapper.java

@@ -4,6 +4,7 @@ import com.kxmall.user.domain.KxUserCollect;
 import com.kxmall.user.domain.vo.KxUserCollectVo;
 import com.kxmall.common.core.mapper.BaseMapperPlus;
 import org.apache.ibatis.annotations.Param;
+import org.springframework.stereotype.Repository;
 
 import java.util.List;
 
@@ -13,9 +14,10 @@ import java.util.List;
  * @author kxmall
  * @date 2023-04-06
  */
+@Repository
 public interface KxUserCollectMapper extends BaseMapperPlus<KxUserCollectMapper, KxUserCollect, KxUserCollectVo> {
 
     List<KxUserCollectVo> getCollectAll(@Param("userId") Long userId, @Param("offset") Integer offset, @Param("size") Integer size);
 
     Long getCollectAllByCount(@Param("userId") Long userId);
-}
+}

+ 3 - 1
kxmall-system/src/main/java/com/kxmall/user/mapper/KxUserExtractMapper.java

@@ -4,7 +4,9 @@ import com.kxmall.common.core.mapper.BaseMapperPlus;
 import com.kxmall.user.domain.KxUserExtract;
 import com.kxmall.user.domain.vo.KxUserExtractVo;
 import org.apache.ibatis.annotations.Select;
+import org.springframework.stereotype.Repository;
 
+@Repository
 public interface KxUserExtractMapper extends BaseMapperPlus<KxUserExtractMapper, KxUserExtract, KxUserExtractVo> {
 
 
@@ -12,4 +14,4 @@ public interface KxUserExtractMapper extends BaseMapperPlus<KxUserExtractMapper,
             "where status=1 " +
             "and uid=#{userId}")
     Double sumPrice(Long userId);
-}
+}

+ 3 - 1
kxmall-system/src/main/java/com/kxmall/user/mapper/KxUserFootprintMapper.java

@@ -4,6 +4,7 @@ import com.kxmall.user.domain.KxUserFootprint;
 import com.kxmall.user.domain.vo.KxUserFootprintVo;
 import com.kxmall.common.core.mapper.BaseMapperPlus;
 import org.apache.ibatis.annotations.Param;
+import org.springframework.stereotype.Repository;
 
 import java.util.List;
 
@@ -13,6 +14,7 @@ import java.util.List;
  * @author kxmall
  * @date 2023-04-06
  */
+@Repository
 public interface KxUserFootprintMapper extends BaseMapperPlus<KxUserFootprintMapper, KxUserFootprint, KxUserFootprintVo> {
 
     /**
@@ -30,4 +32,4 @@ public interface KxUserFootprintMapper extends BaseMapperPlus<KxUserFootprintMap
      * @return
      */
     Long getFootprintByCount(@Param("userId") Long userId);
-}
+}

+ 3 - 1
kxmall-system/src/main/java/com/kxmall/user/mapper/KxUserLevelMapper.java

@@ -3,6 +3,7 @@ package com.kxmall.user.mapper;
 import com.kxmall.user.domain.KxUserLevel;
 import com.kxmall.user.domain.vo.KxUserLevelVo;
 import com.kxmall.common.core.mapper.BaseMapperPlus;
+import org.springframework.stereotype.Repository;
 
 /**
  * 用户等级Mapper接口
@@ -10,6 +11,7 @@ import com.kxmall.common.core.mapper.BaseMapperPlus;
  * @author kxmall
  * @date 2023-02-14
  */
+@Repository
 public interface KxUserLevelMapper extends BaseMapperPlus<KxUserLevelMapper, KxUserLevel, KxUserLevelVo> {
 
-}
+}

+ 3 - 1
kxmall-system/src/main/java/com/kxmall/user/mapper/KxUserLevelSettingMapper.java

@@ -3,6 +3,7 @@ package com.kxmall.user.mapper;
 import com.kxmall.user.domain.KxUserLevelSetting;
 import com.kxmall.user.domain.vo.KxUserLevelSettingVo;
 import com.kxmall.common.core.mapper.BaseMapperPlus;
+import org.springframework.stereotype.Repository;
 
 /**
  * 设置用户等级Mapper接口
@@ -10,6 +11,7 @@ import com.kxmall.common.core.mapper.BaseMapperPlus;
  * @author kxmall
  * @date 2023-02-21
  */
+@Repository
 public interface KxUserLevelSettingMapper extends BaseMapperPlus<KxUserLevelSettingMapper, KxUserLevelSetting, KxUserLevelSettingVo> {
 
-}
+}

+ 3 - 1
kxmall-system/src/main/java/com/kxmall/user/mapper/KxUserMapper.java

@@ -8,6 +8,7 @@ import com.kxmall.common.core.mapper.BaseMapperPlus;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
 import org.apache.ibatis.annotations.Update;
+import org.springframework.stereotype.Repository;
 
 import java.math.BigDecimal;
 import java.util.Date;
@@ -19,6 +20,7 @@ import java.util.List;
  * @author kxmall
  * @date 2023-02-14
  */
+@Repository
 public interface KxUserMapper extends BaseMapperPlus<KxUserMapper, KxUser, KxUserVo> {
 
 
@@ -86,4 +88,4 @@ public interface KxUserMapper extends BaseMapperPlus<KxUserMapper, KxUser, KxUse
 
     @Update("update kx_user set brokerage_price = brokerage_price+ ${price} where uid = #{id}")
     void incBrokeragePrice(@Param("price") BigDecimal extractPrice, @Param("id") Long uid);
-}
+}

+ 3 - 1
kxmall-system/src/main/java/com/kxmall/user/mapper/KxUserSignMapper.java

@@ -9,6 +9,7 @@ import com.kxmall.user.domain.vo.KxUserBillVo;
 import com.kxmall.user.domain.vo.KxUserSignVo;
 import com.kxmall.common.core.mapper.BaseMapperPlus;
 import org.apache.ibatis.annotations.Param;
+import org.springframework.stereotype.Repository;
 
 /**
  * 签到记录Mapper接口
@@ -16,8 +17,9 @@ import org.apache.ibatis.annotations.Param;
  * @author kxmall
  * @date 2024-08-26
  */
+@Repository
 public interface KxUserSignMapper extends BaseMapperPlus<KxUserSignMapper, KxUserSign, KxUserSignVo> {
 
     Page<KxUserSignVo> selectVoPageList(@Param("page") Page<Object> build, @Param(Constants.WRAPPER) QueryWrapper<KxUserSign> lqw);
 
-}
+}

+ 2 - 2
kxmall-system/src/main/java/com/kxmall/user/mapper/KxUserTaskFinishMapper.java

@@ -2,7 +2,7 @@ package com.kxmall.user.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.kxmall.user.domain.KxUserTaskFinish;
-import org.apache.ibatis.annotations.Mapper;
+import org.springframework.stereotype.Repository;
 
 import java.util.List;
 
@@ -12,7 +12,7 @@ import java.util.List;
  * @author kxmall
  * @date 2023-08-08
  */
-@Mapper
+@Repository
 public interface KxUserTaskFinishMapper extends BaseMapper<KxUserTaskFinish> {
 
     /**

+ 2 - 0
kxmall-system/src/main/java/com/kxmall/user/mapper/KxUserTaskMapper.java

@@ -3,6 +3,7 @@ package com.kxmall.user.mapper;
 import com.kxmall.common.core.mapper.BaseMapperPlus;
 import com.kxmall.user.domain.KxUserTask;
 import com.kxmall.user.domain.vo.KxUserTaskVo;
+import org.springframework.stereotype.Repository;
 
 /**
  * 等级任务设置Mapper接口
@@ -10,6 +11,7 @@ import com.kxmall.user.domain.vo.KxUserTaskVo;
  * @author kxmall
  * @date 2023-08-08
  */
+@Repository
 public interface KxUserTaskMapper extends BaseMapperPlus<KxUserTaskMapper, KxUserTask, KxUserTaskVo> {
 
 }

+ 8 - 8
需求列表.md

@@ -4,33 +4,33 @@
 - [x] 设置服务半径(如 5 公里内接单)、擅长服务类型,系统优先推送匹配订单 关联派单业务
 
 # 服务商品
-- [ ] 商品分类 查询条件(按销量、价格、评分筛选)
+- [ ] 商品分类 查询条件(按销量、价格、评分筛选) xx
 
 # 商品下单
 - [x] 订单选择时间,可上传照片
 - [x] 订单添加到达时间
-- [ ] 订单可添加费用
+- [x] 订单可添加费用
 
 # 订单互动
 - [ ] 订单内置聊天(*确认需求)
 - [ ] 拨打师傅电话
 - [ ] 评价添加师傅
-- [ ] 订单售后-重新服务(*确认需求)
+- [ ] 订单售后-重新服务(*确认需求) xx
 
 # 接单/派单-admin
 - [ ] 系统自动派单(沟通派单逻辑)
 - [ ] 派单后 地址导航
 
 # 订单服务中
-- [ ] 上传照片
-- [ ] 实际费用
-- [ ] 费用划分(师傅-平台)
+- [ ] 上传照片 xx
+- [ ] 实际费用 xx
+- [ ] 费用划分(师傅-平台)  xx
 
 # 佣金比例-admin
-- [ ] 佣金比例(*沟通业务)
+- [ ] 佣金比例(*沟通业务) xx
 
 # 师傅列表-admin
-- [ ] 师傅等级 关联佣金比例
+- [x] 师傅等级 关联佣金比例 
 
 # 订单列表-admin
 - [ ] 手动派单