Merge remote-tracking branch 'origin/dev' into dev

# Conflicts:
#	service/src/main/java/com/kym/service/miniapp/impl/UserServiceImpl.java

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

@@ -106,6 +106,7 @@ public class ActivityServiceImpl extends MyBaseServiceImpl<ActivityMapper, Activ
             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

@@ -32,13 +32,13 @@ import lombok.SneakyThrows;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.BeanUtils;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.time.LocalDateTime;
 import java.util.List;
+import java.util.Map;
 import java.util.stream.Collectors;
 
 import static java.util.Map.of;
@@ -56,28 +56,28 @@ import static java.util.Map.of;
 public class UserServiceImpl extends MPJBaseServiceImpl<UserMapper, User> implements UserService {
     private static final Logger LOGGER = LoggerFactory.getLogger(UserServiceImpl.class);
     private final WxConfig wxConfig;
+    private final AccountService accountService;
     private final RefundLogService refundLogService;
     private final CarsService carsService;
     private final UserRechargeRightsService userRechargeRightsService;
     private final RechargeRightsService rechargeRightsService;
+    private final ActivityService activityService;
     private final BannerService bannerService;
 
-    private final AccountService accountService;
-    private final ActivityService activityService;
     private final UserCouponService userCouponService;
 
-    public UserServiceImpl(WxConfig wxConfig, RefundLogService refundLogService,
+    public UserServiceImpl(WxConfig wxConfig,@Lazy AccountService accountService, RefundLogService refundLogService,
                            CarsService carsService, UserRechargeRightsService userRechargeRightsService,
-                           RechargeRightsService rechargeRightsService, BannerService bannerService,
-                           @Lazy AccountService accountService, @Lazy ActivityService activityService,@Lazy UserCouponService userCouponService) {
+                           RechargeRightsService rechargeRightsService, @Lazy ActivityService activityService,
+                           BannerService bannerService,@Lazy UserCouponService userCouponService) {
         this.wxConfig = wxConfig;
+        this.accountService = accountService;
         this.refundLogService = refundLogService;
         this.carsService = carsService;
         this.userRechargeRightsService = userRechargeRightsService;
         this.rechargeRightsService = rechargeRightsService;
-        this.bannerService = bannerService;
-        this.accountService = accountService;
         this.activityService = activityService;
+        this.bannerService = bannerService;
         this.userCouponService = userCouponService;
     }
 
@@ -87,7 +87,7 @@ public class UserServiceImpl extends MPJBaseServiceImpl<UserMapper, User> implem
     @Override
     public R<?> wxLogin(WxLoginParams params) {
         // 微信登录
-        var json = HttpUtil.getJson(WxApi.WX_MP_LOGIN.getApi(), of(
+        var json = HttpUtil.getJson(WxApi.WX_MP_LOGIN.getApi(), Map.of(
                 "appid", wxConfig.getAppid(),
                 "secret", wxConfig.getSecret(),
                 "js_code", params.getCode()
@@ -111,9 +111,9 @@ public class UserServiceImpl extends MPJBaseServiceImpl<UserMapper, User> implem
                 newUser.setUnionid(unionid);
                 // 手机号解密:先获取access_token,再请求手机号信息
                 // access_token获取
-                var accessTokenJson = HttpUtil.getJson(WxApi.WX_GET_ACCESS_TOKEN.getApi(), of("appid", wxConfig.getAppid(), "secret", wxConfig.getSecret()));
+                var accessTokenJson = HttpUtil.getJson(WxApi.WX_GET_ACCESS_TOKEN.getApi(), Map.of("appid", wxConfig.getAppid(), "secret", wxConfig.getSecret()));
                 var accessToken = accessTokenJson.getString("access_token");
-                var wxPhoneNum = HttpUtil.post(WxApi.WX_MP_GET_PHONE.getApi().replace("ACCESS_TOKEN", accessToken), of("code", params.getPhoneCode()), WxPhoneNum.class);
+                var wxPhoneNum = HttpUtil.post(WxApi.WX_MP_GET_PHONE.getApi().replace("ACCESS_TOKEN", accessToken), Map.of("code", params.getPhoneCode()), WxPhoneNum.class);
                 var mobilePhone = wxPhoneNum.getPhone_info().getPurePhoneNumber();
                 newUser.setMobilePhone(mobilePhone);
                 newUser.setUsername(mobilePhone);
@@ -218,7 +218,7 @@ public class UserServiceImpl extends MPJBaseServiceImpl<UserMapper, User> implem
                 car.setVin(userVo.getVin());
             }
             // 将用户名下其他车辆设为非默认
-            var cars = carsService.listByMap(of("user_id", userVo.getId()));
+            var cars = carsService.listByMap(Map.of("user_id", userVo.getId()));
             cars.stream().filter(c -> !userVo.getDefaultPlateNo().equals(c.getEngineNo())).peek(s -> s.setIsDefault(false)).collect(Collectors.toList());
             carsService.updateBatchById(cars);
             var wrapper = new QueryWrapper<Cars>();
@@ -278,4 +278,5 @@ public class UserServiceImpl extends MPJBaseServiceImpl<UserMapper, User> implem
         return page;
     }
 
+
 }