卡包相关

admin-web/src/views/admin/activity/userCoupon/index.vue

@@ -247,7 +247,7 @@ const loadData = (refresh: boolean = false) => {
     state.pageQuery.pageNum = 1;
   }
   state.tableData.loading = true;
-  $get(`/user-coupon/list`, {...state.formQuery, ...state.pageQuery}).then((res: any) => {
+  $get(`/coupon/listUserCoupons`, {...state.formQuery, ...state.pageQuery}).then((res: any) => {
     let {list, total} = res;
     state.tableData.data = list;
     state.pageQuery.total = total;

mapper/src/main/resources/mappers/miniapp/UserCouponMapper.xml

@@ -6,7 +6,9 @@
     <resultMap id="BaseResultMap" type="com.kym.entity.miniapp.UserCoupon">
         <result column="id" property="id" />
         <result column="coupon_id" property="couponId" />
+        <result column="coupon_name" property="couponName" />
         <result column="activity_id" property="activityId" />
+        <result column="activity_name" property="activityName" />
         <result column="user_id" property="userId" />
         <result column="start_time" property="startTime" />
         <result column="end_time" property="endTime" />

service/src/main/java/com/kym/service/admin/impl/ActivityServiceImpl.java

@@ -101,6 +101,7 @@ public class ActivityServiceImpl extends MPJBaseServiceImpl<ActivityMapper, Acti
             List<Coupon> couponList = activityVo.getCouponList().stream().peek(coupon -> {
                 BeanUtils.copyProperties(activity, coupon, "id", "name");
                 coupon.setActivityId(activity.getId());
+//                coupon.setStatus(Coupon.STATUS_有效);
             }).collect(Collectors.toList());
             couponService.saveBatch(couponList);
         }

service/src/main/java/com/kym/service/admin/impl/CouponServiceImpl.java

@@ -87,6 +87,7 @@ public class CouponServiceImpl extends ServiceImpl<CouponMapper, Coupon> impleme
         var activityList = activityService.listByIds(coupons.stream().map(Coupon::getActivityId).toList());
         users.forEach(user -> {
             for (Coupon coupon : coupons) {
+//                CommUtil.asserts(coupon.getStatus()==Coupon.STATUS_有效, String.format("优惠券[%s]已失效",coupon.getName()));
                 var userCoupon = new UserCoupon();
                 userCoupon.setActivityId(coupon.getActivityId());
                 userCoupon.setActivityName(Objects.requireNonNull(activityList.stream().filter(activity -> activity.getId().equals(coupon.getActivityId())).findFirst().orElse(null)).getName());
@@ -101,6 +102,7 @@ public class CouponServiceImpl extends ServiceImpl<CouponMapper, Coupon> impleme
                 userCoupon.setMinServiceMoney(coupon.getMinServiceMoney());
                 userCoupon.setAllowStacke(coupon.getAllowStacke());
                 userCoupon.setRemark(coupon.getRemark());
+                userCoupon.setStatus(Coupon.STATUS_有效);
                 userCouponSender.sendMessage(userCoupon);
             }
         });

service/src/main/java/com/kym/service/miniapp/impl/UserServiceImpl.java

@@ -37,6 +37,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.time.LocalDateTime;
+import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
@@ -249,9 +250,12 @@ public class UserServiceImpl extends MPJBaseServiceImpl<UserMapper, User> implem
         List<Long> userIds = null;
         if (!CommUtil.isEmptyOrNull(params.getMobilePhone())) {
             userIds = lambdaQuery().
-                    eq(User::getMobilePhone, params.getMobilePhone())
+                    like(User::getMobilePhone, params.getMobilePhone())
                     .eq(!CommUtil.isEmptyOrNull(params.getStatus()),User::getStatus, params.getStatus()).list().stream().map(User::getId).toList();
         }
+        if (CommUtil.isEmptyOrNull(userIds)) {
+            return new PageBean<>(Collections.emptyList());
+        }
         PageHelper.startPage(params.getPageNum(), params.getPageSize());
         var result = baseMapper.listUser(userIds);
         var page = new PageBean<>(result);