diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/controller/TbMemberPointsController.java b/src/main/java/com/chaozhanggui/system/cashierservice/controller/TbMemberPointsController.java index 16a7994..99fde14 100644 --- a/src/main/java/com/chaozhanggui/system/cashierservice/controller/TbMemberPointsController.java +++ b/src/main/java/com/chaozhanggui/system/cashierservice/controller/TbMemberPointsController.java @@ -7,9 +7,9 @@ import com.chaozhanggui.system.cashierservice.service.TbMemberPointsService; import com.chaozhanggui.system.cashierservice.sign.CodeEnum; import com.chaozhanggui.system.cashierservice.sign.Result; import com.github.pagehelper.PageInfo; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; -import javax.annotation.Resource; import java.math.BigDecimal; import java.util.Map; @@ -24,7 +24,7 @@ import java.util.Map; @RequestMapping("/api/points/member-points") public class TbMemberPointsController { - @Resource + @Autowired private TbMemberPointsService tbMemberPointsService; /** diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/controller/TbMemberPointsLogController.java b/src/main/java/com/chaozhanggui/system/cashierservice/controller/TbMemberPointsLogController.java index c1dbd79..9fd9e15 100644 --- a/src/main/java/com/chaozhanggui/system/cashierservice/controller/TbMemberPointsLogController.java +++ b/src/main/java/com/chaozhanggui/system/cashierservice/controller/TbMemberPointsLogController.java @@ -4,12 +4,12 @@ import com.chaozhanggui.system.cashierservice.entity.TbMemberPointsLog; import com.chaozhanggui.system.cashierservice.service.TbMemberPointsLogService; import com.chaozhanggui.system.cashierservice.sign.Result; import com.github.pagehelper.PageInfo; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; -import javax.annotation.Resource; import java.util.Map; @@ -23,7 +23,7 @@ import java.util.Map; @RequestMapping("/api/points/member-points-log") public class TbMemberPointsLogController { - @Resource + @Autowired private TbMemberPointsLogService tbMemberPointsLogService; /** diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/controller/TbPointsBasicSettingController.java b/src/main/java/com/chaozhanggui/system/cashierservice/controller/TbPointsBasicSettingController.java index 84639c8..2c4291e 100644 --- a/src/main/java/com/chaozhanggui/system/cashierservice/controller/TbPointsBasicSettingController.java +++ b/src/main/java/com/chaozhanggui/system/cashierservice/controller/TbPointsBasicSettingController.java @@ -4,10 +4,9 @@ import com.chaozhanggui.system.cashierservice.entity.TbPointsBasicSetting; import com.chaozhanggui.system.cashierservice.service.TbPointsBasicSettingService; import com.chaozhanggui.system.cashierservice.sign.CodeEnum; import com.chaozhanggui.system.cashierservice.sign.Result; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; -import javax.annotation.Resource; - /** * 积分基本设置 @@ -19,7 +18,7 @@ import javax.annotation.Resource; @RequestMapping("/api/points/basic-setting") public class TbPointsBasicSettingController { - @Resource + @Autowired private TbPointsBasicSettingService tbPointsBasicSettingService; /** diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/controller/TbPointsExchangeRecordController.java b/src/main/java/com/chaozhanggui/system/cashierservice/controller/TbPointsExchangeRecordController.java index 57ade59..1f5e332 100644 --- a/src/main/java/com/chaozhanggui/system/cashierservice/controller/TbPointsExchangeRecordController.java +++ b/src/main/java/com/chaozhanggui/system/cashierservice/controller/TbPointsExchangeRecordController.java @@ -5,9 +5,9 @@ import com.chaozhanggui.system.cashierservice.service.TbPointsExchangeRecordServ import com.chaozhanggui.system.cashierservice.sign.CodeEnum; import com.chaozhanggui.system.cashierservice.sign.Result; import com.github.pagehelper.PageInfo; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; -import javax.annotation.Resource; import java.util.Map; @@ -21,7 +21,7 @@ import java.util.Map; @RequestMapping("/api/points/exchange-record") public class TbPointsExchangeRecordController { - @Resource + @Autowired private TbPointsExchangeRecordService tbPointsExchangeRecordService; /** diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/controller/TbPointsGoodsSettingController.java b/src/main/java/com/chaozhanggui/system/cashierservice/controller/TbPointsGoodsSettingController.java index 0bcb124..e5ab1a5 100644 --- a/src/main/java/com/chaozhanggui/system/cashierservice/controller/TbPointsGoodsSettingController.java +++ b/src/main/java/com/chaozhanggui/system/cashierservice/controller/TbPointsGoodsSettingController.java @@ -5,9 +5,9 @@ import com.chaozhanggui.system.cashierservice.service.TbPointsGoodsSettingServic import com.chaozhanggui.system.cashierservice.sign.CodeEnum; import com.chaozhanggui.system.cashierservice.sign.Result; import com.github.pagehelper.PageInfo; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; -import javax.annotation.Resource; import java.util.Map; @@ -21,7 +21,7 @@ import java.util.Map; @RequestMapping("/api/points/goods-setting") public class TbPointsGoodsSettingController { - @Resource + @Autowired private TbPointsGoodsSettingService tbPointsGoodsSettingService; /** diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/service/impl/TbMemberPointsLogServiceImpl.java b/src/main/java/com/chaozhanggui/system/cashierservice/service/impl/TbMemberPointsLogServiceImpl.java index 14284ba..b43135e 100644 --- a/src/main/java/com/chaozhanggui/system/cashierservice/service/impl/TbMemberPointsLogServiceImpl.java +++ b/src/main/java/com/chaozhanggui/system/cashierservice/service/impl/TbMemberPointsLogServiceImpl.java @@ -11,6 +11,7 @@ import com.chaozhanggui.system.cashierservice.mapper.TbMemberPointsLogMapper; import com.chaozhanggui.system.cashierservice.service.TbMemberPointsLogService; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; +import org.springframework.context.annotation.Primary; import org.springframework.stereotype.Service; import java.util.Map; @@ -22,6 +23,7 @@ import java.util.Map; * @since 2.0 2024-10-25 */ @Service +@Primary public class TbMemberPointsLogServiceImpl extends ServiceImpl implements TbMemberPointsLogService { private LambdaQueryWrapper getWrapper(Map params) { diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/service/impl/TbMemberPointsServiceImpl.java b/src/main/java/com/chaozhanggui/system/cashierservice/service/impl/TbMemberPointsServiceImpl.java index e207954..396e787 100644 --- a/src/main/java/com/chaozhanggui/system/cashierservice/service/impl/TbMemberPointsServiceImpl.java +++ b/src/main/java/com/chaozhanggui/system/cashierservice/service/impl/TbMemberPointsServiceImpl.java @@ -23,10 +23,11 @@ import com.chaozhanggui.system.cashierservice.service.TbMemberPointsService; import com.chaozhanggui.system.cashierservice.service.TbPointsBasicSettingService; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.Primary; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import javax.annotation.Resource; import java.math.BigDecimal; import java.math.RoundingMode; import java.util.Date; @@ -39,17 +40,18 @@ import java.util.Map; * @since 2.0 2024-10-25 */ @Service +@Primary public class TbMemberPointsServiceImpl extends ServiceImpl implements TbMemberPointsService { - @Resource + @Autowired private TbMemberPointsLogMapper tbMemberPointsLogMapper; - @Resource + @Autowired private TbPointsBasicSettingMapper tbPointsBasicSettingMapper; - @Resource + @Autowired private TbShopUserMapper tbShopUserMapper; - @Resource + @Autowired private TbOrderInfoMapper tbOrderInfoMapper; - @Resource + @Autowired private TbPointsBasicSettingService tbPointsBasicSettingService; private LambdaQueryWrapper getWrapper(Map params) { diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/service/impl/TbPointsBasicSettingServiceImpl.java b/src/main/java/com/chaozhanggui/system/cashierservice/service/impl/TbPointsBasicSettingServiceImpl.java index a6c266b..f0305cb 100644 --- a/src/main/java/com/chaozhanggui/system/cashierservice/service/impl/TbPointsBasicSettingServiceImpl.java +++ b/src/main/java/com/chaozhanggui/system/cashierservice/service/impl/TbPointsBasicSettingServiceImpl.java @@ -7,6 +7,7 @@ import com.chaozhanggui.system.cashierservice.entity.TbPointsBasicSetting; import com.chaozhanggui.system.cashierservice.exception.MsgException; import com.chaozhanggui.system.cashierservice.mapper.TbPointsBasicSettingMapper; import com.chaozhanggui.system.cashierservice.service.TbPointsBasicSettingService; +import org.springframework.context.annotation.Primary; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -19,6 +20,7 @@ import java.util.Date; * @since 2.0 2024-10-25 */ @Service +@Primary public class TbPointsBasicSettingServiceImpl extends ServiceImpl implements TbPointsBasicSettingService { diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/service/impl/TbPointsExchangeRecordServiceImpl.java b/src/main/java/com/chaozhanggui/system/cashierservice/service/impl/TbPointsExchangeRecordServiceImpl.java index 6a26e6d..6e1d152 100644 --- a/src/main/java/com/chaozhanggui/system/cashierservice/service/impl/TbPointsExchangeRecordServiceImpl.java +++ b/src/main/java/com/chaozhanggui/system/cashierservice/service/impl/TbPointsExchangeRecordServiceImpl.java @@ -17,10 +17,11 @@ import com.chaozhanggui.system.cashierservice.mapper.*; import com.chaozhanggui.system.cashierservice.service.TbPointsExchangeRecordService; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.Primary; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import javax.annotation.Resource; import java.math.BigDecimal; import java.util.Date; import java.util.HashMap; @@ -33,18 +34,19 @@ import java.util.Map; * @since 2.0 2024-10-25 */ @Service +@Primary public class TbPointsExchangeRecordServiceImpl extends ServiceImpl implements TbPointsExchangeRecordService { - @Resource + @Autowired private TbPointsBasicSettingMapper tbPointsBasicSettingMapper; - @Resource + @Autowired private TbPointsGoodsSettingMapper tbPointsGoodsSettingMapper; - @Resource + @Autowired private TbMemberPointsMapper tbMemberPointsMapper; - @Resource + @Autowired private TbMemberPointsLogMapper tbMemberPointsLogMapper; private LambdaQueryWrapper getWrapper(Map params) { diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/service/impl/TbPointsGoodsSettingServiceImpl.java b/src/main/java/com/chaozhanggui/system/cashierservice/service/impl/TbPointsGoodsSettingServiceImpl.java index 852c52b..89d6735 100644 --- a/src/main/java/com/chaozhanggui/system/cashierservice/service/impl/TbPointsGoodsSettingServiceImpl.java +++ b/src/main/java/com/chaozhanggui/system/cashierservice/service/impl/TbPointsGoodsSettingServiceImpl.java @@ -16,6 +16,7 @@ import com.chaozhanggui.system.cashierservice.mapper.TbPointsGoodsSettingMapper; import com.chaozhanggui.system.cashierservice.service.TbPointsGoodsSettingService; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; +import org.springframework.context.annotation.Primary; import org.springframework.stereotype.Service; import java.util.Date; @@ -28,6 +29,7 @@ import java.util.Map; * @since 2.0 2024-10-25 */ @Service +@Primary public class TbPointsGoodsSettingServiceImpl extends ServiceImpl implements TbPointsGoodsSettingService { diff --git a/src/main/resources/mapper/TbMemberPointsLogMapper.xml b/src/main/resources/mapper/TbMemberPointsLogMapper.xml new file mode 100644 index 0000000..d128044 --- /dev/null +++ b/src/main/resources/mapper/TbMemberPointsLogMapper.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/src/main/resources/mapper/TbMemberPointsMapper.xml b/src/main/resources/mapper/TbMemberPointsMapper.xml new file mode 100644 index 0000000..d2dea21 --- /dev/null +++ b/src/main/resources/mapper/TbMemberPointsMapper.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/src/main/resources/mapper/TbPointsBasicSettingMapper.xml b/src/main/resources/mapper/TbPointsBasicSettingMapper.xml new file mode 100644 index 0000000..827c436 --- /dev/null +++ b/src/main/resources/mapper/TbPointsBasicSettingMapper.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/src/main/resources/mapper/TbPointsExchangeRecordMapper.xml b/src/main/resources/mapper/TbPointsExchangeRecordMapper.xml new file mode 100644 index 0000000..813071c --- /dev/null +++ b/src/main/resources/mapper/TbPointsExchangeRecordMapper.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/src/main/resources/mapper/TbPointsGoodsSettingMapper.xml b/src/main/resources/mapper/TbPointsGoodsSettingMapper.xml new file mode 100644 index 0000000..673fca5 --- /dev/null +++ b/src/main/resources/mapper/TbPointsGoodsSettingMapper.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file