Merge remote-tracking branch 'origin/dev_v1_1_20220720' into dev_v1_1_20220720

cooleshow-mall/mall-admin/src/main/java/com/yonge/cooleshow/admin/service/OmsOrderReturnApplyService.java

@@ -5,6 +5,7 @@ import com.yonge.cooleshow.admin.dto.OmsOrderReturnApplyResult;
 import com.yonge.cooleshow.admin.dto.OmsReturnApplyQueryParam;
 import com.yonge.cooleshow.admin.dto.OmsUpdateStatusParam;
 import com.yonge.cooleshow.mbg.model.OmsOrderReturnApply;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.util.List;
 
@@ -21,11 +22,13 @@ public interface OmsOrderReturnApplyService {
     /**
      * 批量删除申请
      */
+    @Transactional
     int delete(List<Long> ids);
 
     /**
      * 修改指定申请状态
      */
+    @Transactional
     int updateStatus(Long id, OmsUpdateStatusParam statusParam);
 
     /**

cooleshow-mall/mall-admin/src/main/java/com/yonge/cooleshow/admin/service/OmsOrderReturnReasonService.java

@@ -1,6 +1,7 @@
 package com.yonge.cooleshow.admin.service;
 
 import com.yonge.cooleshow.mbg.model.OmsOrderReturnReason;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.util.List;
 
@@ -12,16 +13,19 @@ public interface OmsOrderReturnReasonService {
     /**
      * 添加退货原因
      */
+    @Transactional
     int create(OmsOrderReturnReason returnReason);
 
     /**
      * 修改退货原因
      */
+    @Transactional
     int update(Long id, OmsOrderReturnReason returnReason);
 
     /**
      * 批量删除退货原因
      */
+    @Transactional
     int delete(List<Long> ids);
 
     /**
@@ -32,6 +36,7 @@ public interface OmsOrderReturnReasonService {
     /**
      * 批量修改退货原因状态
      */
+    @Transactional
     int updateStatus(List<Long> ids, Integer status);
 
     /**

cooleshow-mall/mall-admin/src/main/java/com/yonge/cooleshow/admin/service/OmsOrderService.java

@@ -34,6 +34,7 @@ public interface OmsOrderService {
     /**
      * 批量删除订单
      */
+    @Transactional
     int delete(List<Long> ids);
 
     /**

cooleshow-mall/mall-admin/src/main/java/com/yonge/cooleshow/admin/service/OmsOrderSettingService.java

@@ -1,6 +1,7 @@
 package com.yonge.cooleshow.admin.service;
 
 import com.yonge.cooleshow.mbg.model.OmsOrderSetting;
+import org.springframework.transaction.annotation.Transactional;
 
 /**
  * 订单设置管理Service
@@ -15,5 +16,6 @@ public interface OmsOrderSettingService {
     /**
      * 修改指定订单设置
      */
+    @Transactional
     int update(Long id, OmsOrderSetting orderSetting);
 }

cooleshow-mall/mall-admin/src/main/java/com/yonge/cooleshow/admin/service/PmsBrandService.java

@@ -19,6 +19,7 @@ public interface PmsBrandService {
     /**
      * 创建品牌
      */
+    @Transactional
     int createBrand(PmsBrandParam pmsBrandParam);
 
     /**
@@ -30,11 +31,13 @@ public interface PmsBrandService {
     /**
      * 删除品牌
      */
+    @Transactional
     int deleteBrand(Long id);
 
     /**
      * 批量删除品牌
      */
+    @Transactional
     int deleteBrand(List<Long> ids);
 
     /**
@@ -50,10 +53,12 @@ public interface PmsBrandService {
     /**
      * 修改显示状态
      */
+    @Transactional
     int updateShowStatus(List<Long> ids, Integer showStatus);
 
     /**
      * 修改厂家制造商状态
      */
+    @Transactional
     int updateFactoryStatus(List<Long> ids, Integer factoryStatus);
 }

cooleshow-mall/mall-admin/src/main/java/com/yonge/cooleshow/admin/service/PmsProductAttributeCategoryService.java

@@ -2,6 +2,7 @@ package com.yonge.cooleshow.admin.service;
 
 import com.yonge.cooleshow.admin.dto.PmsProductAttributeCategoryItem;
 import com.yonge.cooleshow.mbg.model.PmsProductAttributeCategory;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.util.List;
 
@@ -13,16 +14,19 @@ public interface PmsProductAttributeCategoryService {
     /**
      * 创建属性分类
      */
+    @Transactional
     int create(String name);
 
     /**
      * 修改属性分类
      */
+    @Transactional
     int update(Long id, String name);
 
     /**
      * 删除属性分类
      */
+    @Transactional
     int delete(Long id);
 
     /**

cooleshow-mall/mall-admin/src/main/java/com/yonge/cooleshow/admin/service/PmsProductAttributeService.java

@@ -28,6 +28,7 @@ public interface PmsProductAttributeService {
     /**
      * 修改商品属性
      */
+    @Transactional
     int update(Long id, PmsProductAttributeParam productAttributeParam);
 
     /**

cooleshow-mall/mall-admin/src/main/java/com/yonge/cooleshow/admin/service/PmsProductCategoryService.java

@@ -32,6 +32,7 @@ public interface PmsProductCategoryService {
     /**
      * 删除商品分类
      */
+    @Transactional
     int delete(Long id);
 
     /**
@@ -42,11 +43,13 @@ public interface PmsProductCategoryService {
     /**
      * 批量修改导航状态
      */
+    @Transactional
     int updateNavStatus(List<Long> ids, Integer navStatus);
 
     /**
      * 批量修改显示状态
      */
+    @Transactional
     int updateShowStatus(List<Long> ids, Integer showStatus);
 
     /**

cooleshow-mall/mall-admin/src/main/java/com/yonge/cooleshow/admin/service/PmsProductService.java

@@ -50,21 +50,25 @@ public interface PmsProductService {
     /**
      * 批量修改商品上架状态
      */
+    @Transactional
     int updatePublishStatus(List<Long> ids, Integer publishStatus);
 
     /**
      * 批量修改商品推荐状态
      */
+    @Transactional
     int updateRecommendStatus(List<Long> ids, Integer recommendStatus);
 
     /**
      * 批量修改新品状态
      */
+    @Transactional
     int updateNewStatus(List<Long> ids, Integer newStatus);
 
     /**
      * 批量删除商品
      */
+    @Transactional
     int updateDeleteStatus(List<Long> ids, Integer deleteStatus);
 
     /**

cooleshow-mall/mall-admin/src/main/java/com/yonge/cooleshow/admin/service/PmsSkuStockService.java

@@ -1,6 +1,7 @@
 package com.yonge.cooleshow.admin.service;
 
 import com.yonge.cooleshow.mbg.model.PmsSkuStock;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.util.List;
 
@@ -17,5 +18,6 @@ public interface PmsSkuStockService {
     /**
      * 批量更新商品库存信息
      */
+    @Transactional
     int update(Long pid, List<PmsSkuStock> skuStockList);
 }

cooleshow-mall/mall-admin/src/main/java/com/yonge/cooleshow/admin/service/SmsFlashPromotionProductRelationService.java

@@ -20,11 +20,13 @@ public interface SmsFlashPromotionProductRelationService {
     /**
      * 修改关联信息
      */
+    @Transactional
     int update(Long id, SmsFlashPromotionProductRelation relation);
 
     /**
      * 删除关联
      */
+    @Transactional
     int delete(Long id);
 
     /**

cooleshow-mall/mall-admin/src/main/java/com/yonge/cooleshow/admin/service/SmsFlashPromotionService.java

@@ -1,6 +1,7 @@
 package com.yonge.cooleshow.admin.service;
 
 import com.yonge.cooleshow.mbg.model.SmsFlashPromotion;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.util.List;
 
@@ -12,21 +13,25 @@ public interface SmsFlashPromotionService {
     /**
      * 添加活动
      */
+    @Transactional
     int create(SmsFlashPromotion flashPromotion);
 
     /**
      * 修改指定活动
      */
+    @Transactional
     int update(Long id, SmsFlashPromotion flashPromotion);
 
     /**
      * 删除单个活动
      */
+    @Transactional
     int delete(Long id);
 
     /**
      * 修改上下线状态
      */
+    @Transactional
     int updateStatus(Long id, Integer status);
 
     /**

cooleshow-mall/mall-admin/src/main/java/com/yonge/cooleshow/admin/service/SmsFlashPromotionSessionService.java

@@ -2,6 +2,7 @@ package com.yonge.cooleshow.admin.service;
 
 import com.yonge.cooleshow.admin.dto.SmsFlashPromotionSessionDetail;
 import com.yonge.cooleshow.mbg.model.SmsFlashPromotionSession;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.util.List;
 
@@ -13,21 +14,25 @@ public interface SmsFlashPromotionSessionService {
     /**
      * 添加场次
      */
+    @Transactional
     int create(SmsFlashPromotionSession promotionSession);
 
     /**
      * 修改场次
      */
+    @Transactional
     int update(Long id, SmsFlashPromotionSession promotionSession);
 
     /**
      * 修改场次启用状态
      */
+    @Transactional
     int updateStatus(Long id, Integer status);
 
     /**
      * 删除场次
      */
+    @Transactional
     int delete(Long id);
 
     /**

cooleshow-mall/mall-admin/src/main/java/com/yonge/cooleshow/admin/service/SmsHomeAdvertiseService.java

@@ -1,6 +1,7 @@
 package com.yonge.cooleshow.admin.service;
 
 import com.yonge.cooleshow.mbg.model.SmsHomeAdvertise;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.util.List;
 
@@ -12,16 +13,19 @@ public interface SmsHomeAdvertiseService {
     /**
      * 添加广告
      */
+    @Transactional
     int create(SmsHomeAdvertise advertise);
 
     /**
      * 批量删除广告
      */
+    @Transactional
     int delete(List<Long> ids);
 
     /**
      * 修改上、下线状态
      */
+    @Transactional
     int updateStatus(Long id, Integer status);
 
     /**
@@ -32,6 +36,7 @@ public interface SmsHomeAdvertiseService {
     /**
      * 更新广告
      */
+    @Transactional
     int update(Long id, SmsHomeAdvertise advertise);
 
     /**

cooleshow-mall/mall-admin/src/main/java/com/yonge/cooleshow/admin/service/SmsHomeBrandService.java

@@ -19,16 +19,19 @@ public interface SmsHomeBrandService {
     /**
      * 修改品牌推荐排序
      */
+    @Transactional
     int updateSort(Long id, Integer sort);
 
     /**
      * 批量删除品牌推荐
      */
+    @Transactional
     int delete(List<Long> ids);
 
     /**
      * 批量更新推荐状态
      */
+    @Transactional
     int updateRecommendStatus(List<Long> ids, Integer recommendStatus);
 
     /**

cooleshow-mall/mall-admin/src/main/java/com/yonge/cooleshow/admin/service/SmsHomeNewProductService.java

@@ -19,16 +19,19 @@ public interface SmsHomeNewProductService {
     /**
      * 修改推荐排序
      */
+    @Transactional
     int updateSort(Long id, Integer sort);
 
     /**
      * 批量删除推荐
      */
+    @Transactional
     int delete(List<Long> ids);
 
     /**
      * 批量更新推荐状态
      */
+    @Transactional
     int updateRecommendStatus(List<Long> ids, Integer recommendStatus);
 
     /**

cooleshow-mall/mall-admin/src/main/java/com/yonge/cooleshow/admin/service/SmsHomeRecommendProductService.java

@@ -19,16 +19,19 @@ public interface SmsHomeRecommendProductService {
     /**
      * 修改推荐排序
      */
+    @Transactional
     int updateSort(Long id, Integer sort);
 
     /**
      * 批量删除推荐
      */
+    @Transactional
     int delete(List<Long> ids);
 
     /**
      * 批量更新推荐状态
      */
+    @Transactional
     int updateRecommendStatus(List<Long> ids, Integer recommendStatus);
 
     /**

cooleshow-mall/mall-admin/src/main/java/com/yonge/cooleshow/admin/service/SmsHomeRecommendSubjectService.java

@@ -19,16 +19,19 @@ public interface SmsHomeRecommendSubjectService {
     /**
      * 修改推荐排序
      */
+    @Transactional
     int updateSort(Long id, Integer sort);
 
     /**
      * 批量删除推荐
      */
+    @Transactional
     int delete(List<Long> ids);
 
     /**
      * 批量更新推荐状态
      */
+    @Transactional
     int updateRecommendStatus(List<Long> ids, Integer recommendStatus);
 
     /**

cooleshow-mall/mall-admin/src/main/java/com/yonge/cooleshow/admin/service/UmsMenuService.java

@@ -2,6 +2,7 @@ package com.yonge.cooleshow.admin.service;
 
 import com.yonge.cooleshow.admin.dto.UmsMenuNode;
 import com.yonge.cooleshow.mbg.model.UmsMenu;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.util.List;
 
@@ -13,11 +14,13 @@ public interface UmsMenuService {
     /**
      * 创建后台菜单
      */
+    @Transactional
     int create(UmsMenu umsMenu);
 
     /**
      * 修改后台菜单
      */
+    @Transactional
     int update(Long id, UmsMenu umsMenu);
 
     /**
@@ -28,6 +31,7 @@ public interface UmsMenuService {
     /**
      * 根据ID删除菜单
      */
+    @Transactional
     int delete(Long id);
 
     /**
@@ -43,5 +47,6 @@ public interface UmsMenuService {
     /**
      * 修改菜单显示状态
      */
+    @Transactional
     int updateHidden(Long id, Integer hidden);
 }

cooleshow-mall/mall-admin/src/main/java/com/yonge/cooleshow/admin/service/UmsResourceCategoryService.java

@@ -1,6 +1,7 @@
 package com.yonge.cooleshow.admin.service;
 
 import com.yonge.cooleshow.mbg.model.UmsResourceCategory;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.util.List;
 
@@ -18,15 +19,18 @@ public interface UmsResourceCategoryService {
     /**
      * 创建资源分类
      */
+    @Transactional
     int create(UmsResourceCategory umsResourceCategory);
 
     /**
      * 修改资源分类
      */
+    @Transactional
     int update(Long id, UmsResourceCategory umsResourceCategory);
 
     /**
      * 删除资源分类
      */
+    @Transactional
     int delete(Long id);
 }

cooleshow-mall/mall-admin/src/main/java/com/yonge/cooleshow/admin/service/UmsResourceService.java

@@ -1,6 +1,7 @@
 package com.yonge.cooleshow.admin.service;
 
 import com.yonge.cooleshow.mbg.model.UmsResource;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.util.List;
 
@@ -12,11 +13,13 @@ public interface UmsResourceService {
     /**
      * 添加资源
      */
+    @Transactional
     int create(UmsResource umsResource);
 
     /**
      * 修改资源
      */
+    @Transactional
     int update(Long id, UmsResource umsResource);
 
     /**
@@ -27,6 +30,7 @@ public interface UmsResourceService {
     /**
      * 删除资源
      */
+    @Transactional
     int delete(Long id);
 
     /**

cooleshow-mall/mall-admin/src/main/java/com/yonge/cooleshow/admin/service/UmsRoleService.java

@@ -15,16 +15,19 @@ public interface UmsRoleService {
     /**
      * 添加角色
      */
+    @Transactional
     int create(UmsRole role);
 
     /**
      * 修改角色信息
      */
+    @Transactional
     int update(Long id, UmsRole role);
 
     /**
      * 批量删除角色
      */
+    @Transactional
     int delete(List<Long> ids);
 
     /**

cooleshow-mall/mall-portal/src/main/java/com/yonge/cooleshow/portal/service/MemberAttentionService.java

@@ -2,6 +2,7 @@ package com.yonge.cooleshow.portal.service;
 
 import com.yonge.cooleshow.portal.domain.MemberBrandAttention;
 import org.springframework.data.domain.Page;
+import org.springframework.transaction.annotation.Transactional;
 
 /**
  * 会员品牌关注管理Service
@@ -11,11 +12,13 @@ public interface MemberAttentionService {
     /**
      * 添加关注
      */
+    @Transactional
     int add(MemberBrandAttention memberBrandAttention);
 
     /**
      * 取消关注
      */
+    @Transactional
     int delete(Long brandId);
 
     /**
@@ -31,5 +34,6 @@ public interface MemberAttentionService {
     /**
      * 清空关注列表
      */
+    @Transactional
     void clear();
 }

cooleshow-mall/mall-portal/src/main/java/com/yonge/cooleshow/portal/service/MemberCollectionService.java

@@ -2,6 +2,7 @@ package com.yonge.cooleshow.portal.service;
 
 import com.yonge.cooleshow.portal.domain.MemberProductCollection;
 import org.springframework.data.domain.Page;
+import org.springframework.transaction.annotation.Transactional;
 
 /**
  * 会员商品收藏管理Service
@@ -11,11 +12,13 @@ public interface MemberCollectionService {
     /**
      * 添加收藏
      */
+    @Transactional
     int add(MemberProductCollection productCollection);
 
     /**
      * 删除收藏
      */
+    @Transactional
     int delete(Long productId);
 
     /**
@@ -31,5 +34,6 @@ public interface MemberCollectionService {
     /**
      * 清空收藏
      */
+    @Transactional
     void clear();
 }

cooleshow-mall/mall-portal/src/main/java/com/yonge/cooleshow/portal/service/MemberReadHistoryService.java

@@ -2,6 +2,7 @@ package com.yonge.cooleshow.portal.service;
 
 import com.yonge.cooleshow.portal.domain.MemberReadHistory;
 import org.springframework.data.domain.Page;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.util.List;
 
@@ -13,11 +14,13 @@ public interface MemberReadHistoryService {
     /**
      * 生成浏览记录
      */
+    @Transactional
     int create(MemberReadHistory memberReadHistory);
 
     /**
      * 批量删除浏览记录
      */
+    @Transactional
     int delete(List<String> ids);
 
     /**
@@ -28,5 +31,6 @@ public interface MemberReadHistoryService {
     /**
      * 清空浏览记录
      */
+    @Transactional
     void clear();
 }

cooleshow-mall/mall-portal/src/main/java/com/yonge/cooleshow/portal/service/OmsCartItemService.java

@@ -32,11 +32,13 @@ public interface OmsCartItemService {
     /**
      * 修改某个购物车商品的数量
      */
+    @Transactional
     int updateQuantity(Long id, Long memberId, Integer quantity);
 
     /**
      * 批量删除购物车中的商品
      */
+    @Transactional
     int delete(Long memberId,List<Long> ids);
 
     /**
@@ -53,6 +55,7 @@ public interface OmsCartItemService {
     /**
      * 清空购物车
      */
+    @Transactional
     int clear(Long memberId);
 
     OmsCartItem get(Long id);

cooleshow-mall/mall-portal/src/main/java/com/yonge/cooleshow/portal/service/OmsPortalOrderReturnApplyService.java

@@ -6,6 +6,7 @@ import com.yonge.cooleshow.portal.dto.OmsOrderReturnApplyVo;
 import com.yonge.cooleshow.portal.dto.OmsReturnApplyDto;
 import com.yonge.cooleshow.portal.dto.OmsReturnApplyQueryParam;
 import com.yonge.toolset.payment.base.model.callback.PaymentCallBack;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.util.List;
 
@@ -17,12 +18,14 @@ public interface OmsPortalOrderReturnApplyService {
     /**
      * 提交申请
      */
+    @Transactional
     int create(OmsOrderReturnApplyParam returnApply);
 
     /**
      * 取消申请
      *
      */
+    @Transactional
     int delete(Long id);
 
     OmsOrderReturnApplyResult getItem(Long id);
@@ -30,7 +33,9 @@ public interface OmsPortalOrderReturnApplyService {
     List<OmsOrderReturnApplyVo> list(OmsReturnApplyQueryParam queryParam, Integer pageSize, Integer pageNum);
 
     /** 设置退货单号 */
+    @Transactional
     void setDeliverySn(OmsReturnApplyDto applyDto);
 
+    @Transactional
     void refundPaymentCallBack(PaymentCallBack data);
 }

cooleshow-mall/mall-portal/src/main/java/com/yonge/cooleshow/portal/service/UmsMemberReceiveAddressService.java

@@ -13,12 +13,14 @@ public interface UmsMemberReceiveAddressService {
     /**
      * 添加收货地址
      */
+    @Transactional
     int add(UmsMemberReceiveAddress address);
 
     /**
      * 删除收货地址
      * @param id 地址表的id
      */
+    @Transactional
     int delete(Long id);
 
     /**

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/UserAccountServiceImpl.java

@@ -396,6 +396,7 @@ public class UserAccountServiceImpl extends ServiceImpl<UserAccountDao, UserAcco
     }
 
     @Override
+    @Transactional
     public void mallTeacherRecordState(List<MallOrderItemDto> shareDto) {
         if (CollectionUtils.isEmpty(shareDto)) {
             return;
@@ -436,6 +437,7 @@ public class UserAccountServiceImpl extends ServiceImpl<UserAccountDao, UserAcco
      * @return
      */
     @Override
+    @Transactional
     public boolean saveMallAccountRecord(List<MallOrderItemDto> shareDto) {
         if (CollectionUtils.isEmpty(shareDto)) {
             return false;