Merge branch 'dev/2024/0410/update-order' of Harper/feifan-backend-zx-business into master

完善商户订单剩余部分

feifan-module-mall/feifan-module-product-biz/src/main/java/cn/newfeifan/mall/module/product/controller/admin/comment/ProductCommentController.java

@@ -36,7 +36,7 @@ public class ProductCommentController {
     }
     @GetMapping("/page_order_id")
     @Operation(summary = "新增接口20240229-获得商品评价分页 传输orderId即可")
-    @PreAuthorize("@ss.hasPermission('product:comment:query')")
+    @PreAuthorize("@ss.hasPermission('product:comment:query-sh')")
     public CommonResult<PageResult<ProductCommentRespVO>> getCommentPageByOrderId(@Valid ProductCommentPageReqVO pageVO) {
         PageResult<ProductCommentDO> pageResult = productCommentService.getCommentPage(pageVO);
         return success(BeanUtils.toBean(pageResult, ProductCommentRespVO.class));

feifan-module-mall/feifan-module-trade-biz/src/main/java/cn/newfeifan/mall/module/trade/controller/admin/order/TradeOrderDetailController.java

@@ -109,11 +109,11 @@ public class TradeOrderDetailController {
 
     @GetMapping("/after_saleByMer")
         @Operation(summary = "新增接口20240402-售后信息-商户查询售后")
-    @Parameter(name = "merId", description = "商户ID", required = true, example = "1")
+    @Parameter(name = "id", description = "订单ID", required = true, example = "1")
     @PreAuthorize("@ss.hasPermission('trade:order:query')")
-    public CommonResult<List<AfterSaleDetailRespVO>> afterSaleByMer(@RequestParam("merId") Long merId) {
+    public CommonResult<List<AfterSaleDetailRespVO>> afterSaleByMer(@RequestParam("id") Long id) {
         // 查询订单
-        List<TradeOrderDO> orders = tradeOrderQueryService.getOrderByMerId(merId);
+        List<TradeOrderDO> orders = tradeOrderQueryService.getOrderByMerId(id);
         if (orders.isEmpty()) {
             return success(null);
         }
@@ -168,7 +168,7 @@ public class TradeOrderDetailController {
         } else {
             build.setPayStatus(payOrderDO.getStatus() == 0 ? "未支付" : "已支付");
         }
-        return success(null);
+        return success(build);
     }
 
     @GetMapping("/productInfo")

feifan-module-mall/feifan-module-trade-biz/src/main/java/cn/newfeifan/mall/module/trade/dal/mysql/order/TradeOrderMapper.java

@@ -146,9 +146,12 @@ public interface TradeOrderMapper extends BaseMapperX<TradeOrderDO> {
                 .eqIfPresent(TradeOrderDO::getMerchantId, key))));
     }
 
-    default List<TradeOrderDO> selectOrderListByMerId(Long merId){
+    default List<TradeOrderDO> selectOrderListByMerId(Long id, Long merId, Long shopId) {
         return selectList(new LambdaQueryWrapperX<TradeOrderDO>()
-                .eq(TradeOrderDO::getMerchantId, merId));
+                .eq(TradeOrderDO::getMerchantId, merId)
+                .eq(TradeOrderDO::getShopId, shopId)
+                .eq(TradeOrderDO::getId, id)
+        );
     }
 
     ;

feifan-module-mall/feifan-module-trade-biz/src/main/java/cn/newfeifan/mall/module/trade/service/order/TradeOrderQueryService.java

@@ -192,8 +192,8 @@ public interface TradeOrderQueryService {
 
     /**
      * 获取商户下的订单
-     * @param merId 商户ID
+     * @param id 订单id
      * @return 该商户下的订单
      */
-    List<TradeOrderDO> getOrderByMerId(Long merId);
+    List<TradeOrderDO> getOrderByMerId(Long id);
 }

feifan-module-mall/feifan-module-trade-biz/src/main/java/cn/newfeifan/mall/module/trade/service/order/TradeOrderQueryServiceImpl.java

@@ -11,6 +11,9 @@ import cn.newfeifan.mall.module.member.api.user.dto.MemberUserRespDTO;
 import cn.newfeifan.mall.module.pay.controller.admin.order.vo.PayOrderPageItemRespVO;
 import cn.newfeifan.mall.module.product.api.sku.ProductSkuApi;
 import cn.newfeifan.mall.module.product.api.sku.dto.ProductSkuRespDTO;
+import cn.newfeifan.mall.module.system.dal.dataobject.user.AdminUserDO;
+import cn.newfeifan.mall.module.system.dal.mysql.user.AdminUserMapper;
+import cn.newfeifan.mall.module.trade.controller.admin.delivery.vo.expresstemplate.ShopBO;
 import cn.newfeifan.mall.module.trade.controller.admin.order.vo.TradeOrderPageReqVO;
 import cn.newfeifan.mall.module.trade.controller.admin.order.vo.TradeOrderSummaryRespVO;
 import cn.newfeifan.mall.module.trade.controller.app.order.vo.AppTradeOrderPageReqVO;
@@ -26,7 +29,11 @@ import cn.newfeifan.mall.module.trade.framework.delivery.core.client.ExpressClie
 import cn.newfeifan.mall.module.trade.framework.delivery.core.client.dto.ExpressTrackQueryReqDTO;
 import cn.newfeifan.mall.module.trade.framework.delivery.core.client.dto.ExpressTrackRespDTO;
 import cn.newfeifan.mall.module.trade.service.delivery.DeliveryExpressService;
+import com.alibaba.fastjson.JSONObject;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.cache.annotation.Cacheable;
+import org.springframework.data.redis.core.StringRedisTemplate;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
@@ -35,6 +42,7 @@ import java.util.stream.Collectors;
 
 import static cn.newfeifan.mall.framework.common.exception.util.ServiceExceptionUtil.exception;
 import static cn.newfeifan.mall.framework.common.util.collection.CollectionUtils.convertSet;
+import static cn.newfeifan.mall.framework.security.core.util.SecurityFrameworkUtils.getLoginUserId;
 import static cn.newfeifan.mall.module.trade.enums.ErrorCodeConstants.EXPRESS_NOT_EXISTS;
 import static cn.newfeifan.mall.module.trade.enums.ErrorCodeConstants.ORDER_NOT_FOUND;
 
@@ -44,6 +52,7 @@ import static cn.newfeifan.mall.module.trade.enums.ErrorCodeConstants.ORDER_NOT_
  * @author 非繁源码
  */
 @Service
+@Slf4j
 public class TradeOrderQueryServiceImpl implements TradeOrderQueryService {
 
     @Resource
@@ -63,6 +72,12 @@ public class TradeOrderQueryServiceImpl implements TradeOrderQueryService {
     @Resource
     private ProductSkuApi productSkuApi;
 
+    @Resource
+    private StringRedisTemplate stringRedisTemplate;
+
+    @Resource
+    private AdminUserMapper userMapper;
+
 
     // =================== Order ===================
 
@@ -190,8 +205,25 @@ public class TradeOrderQueryServiceImpl implements TradeOrderQueryService {
     }
 
     @Override
-    public List<TradeOrderDO> getOrderByMerId(Long merId) {
-        return tradeOrderMapper.selectOrderListByMerId(merId);
+    public List<TradeOrderDO> getOrderByMerId(Long id) {
+        ShopBO shop = getShop();
+        return tradeOrderMapper.selectOrderListByMerId(id,shop.getMerId(),shop.getShopId());
+    }
+
+    private ShopBO getShop() {
+        Long loginUserId = getLoginUserId();
+        String s = stringRedisTemplate.opsForValue().get("shop:" + loginUserId);
+        if (StringUtils.isEmpty(s)) {
+            AdminUserDO adminUserDO = userMapper.selectById(loginUserId);
+            ShopBO shop = new ShopBO();
+            shop.setShopId(adminUserDO.getShopId());
+            shop.setMerId(adminUserDO.getMerchantId());
+            log.info("====shop:{}",shop);
+            return shop;
+        } else {
+            log.info("====shop:{}",s);
+            return JSONObject.parseObject(s, ShopBO.class);
+        }
     }
 
     @Override