Merge remote-tracking branch 'origin/master'

feifan-module-distri/feifan-module-distri-biz/src/main/java/cn/newfeifan/mall/module/distri/dal/dataobject/integral/IntegralDO.java

@@ -47,4 +47,9 @@ public class IntegralDO extends BaseDO {
 
     private String nickName;
 
+    /**
+     * 合赢奖累计获取积分
+     */
+    private Integer accumulatedQuota = 0;
+
 }

feifan-module-mall/feifan-module-product-biz/src/main/java/cn/newfeifan/mall/module/product/convert/comment/ProductCommentConvert.java

@@ -36,6 +36,10 @@ public interface ProductCommentConvert {
         if (sku != null) {
             comment.setSkuPicUrl(sku.getPicUrl()).setSkuProperties(sku.getProperties());
         }
+
+        //加上评论的默认可见
+        comment.setVisible(Boolean.TRUE);
+
         return comment;
     }
 

feifan-module-mall/feifan-module-trade-biz/src/main/java/cn/newfeifan/mall/module/trade/controller/app/aftersale/vo/AppAfterSaleCreateReqVO.java

@@ -37,4 +37,10 @@ public class AppAfterSaleCreateReqVO {
     @Schema(description = "补充凭证图片", example = "https://www.zhongxing.cn/1.png, https://www.zhongxing.cn/2.png")
     private List<String> applyPicUrls;
 
+    @Schema(description = "店铺id", example = "17019")
+    private Long shopId;
+
+    @Schema(description = "商户id", example = "27067")
+    private Long merchantId;
+
 }

feifan-module-mall/feifan-module-trade-biz/src/main/java/cn/newfeifan/mall/module/trade/controller/app/aftersale/vo/AppAfterSaleDeliveryReqVO.java

@@ -21,4 +21,10 @@ public class AppAfterSaleDeliveryReqVO {
     @NotNull(message = "退货物流单号不能为空")
     private String logisticsNo;
 
+    @Schema(description = "店铺id", example = "17019")
+    private Long shopId;
+
+    @Schema(description = "商户id", example = "27067")
+    private Long merchantId;
+
 }

feifan-module-mall/feifan-module-trade-biz/src/main/java/cn/newfeifan/mall/module/trade/controller/app/aftersale/vo/AppAfterSaleRespVO.java

@@ -106,4 +106,10 @@ public class AppAfterSaleRespVO {
     @Schema(description = "收货备注")
     private String receiveReason;
 
+    @Schema(description = "店铺id", example = "17019")
+    private Long shopId;
+
+    @Schema(description = "商户id", example = "27067")
+    private Long merchantId;
+
 }

feifan-module-mall/feifan-module-trade-biz/src/main/java/cn/newfeifan/mall/module/trade/dal/dataobject/aftersale/AfterSaleDO.java

@@ -198,4 +198,13 @@ public class AfterSaleDO extends BaseDO {
      */
     private String receiveReason;
 
+    /**
+     * 店铺id
+     */
+    private Long shopId;
+    /**
+     * 商户id
+     */
+    private Long merchantId;
+
 }

feifan-module-mall/feifan-module-trade-biz/src/main/java/cn/newfeifan/mall/module/trade/service/aftersale/AfterSaleServiceImpl.java

@@ -160,6 +160,9 @@ public class AfterSaleServiceImpl implements AfterSaleService {
         afterSale.setOrderNo(order.getNo()); // 记录 orderNo 订单流水，方便后续检索
         afterSale.setType(TradeOrderStatusEnum.isCompleted(order.getStatus())
                 ? AfterSaleTypeEnum.AFTER_SALE.getType() : AfterSaleTypeEnum.IN_SALE.getType());
+        afterSale.setShopId(order.getShopId());
+        afterSale.setMerchantId(order.getMerchantId());
+
         tradeAfterSaleMapper.insert(afterSale);
 
         // 更新交易订单项的售后状态

feifan-module-member/feifan-module-member-biz/src/main/java/cn/newfeifan/mall/module/member/service/user/MemberUserServiceImpl.java

@@ -100,8 +100,9 @@ public class MemberUserServiceImpl implements MemberUserService {
         return privateCreateUser(mobile, nickname, avtar, registerIp, terminal, linkId);
     }
 
-    private MemberUserDO privateCreateUser(String mobile, String nickname, String avtar,
-                                           String registerIp, Integer terminal, Long linkId) {
+    @Transactional(rollbackFor = Exception.class)
+    public MemberUserDO privateCreateUser(String mobile, String nickname, String avtar,
+                                          String registerIp, Integer terminal, Long linkId) {
         // 生成密码
         String password = IdUtil.fastSimpleUUID();
         // 插入用户
@@ -123,7 +124,8 @@ public class MemberUserServiceImpl implements MemberUserService {
         return user;
     }
 
-    private void registerTransactionSynchronization(Long userId, Long linkId) {
+    @Transactional(rollbackFor = Exception.class)
+    public void registerTransactionSynchronization(Long userId, Long linkId) {
         TransactionSynchronizationManager.registerSynchronization(new TransactionSynchronizationAdapter() {
             @Override
             public void afterCommit() {