fushengqian 1 rok pred
rodič
commit
498f174c5b

+ 2 - 0
fuint-application/src/main/java/com/fuint/common/service/impl/GoodsServiceImpl.java

@@ -408,6 +408,7 @@ public class GoodsServiceImpl extends ServiceImpl<MtGoodsMapper, MtGoods> implem
      */
      */
     @Override
     @Override
     @OperationServiceLog(description = "删除商品信息")
     @OperationServiceLog(description = "删除商品信息")
+    @Transactional(rollbackFor = Exception.class)
     public void deleteGoods(Integer id, String operator) throws BusinessCheckException {
     public void deleteGoods(Integer id, String operator) throws BusinessCheckException {
         MtGoods cateInfo = queryGoodsById(id);
         MtGoods cateInfo = queryGoodsById(id);
         if (null == cateInfo) {
         if (null == cateInfo) {
@@ -538,6 +539,7 @@ public class GoodsServiceImpl extends ServiceImpl<MtGoodsMapper, MtGoods> implem
      * @return
      * @return
      * */
      * */
     @Override
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public Boolean updateInitSale(Integer goodsId) {
     public Boolean updateInitSale(Integer goodsId) {
         return mtGoodsMapper.updateInitSale(goodsId);
         return mtGoodsMapper.updateInitSale(goodsId);
     }
     }

+ 2 - 2
fuint-application/src/main/java/com/fuint/common/service/impl/UserCouponServiceImpl.java

@@ -91,7 +91,6 @@ public class UserCouponServiceImpl extends ServiceImpl<MtUserCouponMapper, MtUse
      */
      */
     @Override
     @Override
     public PaginationResponse<MtUserCoupon> queryUserCouponListByPagination(PaginationRequest paginationRequest) {
     public PaginationResponse<MtUserCoupon> queryUserCouponListByPagination(PaginationRequest paginationRequest) {
-        com.github.pagehelper.Page<MtUserCoupon> pageHelper = PageHelper.startPage(paginationRequest.getCurrentPage(), paginationRequest.getPageSize());
         LambdaQueryWrapper<MtUserCoupon> lambdaQueryWrapper = Wrappers.lambdaQuery();
         LambdaQueryWrapper<MtUserCoupon> lambdaQueryWrapper = Wrappers.lambdaQuery();
         lambdaQueryWrapper.ne(MtUserCoupon::getStatus, StatusEnum.DISABLE.getKey());
         lambdaQueryWrapper.ne(MtUserCoupon::getStatus, StatusEnum.DISABLE.getKey());
 
 
@@ -121,6 +120,7 @@ public class UserCouponServiceImpl extends ServiceImpl<MtUserCouponMapper, MtUse
         }
         }
 
 
         lambdaQueryWrapper.orderByDesc(MtUserCoupon::getId);
         lambdaQueryWrapper.orderByDesc(MtUserCoupon::getId);
+        Page<MtUserCoupon> pageHelper = PageHelper.startPage(paginationRequest.getCurrentPage(), paginationRequest.getPageSize());
         List<MtUserCoupon> dataList = mtUserCouponMapper.selectList(lambdaQueryWrapper);
         List<MtUserCoupon> dataList = mtUserCouponMapper.selectList(lambdaQueryWrapper);
 
 
         PageRequest pageRequest = PageRequest.of(paginationRequest.getCurrentPage(), paginationRequest.getPageSize());
         PageRequest pageRequest = PageRequest.of(paginationRequest.getCurrentPage(), paginationRequest.getPageSize());
@@ -437,7 +437,7 @@ public class UserCouponServiceImpl extends ServiceImpl<MtUserCouponMapper, MtUse
                 MtCoupon couponInfo = couponService.queryCouponById(userCouponDto.getCouponId());
                 MtCoupon couponInfo = couponService.queryCouponById(userCouponDto.getCouponId());
                 MtUser userInfo = memberService.queryMemberById(userCouponDto.getUserId());
                 MtUser userInfo = memberService.queryMemberById(userCouponDto.getUserId());
                 MtStore storeInfo = storeService.queryStoreById(userCouponDto.getStoreId());
                 MtStore storeInfo = storeService.queryStoreById(userCouponDto.getStoreId());
-                if (couponInfo == null || userInfo == null) {
+                if (couponInfo == null) {
                     continue;
                     continue;
                 }
                 }