cloud-server-activity/src/main/java/com/dsh/activity/controller/UserCouponController.java
@@ -1,10 +1,12 @@ package com.dsh.activity.controller; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.dsh.activity.entity.Coupon; import com.dsh.activity.entity.CouponStore; import com.dsh.activity.entity.UserCoupon; import com.dsh.activity.feignclient.model.CouponStuAvailableVo; import com.dsh.activity.feignclient.model.QueryUserCouponByIdAndUserId; import com.dsh.activity.model.CouponListVo; import com.dsh.activity.service.CouponStoreService; import com.dsh.activity.service.ICouponService; @@ -155,9 +157,9 @@ */ @ResponseBody @PostMapping("/userCoupon/queryUserCouponById") public UserCoupon queryUserCouponById(@RequestBody Long id){ public UserCoupon queryUserCouponById(@RequestBody QueryUserCouponByIdAndUserId userCouponByIdAndUserId){ try { UserCoupon userCoupon = userCouponService.getById(id); UserCoupon userCoupon = userCouponService.getOne(new LambdaQueryWrapper<UserCoupon>().eq(UserCoupon::getCouponId,userCouponByIdAndUserId.getId()).eq(UserCoupon::getUserId,userCouponByIdAndUserId.getUserId())); return userCoupon; }catch (Exception e){ e.printStackTrace(); cloud-server-activity/src/main/java/com/dsh/activity/service/impl/BenefitsVideosServiceImpl.java
@@ -78,8 +78,11 @@ BenefitsVideoClassificationListVo benefitsVideoClassificationListVo = new BenefitsVideoClassificationListVo(); benefitsVideoClassificationListVo.setId(benefitsVideoClassification.getId()); benefitsVideoClassificationListVo.setName(benefitsVideoClassification.getName()); List<BenefitsVideos> list1 = this.list(new QueryWrapper<BenefitsVideos>().eq("state", 1).notIn("id", collect).orderByDesc("insertTime").last(" limit 4")); QueryWrapper<BenefitsVideos> benefitsVideosQueryWrapper = new QueryWrapper<BenefitsVideos>().eq("state", 1); if(collect.size() > 0){ benefitsVideosQueryWrapper.notIn("id", collect); } List<BenefitsVideos> list1 = this.list(benefitsVideosQueryWrapper.orderByDesc("insertTime").last(" limit 0, 4")); List<BenefitsVideosListVo> lists = new ArrayList<>(); for (BenefitsVideos benefitsVideos : list1) { Integer courseId = benefitsVideos.getCourseId(); cloud-server-management/src/main/java/com/dsh/course/mapper/StoreMapper.java
@@ -1,7 +1,12 @@ package com.dsh.course.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.dsh.guns.modular.system.model.TStore; import com.dsh.guns.modular.system.model.TStoreListVo; import org.apache.ibatis.annotations.Param; import java.util.List; import org.apache.ibatis.annotations.Param; import java.util.List; @@ -12,6 +17,7 @@ * @date 2023/7/6 16:51 */ public interface StoreMapper extends BaseMapper<TStore> { List<TStoreListVo> listAll(@Param("page") Page<TStoreListVo> page, @Param("provinceCode") String provinceCode, @Param("cityCode") String cityCode, @Param("name") String name, @Param("phone") String phone, @Param("shopName") String shopName); /** cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/TStore.java
@@ -1,6 +1,8 @@ package com.dsh.guns.modular.system.model; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; @@ -9,6 +11,7 @@ @TableName("t_store") @Data public class TStore { @TableId(type = IdType.AUTO) private Integer id; private String name; @TableField("storeStaffId") cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/IStoreService.java
@@ -1,8 +1,10 @@ package com.dsh.guns.modular.system.service; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; import com.dsh.guns.modular.system.model.Dict; import com.dsh.guns.modular.system.model.TStore; import com.dsh.guns.modular.system.model.TStoreListVo; import org.apache.ibatis.annotations.Param; import java.util.List; @@ -23,6 +25,7 @@ */ List<Map<String, Object>> queryProvince(String cityCode); List<TStoreListVo> listAll(Page<TStoreListVo> page, String provinceCode, String cityCode, String name, String phone, String shopName); /** * 根据省编号获取所有市 cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/StoreServiceImpl.java
@@ -1,10 +1,14 @@ package com.dsh.guns.modular.system.service.impl; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.dsh.course.mapper.StoreMapper; import com.dsh.guns.modular.system.model.TStore; import com.dsh.guns.modular.system.model.TStoreListVo; import com.dsh.guns.modular.system.service.IStoreService; import org.springframework.stereotype.Service; import java.util.List; import java.util.List; import java.util.Map; @@ -12,6 +16,10 @@ @Service public class StoreServiceImpl extends ServiceImpl<StoreMapper, TStore> implements IStoreService { @Override public List<TStoreListVo> listAll(Page<TStoreListVo> page, String provinceCode, String cityCode, String name, String phone, String shopName) { return this.baseMapper.listAll(page,provinceCode,cityCode,name,phone,shopName); } /** * 获取所有省 cloud-server-management/src/main/resources/mapper/TStoreMapper.xml
@@ -2,7 +2,25 @@ <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> <mapper namespace="com.dsh.course.mapper.StoreMapper"> <select id="listAll" resultType="com.dsh.guns.modular.system.model.TStoreListVo"> select t1.*,t2.name userName,t2.phone userPhone from t_store t1 left join sys_user t2 on t1.storeStaffId = t2.id where 1=1 <if test="provinceCode !=null and provinceCode !=''"> and t1.provinceCode = #{provinceCode} </if> <if test="cityCode !=null and cityCode !=''"> and t1.cityCode = #{cityCode} </if> <if test="name !=null and name !=''"> and t2.name like concat("%",#{name},"%") </if> <if test="phone !=null and phone !=''"> and t2.phone like concat("%",#{phone},"%") </if> <if test="shopName !=null and shopName !=''"> and t1.name like concat("%",#{shopName},"%") </if> </select> <select id="queryProvince" resultType="map"> select * from ( select provinceCode as code, province as name from t_store where state = 1 cloud-server-other/src/main/java/com/dsh/other/controller/SiteController.java
@@ -5,6 +5,7 @@ import com.dsh.other.entity.SiteBooking; import com.dsh.other.entity.SiteType; import com.dsh.other.feignclient.activity.UserCouponClient; import com.dsh.other.feignclient.activity.model.QueryUserCouponByIdAndUserId; import com.dsh.other.feignclient.activity.model.UserCoupon; import com.dsh.other.feignclient.model.BillingDataRequestVo; import com.dsh.other.feignclient.model.SiteVo; @@ -303,7 +304,7 @@ siteBooking.setRefundOrderNo(refund_id); siteBookingService.updateById(siteBooking); if(null != siteBooking.getUserCouponId()){ UserCoupon userCoupon = userCouponClient.queryUserCouponById(siteBooking.getUserCouponId()); UserCoupon userCoupon = userCouponClient.queryUserCouponById(new QueryUserCouponByIdAndUserId(siteBooking.getUserCouponId(),siteBooking.getAppUserId())); userCoupon.setStatus(1); userCouponClient.updateUserCoupon(userCoupon); } cloud-server-other/src/main/java/com/dsh/other/feignclient/activity/UserCouponClient.java
@@ -1,5 +1,6 @@ package com.dsh.other.feignclient.activity; import com.dsh.other.feignclient.activity.model.QueryUserCouponByIdAndUserId; import com.dsh.other.feignclient.activity.model.UserCoupon; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.PostMapping; @@ -14,11 +15,11 @@ /** * 根据id获取用户优惠券数据 * @param id * @param queryUserCouponByIdAndUserId * @return */ @PostMapping("/userCoupon/queryUserCouponById") UserCoupon queryUserCouponById(Long id); UserCoupon queryUserCouponById(QueryUserCouponByIdAndUserId queryUserCouponByIdAndUserId); /** * 修改优惠券数据 cloud-server-other/src/main/java/com/dsh/other/service/impl/SiteServiceImpl.java
@@ -11,6 +11,7 @@ import com.dsh.other.feignclient.activity.CouponClient; import com.dsh.other.feignclient.activity.UserCouponClient; import com.dsh.other.feignclient.activity.model.Coupon; import com.dsh.other.feignclient.activity.model.QueryUserCouponByIdAndUserId; import com.dsh.other.feignclient.activity.model.UserCoupon; import com.dsh.other.mapper.SiteMapper; import com.dsh.other.model.*; @@ -210,7 +211,7 @@ //校验优惠券 Long couponId = reservationSite.getCouponId(); if(null != couponId && reservationSite.getPayType() != 3){ UserCoupon userCoupon = userCouponClient.queryUserCouponById(couponId); UserCoupon userCoupon = userCouponClient.queryUserCouponById(new QueryUserCouponByIdAndUserId(reservationSite.getCouponId(),uid)); if(userCoupon.getStatus() == 2){ return ResultUtil.error("优惠券已被核销"); } @@ -490,7 +491,7 @@ siteBooking.setRefundOrderNo(trade_no); siteBookingService.updateById(siteBooking); if(null != siteBooking.getUserCouponId()){ UserCoupon userCoupon = userCouponClient.queryUserCouponById(siteBooking.getUserCouponId()); UserCoupon userCoupon = userCouponClient.queryUserCouponById(new QueryUserCouponByIdAndUserId(siteBooking.getUserCouponId(),siteBooking.getAppUserId())); userCoupon.setStatus(1); userCouponClient.updateUserCoupon(userCoupon); } @@ -506,7 +507,7 @@ siteBooking.setCancelTime(new Date()); siteBookingService.updateById(siteBooking); if(null != siteBooking.getUserCouponId()){ UserCoupon userCoupon = userCouponClient.queryUserCouponById(siteBooking.getUserCouponId()); UserCoupon userCoupon = userCouponClient.queryUserCouponById(new QueryUserCouponByIdAndUserId(siteBooking.getUserCouponId(),appUser.getId())); userCoupon.setStatus(1); userCouponClient.updateUserCoupon(userCoupon); } @@ -545,7 +546,7 @@ //校验优惠券 Long couponId = siteBooking.getUserCouponId(); if(null != couponId && payType != 3){ UserCoupon userCoupon = userCouponClient.queryUserCouponById(couponId); UserCoupon userCoupon = userCouponClient.queryUserCouponById(new QueryUserCouponByIdAndUserId(siteBooking.getUserCouponId(),appUser.getId())); Coupon coupon = couponClient.queryCouponById(userCoupon.getCouponId()); if(coupon.getType() == 1){//满减 JSONObject jsonObject = JSON.parseObject(coupon.getContent()); @@ -562,7 +563,7 @@ userCouponClient.updateUserCoupon(userCoupon); } if(null != couponId && payType == 3){ UserCoupon userCoupon = userCouponClient.queryUserCouponById(couponId); UserCoupon userCoupon = userCouponClient.queryUserCouponById(new QueryUserCouponByIdAndUserId(siteBooking.getUserCouponId(),appUser.getId())); userCoupon.setStatus(1); userCouponClient.updateUserCoupon(userCoupon); } @@ -610,7 +611,7 @@ //校验优惠券 Long couponId = siteBooking.getUserCouponId(); if(null != couponId){ UserCoupon userCoupon = userCouponClient.queryUserCouponById(couponId); UserCoupon userCoupon = userCouponClient.queryUserCouponById(new QueryUserCouponByIdAndUserId(siteBooking.getUserCouponId(),siteBooking.getAppUserId())); Coupon coupon = couponClient.queryCouponById(userCoupon.getCouponId()); if(coupon.getType() == 1){//满减 JSONObject jsonObject = JSON.parseObject(coupon.getContent());