fix 优惠券名称;优惠卷下单

netflix-dao/src/main/java/com/cyksj/model/dto/CouponPopularizeDto.java

@@ -17,7 +17,7 @@ import java.util.Date;
 @Setter
 public class CouponPopularizeDto {
 	/**
-	 * 优惠卷id
+	 * 优惠券id
 	 */
 	private Long couponId;
 
@@ -28,12 +28,12 @@ public class CouponPopularizeDto {
 	private Boolean isRenew;
 
 	/**
-	 * 优惠卷推广者关联id
+	 * 优惠券推广者关联id
 	 */
 	private Long popularizeId;
 
 	/**
-	 * 优惠卷推广者关联优惠卷id
+	 * 优惠券推广者关联优惠券id
 	 */
 	private Long popularizeCouponId;
 

netflix-dao/src/main/java/com/cyksj/model/entity/Coupon.java

@@ -19,21 +19,21 @@ import java.util.Date;
 @Setter
 public class Coupon extends BaseEntity {
 	/**
-	 * 优惠卷名称
+	 * 优惠券名称
 	 */
-	@NotEmpty(message = "优惠卷名称不能为空")
+	@NotEmpty(message = "优惠券名称不能为空")
 	private String name;
 
 	/**
-	 * 优惠卷平台类型
+	 * 优惠券平台类型
 	 */
-	@NotNull(message = "优惠卷平台类型不能为空")
+	@NotNull(message = "优惠券平台类型不能为空")
 	private GoodsType goodsType;
 
 	/**
-	 * 优惠卷类型
+	 * 优惠券类型
 	 */
-	@NotNull(message = "优惠卷类型不能为空")
+	@NotNull(message = "优惠券类型不能为空")
 	private Type type;
 
 	/**

netflix-dao/src/main/java/com/cyksj/model/entity/CouponActive.java

@@ -14,7 +14,7 @@ import lombok.Setter;
 @Setter
 public class CouponActive extends BaseEntity{
 	/**
-	 * 优惠卷id
+	 * 优惠券id
 	 */
 	private Long couponId;
 	/**

netflix-dao/src/main/java/com/cyksj/model/entity/CouponUser.java

@@ -15,7 +15,7 @@ public class CouponUser extends BaseEntity {
 	private Long userId;
 
 	/**
-	 * 优惠卷id
+	 * 优惠券id
 	 */
 	private Long couponId;
 
@@ -40,7 +40,7 @@ public class CouponUser extends BaseEntity {
 	private Channel channel;
 
 	/**
-	 * 优惠卷使用状态
+	 * 优惠券使用状态
 	 */
 	private Status status;
 

netflix-dao/src/main/java/com/cyksj/model/entity/OrderDon.java

@@ -63,7 +63,7 @@ public class OrderDon extends BaseEntity implements Serializable {
     private BigDecimal couponMoney;
 
     /**
-     * 优惠卷用户领取id
+     * 优惠券用户领取id
      */
     private Long couponUserId;
 

netflix-dao/src/main/java/com/cyksj/model/request/CorpCouponSendReq.java

@@ -22,7 +22,7 @@ public class CorpCouponSendReq {
 	private String externalUserId;
 
 	/**
-	 * 优惠卷id
+	 * 优惠券id
 	 */
 	@NotNull
 	private Long couponId;

netflix-dao/src/main/java/com/cyksj/model/request/CouponActiveReq.java

@@ -15,7 +15,7 @@ import javax.validation.constraints.NotNull;
 @Getter
 @Setter
 public class CouponActiveReq {
-	@NotNull(message = "优惠卷id不能为空")
+	@NotNull(message = "优惠券id不能为空")
 	@Min(value = 1)
 	private Long couponId;
 

netflix-dao/src/main/java/com/cyksj/model/request/CouponCollectReq.java

@@ -16,19 +16,19 @@ import javax.validation.constraints.NotNull;
 @Setter
 public class CouponCollectReq {
 	/**
-	 * 优惠卷id
+	 * 优惠券id
 	 */
-	@NotNull(message = "优惠卷id不能为空")
+	@NotNull(message = "优惠券id不能为空")
 	@Min(value = 1)
 	private Long couponId;
 
 	/**
-	 * 优惠卷发放id
+	 * 优惠券发放id
 	 */
 	private Long couponActiveId;
 
 	/**
-	 * 优惠卷推荐id
+	 * 优惠券推荐id
 	 */
 	private Long couponRecommendId;
 }

netflix-dao/src/main/java/com/cyksj/model/request/OrderPayRequest.java

@@ -58,12 +58,12 @@ public class OrderPayRequest {
     private String type;
 
     /**
-     * 优惠卷id
+     * 优惠券id
      */
     private Long couponId;
 
     /**
-     * 优惠卷兑换码
+     * 优惠券兑换码
      */
     private String couponExCode;
 }

netflix-dao/src/main/java/com/cyksj/model/views/CouponActiveView.java

@@ -26,25 +26,25 @@ public class CouponActiveView {
 	private Long id;
 
 	/**
-	 * 优惠卷id
+	 * 优惠券id
 	 */
 	@DbField("c.id")
 	private Long couponId;
 
 	/**
-	 * 优惠卷名称
+	 * 优惠券名称
 	 */
 	@DbField("c.name")
 	private String name;
 
 	/**
-	 * 优惠卷平台类型
+	 * 优惠券平台类型
 	 */
 	@DbField("c.goods_type")
 	private Coupon.GoodsType goodsType;
 
 	/**
-	 * 优惠卷类型
+	 * 优惠券类型
 	 */
 	@DbField("c.type")
 	private Coupon.Type type;

netflix-dao/src/main/java/com/cyksj/model/views/CouponRecommendView.java

@@ -28,19 +28,19 @@ public class CouponRecommendView {
 	private Long couponId;
 
 	/**
-	 * 优惠卷名称
+	 * 优惠券名称
 	 */
 	@DbField("c.name")
 	private String name;
 
 	/**
-	 * 优惠卷平台类型
+	 * 优惠券平台类型
 	 */
 	@DbField("c.goods_type")
 	private Coupon.GoodsType goodsType;
 
 	/**
-	 * 优惠卷类型
+	 * 优惠券类型
 	 */
 	@DbField("c.type")
 	private Coupon.Type type;

netflix-dao/src/main/java/com/cyksj/model/views/CouponUserEnableView.java

@@ -32,7 +32,7 @@ public class CouponUserEnableView {
 	private CouponUser.Channel channel;
 
 	/**
-	 * 优惠卷使用状态
+	 * 优惠券使用状态
 	 */
 	@DbField("cu.status")
 	private CouponUser.Status couponUserStatus;
@@ -44,31 +44,31 @@ public class CouponUserEnableView {
 	private Long userId;
 
 	/**
-	 * 优惠卷id
+	 * 优惠券id
 	 */
 	@DbField("c.id")
 	private Long couponId;
 
 	/**
-	 * 优惠卷发放id
+	 * 优惠券发放id
 	 */
 	@DbField("ca.id")
 	private Long couponActiveId;
 
 	/**
-	 * 优惠卷名称
+	 * 优惠券名称
 	 */
 	@DbField("ca.name")
 	private String name;
 
 	/**
-	 * 优惠卷平台类型
+	 * 优惠券平台类型
 	 */
 	@DbField("ca.goods_type")
 	private Coupon.GoodsType goodsType;
 
 	/**
-	 * 优惠卷类型
+	 * 优惠券类型
 	 */
 	@DbField("ca.type")
 	private Coupon.Type type;
@@ -122,7 +122,7 @@ public class CouponUserEnableView {
 	private Boolean isRenew;
 
 	/**
-	 * 发放优惠卷状态(默认启用)
+	 * 发放优惠券状态(默认启用)
 	 */
 	@DbField("ca.status")
 	private Boolean status;

netflix-dao/src/main/java/com/cyksj/model/views/CouponUserView.java

@@ -33,7 +33,7 @@ public class CouponUserView {
 	private CouponUser.Channel channel;
 
 	/**
-	 * 优惠卷使用状态
+	 * 优惠券使用状态
 	 */
 	@DbField("cu.status")
 	private CouponUser.Status couponUserStatus;
@@ -45,31 +45,31 @@ public class CouponUserView {
 	private Long userId;
 
 	/**
-	 * 优惠卷id
+	 * 优惠券id
 	 */
 	@DbField("c.id")
 	private Long couponId;
 
 	/**
-	 * 优惠卷发放id
+	 * 优惠券发放id
 	 */
 	@DbField("ca.id")
 	private Long couponActiveId;
 
 	/**
-	 * 优惠卷名称
+	 * 优惠券名称
 	 */
 	@DbField("c.name")
 	private String name;
 
 	/**
-	 * 优惠卷平台类型
+	 * 优惠券平台类型
 	 */
 	@DbField("c.goods_type")
 	private Coupon.GoodsType goodsType;
 
 	/**
-	 * 优惠卷类型
+	 * 优惠券类型
 	 */
 	@DbField("c.type")
 	private Coupon.Type type;
@@ -126,7 +126,7 @@ public class CouponUserView {
 	private Boolean isRenew;
 
 	/**
-	 * 发放优惠卷状态(默认启用)
+	 * 发放优惠券状态(默认启用)
 	 */
 	@DbField("ca.status")
 	private Boolean status;

netflix-dao/src/main/java/com/cyksj/model/views/CouponView.java

@@ -23,17 +23,17 @@ public class CouponView {
 	private Long id;
 
 	/**
-	 * 优惠卷名称
+	 * 优惠券名称
 	 */
 	private String name;
 
 	/**
-	 * 优惠卷平台类型
+	 * 优惠券平台类型
 	 */
 	private Coupon.GoodsType goodsType;
 
 	/**
-	 * 优惠卷类型
+	 * 优惠券类型
 	 */
 	private Coupon.Type type;
 

netflix-service/src/main/java/com/cyksj/redis/RedisService.java

@@ -591,7 +591,7 @@ public class RedisService {
 	    CORP_AGENT_JS_TICKET_KEY("corp_wechat:js_ticket:agent:", "js_ticket", 60 * 30L),
 	    MAPPING_INDEX_KEY("mapper:index:", "授权跳转", 60 * 10L),
         WX_LOGIN_AUTH_URI("wx_login_auth_uri:%s", "微信网页授权登录uri", 60 * 60 * 24L),
-        RECOMMEND_COUPON_DAY("recommend_coupon_day:%s", "推荐优惠卷弹窗", 60 * 60 * 24L)
+        RECOMMEND_COUPON_DAY("recommend_coupon_day:%s", "推荐优惠券弹窗", 60 * 60 * 24L)
         ;
 
         private String name;

netflix-service/src/main/java/com/cyksj/service/coupon/CouponFontService.java

@@ -14,32 +14,32 @@ import com.ejlchina.searcher.SearchResult;
  */
 public interface CouponFontService {
 	/**
-	 * 领取优惠卷
+	 * 领取优惠券
 	 */
 	void collectCoupon(CouponCollectReq couponCollectReq, Long userId);
 
 	/**
-	 * 领取推荐优惠卷
+	 * 领取推荐优惠券
 	 */
 	void collectRecommendCoupon(CouponCollectReq couponCollectReq, Long userId);
 
 	/**
-	 * 一键领取推荐优惠卷
+	 * 一键领取推荐优惠券
 	 */
 	void collectWholeRecommendCoupon(Long userId);
 
 	/**
-	 * 处理优惠卷状态
+	 * 处理优惠券状态
 	 */
 	void handleCouponStatus(SearchResult<CouponUserView> search);
 
 	/**
-	 * 可用/不可用优惠卷
+	 * 可用/不可用优惠券
 	 */
 	Page<CouponUserView> getAvailableCouponList(Long skuId, Long userId, Boolean isRenew, Long start, Long limit);
 
 	/**
-	 * 优惠卷状态
+	 * 优惠券状态
 	 */
 	void setCouponUserStatus(CouponUserView data, DateTime now);
 

netflix-service/src/main/java/com/cyksj/service/coupon/impl/CouponFontServiceImpl.java

@@ -63,10 +63,10 @@ public class CouponFontServiceImpl implements CouponFontService {
 		collectCommonCheck(couponCollectReq, userId);
 		CouponActive couponActive = couponActiveMapper.selectById(couponCollectReq.getCouponActiveId());
 		if (couponActive == null) {
-			throw BusinessRuntimeException.getInstance("该发放优惠卷不存在");
+			throw BusinessRuntimeException.getInstance("该发放优惠券不存在");
 		}
 		if (couponActive.getRemainNum() <= 0) {
-			throw BusinessRuntimeException.getInstance("该优惠卷已领取完");
+			throw BusinessRuntimeException.getInstance("该优惠券已领取完");
 		}
 		CouponUser couponUser = new CouponUser();
 		couponUser.setUserId(userId);
@@ -78,11 +78,11 @@ public class CouponFontServiceImpl implements CouponFontService {
 		try {
 			couponUserMapper.insert(couponUser);
 		} catch (DuplicateKeyException e) {
-			log.info("用户:{}重复领取优惠卷{}插入数据错误", userId, couponCollectReq.getCouponId());
+			log.info("用户:{}重复领取优惠券{}插入数据错误", userId, couponCollectReq.getCouponId());
 			throw BusinessRuntimeException.getInstance("已领取成功");
 		}
 		if (couponActive != null) {
-			//发放优惠卷记录剩余数量
+			//发放优惠券记录剩余数量
 			Integer remainNum = couponActive.getRemainNum();
 			Integer update = couponActiveMapper.subRemainNum(couponActive.getId(), remainNum);
 			if (update != 1) {
@@ -101,10 +101,11 @@ public class CouponFontServiceImpl implements CouponFontService {
 		//推荐渠道
 		couponUser.setChannel(CouponUser.Channel.recommend);
 		couponUser.setStatus(CouponUser.Status.unused);
+		couponUser.setRecommendId(couponCollectReq.getCouponRecommendId());
 		try {
 			couponUserMapper.insert(couponUser);
 		} catch (DuplicateKeyException e) {
-			log.info("用户:{}重复领取推荐优惠卷{}插入数据错误", userId, couponCollectReq.getCouponId());
+			log.info("用户:{}重复领取推荐优惠券{}插入数据错误", userId, couponCollectReq.getCouponId());
 			throw BusinessRuntimeException.getInstance("已领取成功");
 		}
 	}
@@ -114,7 +115,7 @@ public class CouponFontServiceImpl implements CouponFontService {
 	@NoSubmit
 	public void collectWholeRecommendCoupon(Long userId) {
 		CouponNewUserView couponNewUserView = beanSearcher.searchFirst(CouponNewUserView.class, MapUtils.builder().field(CouponNewUserView::getUserId, userId).op(Operator.Equal).build());
-		//查询所有可领取的推荐优惠卷
+		//查询所有可领取的推荐优惠券
 		List<CouponAvailableRecommendView> couponAvailableRecommendViews = beanSearcher.searchAll(CouponAvailableRecommendView.class, null);
 		couponAvailableRecommendViews.stream().filter(data->{
 			if (data.getScope() == Coupon.Scope.newUser && couponNewUserView != null) {
@@ -122,18 +123,19 @@ public class CouponFontServiceImpl implements CouponFontService {
 			}
 			return true;
 		}).forEach(data -> {
-			//领取优惠卷
+			//领取优惠券
 			CouponUser couponUser = new CouponUser();
 			couponUser.setUserId(userId);
 			couponUser.setCouponId(data.getCouponId());
 			//推荐渠道
 			couponUser.setChannel(CouponUser.Channel.recommend);
 			couponUser.setStatus(CouponUser.Status.unused);
+			couponUser.setRecommendId(data.getRecommendId());
 			try {
 				couponUserMapper.insert(couponUser);
 			} catch (DuplicateKeyException e) {
 				//插入失败继续插入 不影响
-				log.info("用户:{}一键领取推荐优惠卷{}插入数据错误", userId, data.getCouponId());
+				log.info("用户:{}一键领取推荐优惠券{}插入数据错误", userId, data.getCouponId());
 			}
 		});
 	}
@@ -186,7 +188,7 @@ public class CouponFontServiceImpl implements CouponFontService {
 	}
 
 	/**
-	 * 设置用户优惠卷状态
+	 * 设置用户优惠券状态
 	 */
 	@Override
 	public void setCouponUserStatus(CouponUserView data, DateTime now) {
@@ -195,17 +197,17 @@ public class CouponFontServiceImpl implements CouponFontService {
 			if (data.getExpiryStatus() != null && !data.getExpiryStatus()) {
 				data.setCouponUserStatus(CouponUser.Status.invalid);
 				data.setIsAvailable(false);
-				data.setReason("该优惠卷已失效");
+				data.setReason("该优惠券已失效");
 				isFlag = true;
 			} else if (now.isAfter(data.getValidEndTime())) {
 				data.setCouponUserStatus(CouponUser.Status.expired);
 				data.setIsAvailable(false);
-				data.setReason("该优惠卷已过期");
+				data.setReason("该优惠券已过期");
 				isFlag = true;
 			} else if (now.isBefore(data.getValidStartTime())) {
 				data.setCouponUserStatus(CouponUser.Status.notEffective);
 				data.setIsAvailable(false);
-				data.setReason("该优惠卷未生效");
+				data.setReason("该优惠券未生效");
 				isFlag = true;
 			}
 		}
@@ -237,22 +239,22 @@ public class CouponFontServiceImpl implements CouponFontService {
 	public void collectCommonCheck(CouponCollectReq couponCollectReq, Long userId) {
 		Coupon coupon = couponMapper.selectById(couponCollectReq.getCouponId());
 		if (coupon == null || !coupon.getDeleted()) {
-			throw BusinessRuntimeException.getInstance("该优惠卷不存在");
+			throw BusinessRuntimeException.getInstance("该优惠券不存在");
 		}
 		//是否可领取
 		if (coupon.getScope() == Coupon.Scope.newUser) {
 			//注册后从没产生过虚拟订单的用户，产生过退款后也不是新用户
 			CouponNewUserView couponNewUserView = beanSearcher.searchFirst(CouponNewUserView.class, MapUtils.builder().field(CouponNewUserView::getUserId, userId).op(Operator.Equal).build());
 			if (couponNewUserView != null) {
-				throw BusinessRuntimeException.getInstance("该优惠卷只能新用户才能领取");
+				throw BusinessRuntimeException.getInstance("该优惠券只能新用户才能领取");
 			}
 		}
 		CouponUser couponUser = couponUserMapper.selectOne(Wrappers.lambdaQuery(CouponUser.class).eq(CouponUser::getUserId, userId).eq(CouponUser::getCouponId, couponCollectReq.getCouponId()));
 		if (couponUser != null) {
 			if (couponUser.getChannel() == CouponUser.Channel.exCode) {
-				throw BusinessRuntimeException.getInstance("您已兑换过该优惠卷..");
+				throw BusinessRuntimeException.getInstance("您已兑换过该优惠券..");
 			}
-			throw BusinessRuntimeException.getInstance("您已领取该优惠卷..");
+			throw BusinessRuntimeException.getInstance("您已领取该优惠券..");
 		}
 	}
 }

netflix-service/src/main/java/com/cyksj/service/mange/coupon/CouponCommonService.java

@@ -14,28 +14,28 @@ import com.cyksj.model.request.CouponDistributeReq;
  */
 public interface CouponCommonService {
 	/**
-	 * 新增优惠卷
+	 * 新增优惠券
 	 *
 	 * @param coupon
 	 */
 	void saveCoupon(Coupon coupon) throws Exception;
 
 	/**
-	 * 更新优惠卷
+	 * 更新优惠券
 	 *
 	 * @param coupon
 	 */
 	void updateCoupon(Coupon coupon) throws Exception;
 
 	/**
-	 * 发放优惠卷
+	 * 发放优惠券
 	 *
 	 * @param couponActiveReq
 	 */
 	void sendCoupon(CouponActiveReq couponActiveReq);
 
 	/**
-	 * 设置为推荐优惠卷
+	 * 设置为推荐优惠券
 	 *
 	 * @param couponId
 	 */
@@ -49,14 +49,14 @@ public interface CouponCommonService {
 	void setPopularizeRelation(CouponDistributeReq couponDistributeReq);
 
 	/**
-	 * 设置推广者优惠卷兑换码
+	 * 设置推广者优惠券兑换码
 	 *
 	 * @param couponDistributePopularize
 	 */
 	void setPopularizeRelationCode(CouponDistributePopularize couponDistributePopularize);
 
 	/**
-	 * 发放优惠卷
+	 * 发放优惠券
 	 */
 	void corpSendCoupon(CorpCouponSendReq corpCouponSendReq) throws Exception;
 }

netflix-service/src/main/java/com/cyksj/service/mange/coupon/impl/CouponCommonServiceImpl.java

@@ -69,11 +69,11 @@ public class CouponCommonServiceImpl implements CouponCommonService {
 	@Override
 	public void updateCoupon(Coupon coupon) throws Exception {
 		if (coupon.getId() == null || coupon.getId() < 1) {
-			throw BusinessRuntimeException.getInstance("请输入正确的优惠卷id");
+			throw BusinessRuntimeException.getInstance("请输入正确的优惠券id");
 		}
 		Coupon entity = couponMapper.selectById(coupon.getId());
 		if (entity == null || !entity.getDeleted()) {
-			throw BusinessRuntimeException.getInstance("该优惠卷不存在");
+			throw BusinessRuntimeException.getInstance("该优惠券不存在");
 		}
 		checkCouponParamsAndSaveOrUpdate(coupon);
 	}
@@ -82,7 +82,7 @@ public class CouponCommonServiceImpl implements CouponCommonService {
 	public void sendCoupon(CouponActiveReq couponActiveReq) {
 		Coupon coupon = couponMapper.selectById(couponActiveReq.getCouponId());
 		if (coupon == null || !coupon.getDeleted()) {
-			throw BusinessRuntimeException.getInstance("该优惠卷不存在");
+			throw BusinessRuntimeException.getInstance("该优惠券不存在");
 		}
 		if (!coupon.getSendStatus()) {
 			coupon.setSendStatus(!coupon.getSendStatus());
@@ -100,10 +100,10 @@ public class CouponCommonServiceImpl implements CouponCommonService {
 	public void setHotCoupon(Long couponId) {
 		Coupon coupon = couponMapper.selectById(couponId);
 		if (coupon == null || !coupon.getDeleted()) {
-			throw BusinessRuntimeException.getInstance("该优惠卷不存在");
+			throw BusinessRuntimeException.getInstance("该优惠券不存在");
 		}
 		if (coupon.getHotStatus()) {
-			throw BusinessRuntimeException.getInstance("已推荐该优惠卷");
+			throw BusinessRuntimeException.getInstance("已推荐该优惠券");
 		}
 		if (!coupon.getHotStatus()) {
 			coupon.setHotStatus(!coupon.getHotStatus());
@@ -118,11 +118,11 @@ public class CouponCommonServiceImpl implements CouponCommonService {
 	public void setPopularizeRelation(CouponDistributeReq couponDistributeReq) {
 		Coupon coupon = couponMapper.selectById(couponDistributeReq.getCouponId());
 		if (coupon == null || !coupon.getDeleted()) {
-			throw BusinessRuntimeException.getInstance("该优惠卷不存在");
+			throw BusinessRuntimeException.getInstance("该优惠券不存在");
 		}
 		CouponDistributePopularize exists = couponDistributePopularizeMapper.selectOne(Wrappers.lambdaQuery(CouponDistributePopularize.class).eq(CouponDistributePopularize::getCouponId, coupon.getId()).eq(CouponDistributePopularize::getDistributeId, couponDistributeReq.getDistributeId()).eq(CouponDistributePopularize::getDeleted, true).last("limit 1"));
 		if (exists != null) {
-			throw BusinessRuntimeException.getInstance("该优惠卷已关联该固定推广者");
+			throw BusinessRuntimeException.getInstance("该优惠券已关联该固定推广者");
 		}
 		CouponDistributePopularize couponDistributePopularize = new CouponDistributePopularize();
 		couponDistributePopularize.setCouponId(coupon.getId());
@@ -133,14 +133,14 @@ public class CouponCommonServiceImpl implements CouponCommonService {
 	@Override
 	public void setPopularizeRelationCode(CouponDistributePopularize couponDistributePopularize) {
 		if (couponDistributePopularize.getId() == null || couponDistributePopularize.getId() < 1) {
-			throw BusinessRuntimeException.getInstance("优惠卷推广者关联id为空");
+			throw BusinessRuntimeException.getInstance("优惠券推广者关联id为空");
 		}
 		CouponDistributePopularize entity = couponDistributePopularizeMapper.selectById(couponDistributePopularize.getId());
 		if (entity == null) {
-			throw BusinessRuntimeException.getInstance("该优惠卷推广关联记录不存在");
+			throw BusinessRuntimeException.getInstance("该优惠券推广关联记录不存在");
 		}
 		if (StrUtil.isEmpty(couponDistributePopularize.getExCode())) {
-			throw BusinessRuntimeException.getInstance("优惠卷兑换码为空");
+			throw BusinessRuntimeException.getInstance("优惠券兑换码为空");
 		}
 		entity.setExCode(couponDistributePopularize.getExCode());
 		CouponDistributePopularize exists = couponDistributePopularizeMapper.selectOne(Wrappers.lambdaQuery(CouponDistributePopularize.class).eq(CouponDistributePopularize::getExCode, couponDistributePopularize.getExCode()).eq(CouponDistributePopularize::getDeleted, true).ne(CouponDistributePopularize::getId, entity.getId()).select(CouponDistributePopularize::getId).last("limit 1"));
@@ -149,7 +149,7 @@ public class CouponCommonServiceImpl implements CouponCommonService {
 		} else {
 			Coupon coupon = couponMapper.selectOne(Wrappers.lambdaQuery(Coupon.class).eq(Coupon::getExCode, couponDistributePopularize.getExCode()).eq(Coupon::getDeleted, true).select(Coupon::getId).last("limit 1"));
 			if (coupon != null) {
-				throw BusinessRuntimeException.getInstance("推荐官兑换码与优惠卷兑换码设置重复");
+				throw BusinessRuntimeException.getInstance("推荐官兑换码与优惠券兑换码设置重复");
 			}
 		}
 		couponDistributePopularizeMapper.updateById(entity);
@@ -179,7 +179,7 @@ public class CouponCommonServiceImpl implements CouponCommonService {
 		Long couponId = corpCouponSendReq.getCouponId();
 		Coupon coupon = couponMapper.selectById(couponId);
 		if (coupon == null || !coupon.getDeleted()) {
-			throw BusinessRuntimeException.getInstance("该优惠卷已被删除");
+			throw BusinessRuntimeException.getInstance("该优惠券已被删除");
 		}
 		CouponUser couponUser = new CouponUser();
 		couponUser.setUserId(user.getId());
@@ -190,8 +190,8 @@ public class CouponCommonServiceImpl implements CouponCommonService {
 		try {
 			couponUserMapper.insert(couponUser);
 		} catch (DuplicateKeyException e) {
-			log.info("用户:{}重复领取优惠卷{}插入数据错误", user.getId(), corpCouponSendReq.getCouponId());
-			throw BusinessRuntimeException.getInstance("已发放该优惠卷");
+			log.info("用户:{}重复领取优惠券{}插入数据错误", user.getId(), corpCouponSendReq.getCouponId());
+			throw BusinessRuntimeException.getInstance("已发放该优惠券");
 		}
 	}
 
@@ -205,7 +205,7 @@ public class CouponCommonServiceImpl implements CouponCommonService {
 		}
 		if (coupon.getType() == Coupon.Type.reduce) {
 			if (StrUtil.isEmpty(coupon.getGoodsSkuIds())) {
-				throw BusinessRuntimeException.getInstance("立减优惠卷,请配置其平台及规格");
+				throw BusinessRuntimeException.getInstance("立减优惠券,请配置其平台及规格");
 			}
 			if (coupon.getReduceMoney() == null) {
 				throw BusinessRuntimeException.getInstance("请配置其立减金额");
@@ -250,11 +250,11 @@ public class CouponCommonServiceImpl implements CouponCommonService {
 		if (StrUtil.isNotEmpty(coupon.getExCode())) {
 			Coupon exists = couponMapper.selectOne(Wrappers.lambdaQuery(Coupon.class).eq(Coupon::getExCode, coupon.getExCode()).eq(Coupon::getDeleted, true).ne(coupon.getId() != null, Coupon::getId, coupon.getId()).select(Coupon::getId).last("limit 1"));
 			if (exists != null) {
-				throw BusinessRuntimeException.getInstance("优惠卷兑换码重复");
+				throw BusinessRuntimeException.getInstance("优惠券兑换码重复");
 			} else {
 				CouponDistributePopularize couponDistributePopularize = couponDistributePopularizeMapper.selectOne(Wrappers.lambdaQuery(CouponDistributePopularize.class).eq(CouponDistributePopularize::getExCode, coupon.getExCode()).eq(CouponDistributePopularize::getDeleted, true).select(CouponDistributePopularize::getId).last("limit 1"));
 				if (couponDistributePopularize != null) {
-					throw BusinessRuntimeException.getInstance("优惠卷兑换码与推荐管兑换码设置重复");
+					throw BusinessRuntimeException.getInstance("优惠券兑换码与推荐管兑换码设置重复");
 				}
 			}
 		}
@@ -262,7 +262,7 @@ public class CouponCommonServiceImpl implements CouponCommonService {
 			try {
 				couponMapper.insert(coupon);
 			} catch (DuplicateKeyException e) {
-				throw BusinessRuntimeException.getInstance("优惠卷名称重复");
+				throw BusinessRuntimeException.getInstance("优惠券名称重复");
 			}
 			goodsSkuList.forEach(goodsSkuId->{
 				CouponSku couponSku = new CouponSku();
@@ -275,7 +275,7 @@ public class CouponCommonServiceImpl implements CouponCommonService {
 			try {
 				couponMapper.updateById(coupon);
 			} catch (DuplicateKeyException e) {
-				throw BusinessRuntimeException.getInstance("优惠卷名称重复");
+				throw BusinessRuntimeException.getInstance("优惠券名称重复");
 			}
 			couponSkuMapper.deleteRelationSku(coupon.getId());
 			goodsSkuList.forEach(goodsSkuId->{

netflix-service/src/main/java/com/cyksj/service/order/impl/OrderDonServiceImpl.java

@@ -136,7 +136,7 @@ public class OrderDonServiceImpl extends ServiceImpl<OrderDonMapper, OrderDon> i
 		CouponUser couponUser = null;
 		if (StrUtil.isNotBlank(payRequest.getCouponExCode()) || payRequest.getCouponId() != null) {
 			checkCouponStatus(payRequest.getSkuId(), payRequest.getCouponExCode(), payRequest.getCouponId(), payRequest.getUserId(), false);
-			//记录优惠卷使用状态
+			//记录优惠券使用状态
 			couponUser = couponStatusRecord(payRequest.getCouponExCode(), payRequest.getCouponId(), payRequest.getUserId());
 		}
 		User user = userMapper.selectById(payRequest.getUserId());
@@ -219,7 +219,7 @@ public class OrderDonServiceImpl extends ServiceImpl<OrderDonMapper, OrderDon> i
 		orderDon.setOpenId(payOpenId);
 		orderDon.setMoney(payRequest.getDonMoney());
 		orderDon.setRealMoney(payRequest.getDonMoney());
-		//存在优惠卷
+		//存在优惠券
 		if (couponUser != null) {
 			Long couponId = couponUser.getCouponId();
 			Coupon coupon = couponMapper.selectById(couponId);
@@ -462,7 +462,7 @@ public class OrderDonServiceImpl extends ServiceImpl<OrderDonMapper, OrderDon> i
 		CouponUser couponUser = null;
 		if (StrUtil.isNotBlank(payRequest.getCouponExCode()) || payRequest.getCouponId() != null) {
 			checkCouponStatus(payRequest.getSkuId(), payRequest.getCouponExCode(), payRequest.getCouponId(), payRequest.getUserId(), true);
-			//记录优惠卷使用状态
+			//记录优惠券使用状态
 			couponUser = couponStatusRecord(payRequest.getCouponExCode(), payRequest.getCouponId(), payRequest.getUserId());
 		}
 		Long relationId = payRequest.getRelationId();
@@ -510,7 +510,7 @@ public class OrderDonServiceImpl extends ServiceImpl<OrderDonMapper, OrderDon> i
 		orderDon.setUserId(user.getId());
 		orderDon.setGoodsId(goodsDon.getId());
 		orderDon.setRealMoney(payRequest.getDonMoney());
-		//存在优惠卷
+		//存在优惠券
 		if (couponUser != null) {
 			Long couponId = couponUser.getCouponId();
 			Coupon coupon = couponMapper.selectById(couponId);
@@ -644,7 +644,7 @@ public class OrderDonServiceImpl extends ServiceImpl<OrderDonMapper, OrderDon> i
 		});
 		//虚物订单退款,清出车队,车票变为已过期
 		clearUnrealGoodsDetail(orderDon, goodsDon);
-		//若存在优惠卷使用,退还优惠卷
+		//若存在优惠券使用,退还优惠券
 		if (orderDon.getCouponUserId() != 0) {
 			redisService.set(String.format("%s-%s", orderDon.getId(), orderDon.getCouponUserId()), orderDon.getId(), 120l);
 			updateOrderDonCouponStatus(orderDon);
@@ -714,7 +714,7 @@ public class OrderDonServiceImpl extends ServiceImpl<OrderDonMapper, OrderDon> i
 			//虚物订单退款,清出车队,车票变为已过期
 			clearUnrealGoodsDetail(orderDon, goodsDon);
 			if (orderDon.getCouponUserId() != 0) {
-				//zfb订单退款,返还优惠卷
+				//zfb订单退款,返还优惠券
 				updateOrderDonCouponStatus(orderDon);
 			}
 			return GatewayResponse.SUCCESS.newBuilder().toResult("退款成功");
@@ -1011,7 +1011,7 @@ public class OrderDonServiceImpl extends ServiceImpl<OrderDonMapper, OrderDon> i
 	}
 
 	public void checkCouponStatus(Long skuId, String couponExCode, Long couponId, Long userId, Boolean isRenew) throws Exception {
-		log.info("开始校验兑换码:{},优惠卷id:{}状态", couponExCode, couponId);
+		log.info("开始校验兑换码:{},优惠券id:{}状态", couponExCode, couponId);
 		//实物还是虚物商品
 		GoodsDonSku goodsDonSku = goodsDonSkuMapper.selectById(skuId);
 		GoodsDon goodsDon = goodsDonMapper.selectById(goodsDonSku.getGoodsId());
@@ -1023,10 +1023,10 @@ public class OrderDonServiceImpl extends ServiceImpl<OrderDonMapper, OrderDon> i
 			if (exists == null) {
 				throw BusinessRuntimeException.getInstance("该优惠码不存在");
 			}
-			checkCouponGoods(goodsDon, skuId, exists.getType(), exists.getGoodsSkuIds());
+			checkCouponGoods(goodsDon, skuId, exists.getType(), exists.getGoodsSkuIds(), true);
 			//检验是否续费可使用
 			if (isRenew && !exists.getIsRenew()) {
-				throw BusinessRuntimeException.getInstance("该优惠卷续费时不可使用");
+				throw BusinessRuntimeException.getInstance("该优惠券续费时不可使用");
 			}
 		} else if (couponId != null) {
 			CouponUserView couponUserView = beanSearcher.searchFirst(CouponUserView.class, MapUtils.builder()
@@ -1034,10 +1034,10 @@ public class OrderDonServiceImpl extends ServiceImpl<OrderDonMapper, OrderDon> i
 					.field(CouponUserView::getUserId, userId).op(Operator.Equal)
 					.build());
 			if (couponUserView == null) {
-				throw BusinessRuntimeException.getInstance("该优惠卷不存在");
+				throw BusinessRuntimeException.getInstance("该优惠券不存在");
 			}
 			if (couponUserView.getCouponUserStatus() == CouponUser.Status.used) {
-				throw BusinessRuntimeException.getInstance("该优惠卷已使用");
+				throw BusinessRuntimeException.getInstance("该优惠券已使用");
 			}
 			if (!couponUserView.getIsValidTime()) {
 				couponUserView.setValidStartTime(couponUserView.getCreatedTime());
@@ -1045,18 +1045,18 @@ public class OrderDonServiceImpl extends ServiceImpl<OrderDonMapper, OrderDon> i
 			}
 			couponFontService.setCouponUserStatus(couponUserView, DateTime.now());
 			if (couponUserView.getCouponUserStatus() != CouponUser.Status.unused) {
-				throw BusinessRuntimeException.getInstance("该优惠卷不可使用");
+				throw BusinessRuntimeException.getInstance("该优惠券不可使用");
 			}
-			checkCouponGoods(goodsDon, skuId, couponUserView.getType(), couponUserView.getGoodsSkuIds());
+			checkCouponGoods(goodsDon, skuId, couponUserView.getType(), couponUserView.getGoodsSkuIds(), false);
 			//检验是否续费可使用
 			if (isRenew && !couponUserView.getIsRenew()) {
-				throw BusinessRuntimeException.getInstance("该优惠卷续费时不可使用");
+				throw BusinessRuntimeException.getInstance("该优惠券续费时不可使用");
 			}
 		}
 	}
 
 	private CouponUser couponStatusRecord(String couponExCode, Long couponId, Long userId) {
-		log.info("兑换码:{},优惠卷id:{},更新其优惠卷状态", couponExCode, couponId);
+		log.info("兑换码:{},优惠券id:{},更新其优惠券状态", couponExCode, couponId);
 		CouponUser couponUser = null;
 		if (StrUtil.isNotBlank(couponExCode)) {
 			CouponPopularizeDto exists = couponMapper.checkExCode(couponExCode);
@@ -1071,7 +1071,7 @@ public class OrderDonServiceImpl extends ServiceImpl<OrderDonMapper, OrderDon> i
 			}
 			CouponUser received = couponUserMapper.selectOne(Wrappers.lambdaQuery(CouponUser.class).eq(CouponUser::getUserId, userId).eq(CouponUser::getCouponId, couponUser.getCouponId()).last("limit 1"));
 			if (received != null && received.getStatus() != CouponUser.Status.unused) {
-				throw BusinessRuntimeException.getInstance("该优惠卷已使用");
+				throw BusinessRuntimeException.getInstance("该优惠券已使用");
 			}
 			couponUser.setUserId(userId);
 			couponUser.setStatus(CouponUser.Status.used);
@@ -1079,13 +1079,13 @@ public class OrderDonServiceImpl extends ServiceImpl<OrderDonMapper, OrderDon> i
 			try {
 				couponUserMapper.insert(couponUser);
 			} catch (DuplicateKeyException e) {
-				log.info("用户已领取该{}优惠卷", couponUser.getCouponId());
-				throw BusinessRuntimeException.getInstance("该优惠卷已使用");
+				log.info("用户已领取该{}优惠券", couponUser.getCouponId());
+				throw BusinessRuntimeException.getInstance("该优惠券已使用");
 			}
 		} else {
 			couponUser = couponUserMapper.selectOne(Wrappers.lambdaQuery(CouponUser.class).eq(CouponUser::getUserId, userId).eq(CouponUser::getCouponId, couponId).last("limit 1"));
 			if (couponUser == null) {
-				throw BusinessRuntimeException.getInstance("该优惠卷不存在");
+				throw BusinessRuntimeException.getInstance("该优惠券不存在");
 			}
 			couponUser.setStatus(CouponUser.Status.used);
 			couponUserMapper.updateById(couponUser);
@@ -1094,13 +1094,13 @@ public class OrderDonServiceImpl extends ServiceImpl<OrderDonMapper, OrderDon> i
 	}
 
 	/**
-	 * 退款时，归还优惠卷
+	 * 退款时，归还优惠券
 	 */
 	private void updateOrderDonCouponStatus(OrderDon orderDon) {
-		log.info("订单:{}退款,优惠卷返还start...", orderDon.getId());
+		log.info("订单:{}退款,优惠券返还start...", orderDon.getId());
 		CouponUser couponUser = couponUserMapper.selectById(orderDon.getCouponUserId());
 		if (CouponUser.Channel.exCode == couponUser.getChannel()) {
-			//兑换码兑换的优惠卷退款时，直接删除
+			//兑换码兑换的优惠券退款时，直接删除
 			couponUserMapper.deleteById(couponUser.getId());
 		}else {
 			CouponUserView couponUserView = beanSearcher.searchFirst(CouponUserView.class, MapUtils.builder().field(CouponUserView::getCouponId, couponUser.getCouponId()).build());
@@ -1113,23 +1113,23 @@ public class OrderDonServiceImpl extends ServiceImpl<OrderDonMapper, OrderDon> i
 			couponUser.setStatus(couponUserView.getCouponUserStatus());
 			couponUserMapper.updateById(couponUser);
 		}
-		log.info("订单:{}退款,优惠卷返还end...", orderDon.getId());
+		log.info("订单:{}退款,优惠券返还end...", orderDon.getId());
 	}
 
-	public void checkCouponGoods(GoodsDon goodsDon, Long skuId, Coupon.Type type, String goodsSkuIds) throws Exception {
+	public void checkCouponGoods(GoodsDon goodsDon, Long skuId, Coupon.Type type, String goodsSkuIds, Boolean isCouponCode) throws Exception {
 		if (goodsDon.getType() == 1) {
 			if (type == Coupon.Type.reduce) {
-				List<Coupon.CouponGoodsSku> skuIds = Jsons.parseObject(goodsSkuIds, List.class);
+				List<Coupon.CouponGoodsSku> skuIds = Jsons.parseList(goodsSkuIds, Coupon.CouponGoodsSku.class);
 				Set<Long> collect = skuIds.stream().map(Coupon.CouponGoodsSku::getSkuId).collect(Collectors.toSet());
-				if (!collect.contains(Integer.valueOf(String.valueOf(skuId)))) {
-					throw BusinessRuntimeException.getInstance("该优惠码不适用于该规格");
+				if (!collect.contains(skuId)) {
+					throw BusinessRuntimeException.getInstance(String.format("该%s不适用于该规格", isCouponCode ? "优惠码" : "优惠券"));
 				}
 			}
 		} else {
 			Long gid = goodsDon.getId();
 			CouponSku couponSku = couponSkuMapper.selectOne(Wrappers.lambdaQuery(CouponSku.class).eq(CouponSku::getGoodsId, gid).eq(CouponSku::getDeleted, true).select(CouponSku::getId).last("limit 1"));
 			if (couponSku == null) {
-				throw BusinessRuntimeException.getInstance("该优惠卷不可用于实物商品");
+				throw BusinessRuntimeException.getInstance(String.format("该%s不可用于实物商品", isCouponCode ? "优惠码" : "优惠券"));
 			}
 		}
 	}

netflix-web/src/main/java/com/cyksj/web/controller/coupon/CouponFrontController.java

@@ -51,7 +51,7 @@ public class CouponFrontController {
 	private final CouponMapper couponMapper;
 
 	/**
-	 * 优惠卷领取中心列表
+	 * 优惠券领取中心列表
 	 */
 	@GetMapping("/center/list")
 	public Result<Page<CouponActiveView>> couponCenterList(@RequestParam(defaultValue = "1") Long start, @RequestParam(defaultValue = "5") Long limit) {
@@ -65,7 +65,7 @@ public class CouponFrontController {
 	}
 
 	/**
-	 * 个人优惠卷列表
+	 * 个人优惠券列表
 	 */
 	@GetMapping("/personal/list")
 	public Result<SearchResult<CouponUserView>> couponPersonalList(HttpServletRequest request) {
@@ -80,7 +80,7 @@ public class CouponFrontController {
 	}
 
 	/**
-	 * 可用优惠卷展示数量
+	 * 可用优惠券展示数量
 	 */
 	@GetMapping("/available/num")
 	public Result<Integer> availableCouponNum(Long skuId, Boolean isRenew) {
@@ -103,7 +103,7 @@ public class CouponFrontController {
 	}
 
 	/**
-	 * 推荐优惠卷列表
+	 * 推荐优惠券列表
 	 */
 	@GetMapping("/recommend/list")
 	public Result<SearchResult<CouponRecommendView>> getRecommendList(HttpServletRequest request) {
@@ -114,7 +114,7 @@ public class CouponFrontController {
 						.orderBy(CouponRecommendView::getId).desc()
 						.build());
 		search.getDataList().stream().filter(data -> {
-			//过滤新用户优惠卷
+			//过滤新用户优惠券
 			if (data.getScope() == Coupon.Scope.newUser && couponNewUserView != null) {
 				return false;
 			}
@@ -135,7 +135,7 @@ public class CouponFrontController {
 	}
 
 	/**
-	 * 一键领取推荐优惠卷
+	 * 一键领取推荐优惠券
 	 */
 	@PostMapping("/collect/recommend/whole")
 	public Result<String> collectWholeRecommendCoupon() {
@@ -145,7 +145,7 @@ public class CouponFrontController {
 	}
 
 	/**
-	 * 今日推荐优惠卷弹窗已弹
+	 * 今日推荐优惠券弹窗已弹
 	 */
 	@GetMapping("/get/recommend/appear")
 	public Result<Boolean> recommendIsAppear() {
@@ -159,29 +159,29 @@ public class CouponFrontController {
 	}
 
 	/**
-	 * 领取优惠卷
+	 * 领取优惠券
 	 */
 	@PostMapping("/collect")
 	@NoSubmit
 	public Result<String> collectCoupon(@RequestBody CouponCollectReq couponCollectReq) {
 		Long userId = StpUserUtil.getLoginIdAsLong();
 		couponFontService.collectCoupon(couponCollectReq, userId);
-		return GatewayResponse.SUCCESS.newBuilder().toResult("领取优惠卷成功");
+		return GatewayResponse.SUCCESS.newBuilder().toResult("领取优惠券成功");
 	}
 
 	/**
-	 * 领取推荐优惠卷
+	 * 领取推荐优惠券
 	 */
 	@PostMapping("/recommend/collect")
 	@NoSubmit
 	public Result<String> collectRecommendCoupon(@RequestBody CouponCollectReq couponCollectReq) {
 		Long userId = StpUserUtil.getLoginIdAsLong();
 		couponFontService.collectRecommendCoupon(couponCollectReq, userId);
-		return GatewayResponse.SUCCESS.newBuilder().toResult("领取优惠卷成功");
+		return GatewayResponse.SUCCESS.newBuilder().toResult("领取优惠券成功");
 	}
 
 	/**
-	 * 查询有可以领取的推荐优惠卷
+	 * 查询有可以领取的推荐优惠券
 	 */
 	@GetMapping("/recommend/collect/num")
 	public Result<Integer> collectRecommendCouponNum() {

netflix-web/src/main/java/com/cyksj/web/controller/manage/coupon/CouponController.java

@@ -56,16 +56,16 @@ public class CouponController {
 	private final CouponSkuMapper couponSkuMapper;
 
 	/**
-	 * 新增优惠卷
+	 * 新增优惠券
 	 */
 	@PostMapping
 	public Result<String> couponSave(@RequestBody @Validated Coupon coupon) throws Exception {
 		couponCommonService.saveCoupon(coupon);
-		return GatewayResponse.SUCCESS.newBuilder().toResult("新增优惠卷成功");
+		return GatewayResponse.SUCCESS.newBuilder().toResult("新增优惠券成功");
 	}
 
 	/**
-	 * 删除优惠卷
+	 * 删除优惠券
 	 */
 	@DeleteMapping("/{id}")
 	@Transactional(rollbackFor = Throwable.class)
@@ -75,43 +75,43 @@ public class CouponController {
 		couponActiveMapper.deleteByCouponId(id);
 		couponRecommendMapper.deleteByCouponId(id);
 		couponDistributePopularizeMapper.deleteByCouponId(id);
-		return GatewayResponse.SUCCESS.newBuilder().toResult("删除优惠卷成功");
+		return GatewayResponse.SUCCESS.newBuilder().toResult("删除优惠券成功");
 	}
 
 	/**
-	 * 修改优惠卷
+	 * 修改优惠券
 	 */
 	@PutMapping
 	public Result<String> putCoupon(@RequestBody @Validated Coupon coupon) throws Exception {
 		couponCommonService.updateCoupon(coupon);
-		return GatewayResponse.SUCCESS.newBuilder().toResult("修改优惠卷成功");
+		return GatewayResponse.SUCCESS.newBuilder().toResult("修改优惠券成功");
 	}
 
 	/**
-	 * 发放优惠卷
+	 * 发放优惠券
 	 */
 	@PostMapping("/send")
 	public Result<String> senCoupon(@RequestBody @Validated CouponActiveReq couponActiveReq) throws Exception {
 		couponCommonService.sendCoupon(couponActiveReq);
-		return GatewayResponse.SUCCESS.newBuilder().toResult("发放优惠卷成功");
+		return GatewayResponse.SUCCESS.newBuilder().toResult("发放优惠券成功");
 	}
 
 	/**
-	 * 优惠卷 设置为推荐优惠卷
+	 * 优惠券 设置为推荐优惠券
 	 */
 	@PutMapping("/set/hot/{couponId}")
 	public Result<String> setHotCoupon(@PathVariable @Min(value = 1) Long couponId) {
 		couponCommonService.setHotCoupon(couponId);
-		return GatewayResponse.SUCCESS.newBuilder().toResult("推荐优惠卷成功");
+		return GatewayResponse.SUCCESS.newBuilder().toResult("推荐优惠券成功");
 	}
 
 	/**
-	 * 优惠卷关联固定推广者
+	 * 优惠券关联固定推广者
 	 */
 	@PostMapping("/set/relation")
 	public Result<String> setPopularizeRelation(@RequestBody CouponDistributeReq couponDistributeReq) {
 		couponCommonService.setPopularizeRelation(couponDistributeReq);
-		return GatewayResponse.SUCCESS.newBuilder().toResult("优惠卷关联固定推广者成功");
+		return GatewayResponse.SUCCESS.newBuilder().toResult("优惠券关联固定推广者成功");
 	}
 
 	/**
@@ -124,7 +124,7 @@ public class CouponController {
 	}
 
 	/**
-	 * 关联某优惠卷列表
+	 * 关联某优惠券列表
 	 */
 	@GetMapping("/get/relation/list")
 	public Result<SearchResult<CouponDistributePopularizeView>> getRelationList(HttpServletRequest request) {
@@ -152,7 +152,7 @@ public class CouponController {
 	}
 
 	/**
-	 * 优惠卷列表
+	 * 优惠券列表
 	 */
 	@GetMapping
 	public Result<SearchResult<CouponView>> couponList(HttpServletRequest request) {
@@ -164,7 +164,7 @@ public class CouponController {
 	}
 
 	/**
-	 * 优惠卷发放列表
+	 * 优惠券发放列表
 	 */
 	@GetMapping("/active/list")
 	public Result<SearchResult<CouponActiveView>> couponActiveList(HttpServletRequest request) {
@@ -185,7 +185,7 @@ public class CouponController {
 	}
 
 	/**
-	 * 发放优惠卷停用
+	 * 发放优惠券停用
 	 */
 	@PutMapping("/active/putStatus/{couponActiveId}")
 	public Result<String> activePutStatus(@PathVariable Long couponActiveId) {
@@ -194,15 +194,15 @@ public class CouponController {
 			throw BusinessRuntimeException.getInstance("发放记录已不存在");
 		}
 		if (!couponActive.getStatus()) {
-			throw BusinessRuntimeException.getInstance("该发放优惠卷已停用");
+			throw BusinessRuntimeException.getInstance("该发放优惠券已停用");
 		}
 		couponActive.setStatus(false);
 		couponActiveMapper.updateById(couponActive);
-		return GatewayResponse.SUCCESS.newBuilder().toResult("停用发放优惠卷成功");
+		return GatewayResponse.SUCCESS.newBuilder().toResult("停用发放优惠券成功");
 	}
 
 	/**
-	 * 发放优惠卷失效
+	 * 发放优惠券失效
 	 */
 	@PutMapping("/active/putExpiryStatus/{couponActiveId}")
 	public Result<String> activePutExpiryStatus(@PathVariable Long couponActiveId) {
@@ -211,12 +211,12 @@ public class CouponController {
 			throw BusinessRuntimeException.getInstance("发放记录已不存在");
 		}
 		if (!couponActive.getExpiryStatus()) {
-			throw BusinessRuntimeException.getInstance("该发放优惠卷已失效");
+			throw BusinessRuntimeException.getInstance("该发放优惠券已失效");
 		}
 		couponActive.setExpiryStatus(false);
 		couponActive.setStatus(false);
 		couponActiveMapper.updateById(couponActive);
-		return GatewayResponse.SUCCESS.newBuilder().toResult("失效发放优惠卷成功");
+		return GatewayResponse.SUCCESS.newBuilder().toResult("失效发放优惠券成功");
 	}
 
 
@@ -242,13 +242,13 @@ public class CouponController {
 	}
 
 	/**
-	 * 推荐优惠卷设置/取消推荐
+	 * 推荐优惠券设置/取消推荐
 	 */
 	@PutMapping("/recommend/putStatus/{recommendId}")
 	public Result<String> putRecommendStatusById(@PathVariable Long recommendId) {
 		CouponRecommend couponRecommend = couponRecommendMapper.selectById(recommendId);
 		if (couponRecommend == null || !couponRecommend.getDeleted()) {
-			throw BusinessRuntimeException.getInstance("该推荐优惠卷不存在");
+			throw BusinessRuntimeException.getInstance("该推荐优惠券不存在");
 		}
 		couponRecommend.setStatus(!couponRecommend.getStatus());
 		couponRecommendMapper.updateById(couponRecommend);
@@ -256,13 +256,13 @@ public class CouponController {
 	}
 
 	/**
-	 * 删除推荐优惠卷
+	 * 删除推荐优惠券
 	 */
 	@DeleteMapping("/recommend/del/{recommendId}")
 	public Result<String> deleteRecommendById(@PathVariable Long recommendId) {
 		CouponRecommend couponRecommend = couponRecommendMapper.selectById(recommendId);
 		if (couponRecommend == null || !couponRecommend.getDeleted()) {
-			throw BusinessRuntimeException.getInstance("该推荐优惠卷不存在");
+			throw BusinessRuntimeException.getInstance("该推荐优惠券不存在");
 		}
 		if (couponRecommend.getStatus()) {
 			throw BusinessRuntimeException.getInstance("取消推荐优惠券，才可删除");
@@ -273,16 +273,16 @@ public class CouponController {
 			coupon.setHotStatus(false);
 			couponMapper.updateById(coupon);
 		}
-		return GatewayResponse.SUCCESS.newBuilder().toResult("删除推荐优惠卷成功");
+		return GatewayResponse.SUCCESS.newBuilder().toResult("删除推荐优惠券成功");
 	}
 
 	/**
-	 * 企业微信发放优惠卷
+	 * 企业微信发放优惠券
 	 */
 	@PostMapping("/corp/send")
 	public Result<String> corpSendCoupon(@RequestBody @Validated CorpCouponSendReq corpCouponSendReq) throws Exception {
 		couponCommonService.corpSendCoupon(corpCouponSendReq);
-		return GatewayResponse.SUCCESS.newBuilder().toResult("发放优惠卷成功");
+		return GatewayResponse.SUCCESS.newBuilder().toResult("发放优惠券成功");
 	}
 
 }