Merge remote-tracking branch 'origin/master'

src/main/java/com/aida/seller/module/designer/feign/AiDABackFeignClient.java

@@ -0,0 +1,14 @@
+package com.aida.seller.module.designer.feign;
+
+import com.aida.seller.common.result.Response;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+
+@FeignClient(name = "aida-back", path = "/api/message")
+public interface AiDABackFeignClient {
+
+    @PostMapping("/sellerApprovalNotice")
+    Response<String> sellerApprovalNotice(@RequestParam("userId") Long userId, @RequestParam("isApproved") boolean isApproved);
+
+}

src/main/java/com/aida/seller/module/designer/service/DesignerServiceImpl.java

@@ -8,6 +8,7 @@ import com.aida.seller.module.designer.dto.DesignerAuditDTO;
 import com.aida.seller.module.designer.dto.DesignerDTO;
 import com.aida.seller.module.designer.entity.DesignerEntity;
 import com.aida.seller.module.designer.enums.DesignerApplyStatusEnum;
+import com.aida.seller.module.designer.feign.AiDABackFeignClient;
 import com.aida.seller.module.designer.mapper.DesignerMapper;
 import com.aida.seller.module.designer.vo.DesignerCheckVO;
 import com.aida.seller.module.designer.vo.DesignerSearchVO;
@@ -45,6 +46,7 @@ public class DesignerServiceImpl extends ServiceImpl<DesignerMapper, DesignerEnt
     private final OrderItemMapper orderItemMapper;
     private final ListingMapper listingMapper;
     private final ListingImageMapper listingImageMapper;
+    private final AiDABackFeignClient aidaBackFeignClient;
 
     @Override
     public DesignerCheckVO checkQualification(Long userId) {
@@ -167,6 +169,10 @@ public class DesignerServiceImpl extends ServiceImpl<DesignerMapper, DesignerEnt
         }
 
         this.updateById(entity);
+
+        // 站内信通知和邮件通知
+        aidaBackFeignClient.sellerApprovalNotice(dto.getUserId(), dto.getAuditStatus().equals(1));
+
     }
 
     @Override

src/main/java/com/aida/seller/module/order/service/OrderServiceImpl.java

@@ -138,6 +138,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfoEnti
             vo.setPrice(order.getTotalPrice());
             vo.setBuyerUsername("@" + (order.getBuyerUsername() != null ? order.getBuyerUsername() : ""));
             vo.setDate(order.getCreateTime());
+            vo.setPaymentId(order.getPaymentId());
 
             List<OrderItemEntity> items = itemsMap.getOrDefault(order.getId(), new ArrayList<>());
             List<OrderVO.ItemVO> itemVOs = items.stream().map(item -> {
@@ -191,6 +192,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfoEnti
             vo.setStatus(order.getStatus());
             vo.setShopName(order.getShopName());
             vo.setSellerId(order.getSellerId());
+            vo.setPaymentId(order.getPaymentId());
 
             List<OrderItemEntity> items = itemsMap.getOrDefault(order.getId(), Collections.emptyList());
             List<BuyerOrderItemVO> itemVOs = items.stream().map(item -> {

src/main/java/com/aida/seller/module/order/vo/BuyerOrderVO.java

@@ -38,4 +38,8 @@ public class BuyerOrderVO implements Serializable {
 
     @Schema(description = "商品明细列表")
     private List<BuyerOrderItemVO> items;
+
+    @Schema(description = "支付ID")
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long paymentId;
 }

src/main/java/com/aida/seller/module/order/vo/OrderVO.java

@@ -20,6 +20,9 @@ public class OrderVO implements Serializable {
     @JsonSerialize(using = ToStringSerializer.class)
     private Long orderId;
 
+    @Schema(description = "交易流水号")
+    private Long paymentId;
+
     @Schema(description = "商品明细列表")
     private List<ItemVO> items;