Merge branch 'master' of http://115.29.66.169:10080/yiyao_shop/api

ruoyi-shop/src/main/java/com/ruoyi/shop/coupon/domain/vo/CouponVo.java

@@ -138,6 +138,8 @@ public class CouponVo {
     @ApiModelProperty("发行的店铺")
     private Long businessId;
 
+    @ApiModelProperty("发行的店铺")
+    private String businessName;
     /**
      * 描述
      */

ruoyi-shop/src/main/java/com/ruoyi/shop/coupon/service/impl/CouponReceiveRecordServiceImpl.java

@@ -6,6 +6,7 @@ import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.business.service.IBusinessService;
 import com.ruoyi.common.core.domain.PageQuery;
 import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.exception.ServiceException;
@@ -46,6 +47,7 @@ public class CouponReceiveRecordServiceImpl implements ICouponReceiveRecordServi
     private final CouponReceiveRecordMapper baseMapper;
     private final ICouponService couponService;
     private final ICouponReceiveRecordUseService couponReceiveRecordUseService;
+    private final IBusinessService businessService;
 
     /**
      * 查询优惠券领取记录与使用情况分页
@@ -320,6 +322,10 @@ public class CouponReceiveRecordServiceImpl implements ICouponReceiveRecordServi
                 }
             }
             return false;
+        }).map(vo -> {
+            CouponVo couponVo = vo.getCouponVo();
+            couponVo.setBusinessName(businessService.queryNameById(couponVo.getBusinessId()));
+            return vo;
         }).collect(Collectors.toList());
     }
 

ruoyi-shop/src/main/java/com/ruoyi/shop/coupon/service/impl/CouponServiceImpl.java

@@ -9,6 +9,7 @@ import com.alibaba.fastjson.JSONArray;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.business.service.IBusinessService;
 import com.ruoyi.common.core.domain.PageQuery;
 import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.enums.AuditStatus;
@@ -55,6 +56,7 @@ public class CouponServiceImpl implements ICouponService {
     private final ICouponProductService couponProductService;
     private final ISysSequenceService sysSequenceService;
     private final IProductService productService;
+    private final IBusinessService businessService;
 
     /**
      * 查询优惠券分页
@@ -66,6 +68,9 @@ public class CouponServiceImpl implements ICouponService {
     public TableDataInfo<CouponVo> queryPageList(CouponBo bo, PageQuery pageQuery) {
         LambdaQueryWrapper<Coupon> lqw = buildQueryWrapper(bo);
         Page<CouponVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
+        result.getRecords().forEach(couponVo -> {
+            couponVo.setBusinessName(businessService.queryNameById(couponVo.getBusinessId()));
+        });
         return TableDataInfo.build(result);
     }
 
@@ -349,7 +354,12 @@ public class CouponServiceImpl implements ICouponService {
 
     @Override
     public CouponVo queryBaseById(Long couponId) {
-        return baseMapper.selectVoById(couponId);
+        CouponVo couponVo = baseMapper.selectVoById(couponId);
+        if (couponVo == null) {
+            return null;
+        }
+        couponVo.setBusinessName(businessService.queryNameById(couponVo.getBusinessId()));
+        return couponVo;
     }
 
     @Override

ruoyi-user/src/main/java/com/ruoyi/userCollect/service/impl/UserCollectServiceImpl.java

@@ -66,6 +66,7 @@ public class UserCollectServiceImpl implements IUserCollectService {
         lqw.eq(bo.getUserId() != null, UserCollect::getUserId, bo.getUserId());
         lqw.eq(bo.getEntityId() != null, UserCollect::getEntityId, bo.getEntityId());
         lqw.eq(bo.getEntityType() != null, UserCollect::getEntityType, bo.getEntityType());
+        lqw.orderByDesc(UserCollect::getCreateTime);
         return lqw;
     }