Merge branch 'feature/1113-vipCourse' of http://git.dayaedu.com/yonge/cooleshow into develop-new

cooleshow-app/src/main/java/com/yonge/cooleshow/admin/controller/MemberPriceSettingsController.java

@@ -1,13 +1,11 @@
 package com.yonge.cooleshow.admin.controller;
 
-import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.yonge.cooleshow.auth.api.client.SysUserFeignService;
-import com.yonge.cooleshow.auth.api.entity.SysUser;
 import com.yonge.cooleshow.biz.dal.dto.search.MemberPriceSettingsSearch;
 import com.yonge.cooleshow.biz.dal.entity.MemberPriceSettings;
 import com.yonge.cooleshow.biz.dal.service.MemberPriceSettingsService;
+import com.yonge.cooleshow.biz.dal.service.SysUserService;
 import com.yonge.cooleshow.biz.dal.vo.MemberPriceSettingsVo;
 import com.yonge.cooleshow.common.controller.BaseController;
 import com.yonge.cooleshow.common.entity.HttpResponseResult;
@@ -15,17 +13,11 @@ import com.yonge.toolset.base.page.PageInfo;
 import com.yonge.toolset.mybatis.support.PageUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
 import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
+import javax.annotation.Resource;
 import javax.validation.Valid;
 import java.util.Date;
 
@@ -33,10 +25,10 @@ import java.util.Date;
 @Api(tags = "会员价格设置")
 @RestController
 public class MemberPriceSettingsController extends BaseController {
-	@Autowired
+	@Resource
 	private MemberPriceSettingsService memberPriceSettingsService;
-	@Autowired
-	private SysUserFeignService sysUserFeignService;
+	@Resource
+	private SysUserService sysUserService;
 
 	/**
 	 * 查询单条
@@ -65,11 +57,7 @@ public class MemberPriceSettingsController extends BaseController {
 	@ApiOperation(value = "修改", notes = "传入memberPriceSettings")
 	@PreAuthorize("@pcs.hasPermissions('memberPriceSettings/update')")
 	public HttpResponseResult<Boolean> update(@Valid @RequestBody MemberPriceSettings memberPriceSettings) {
-		SysUser user = sysUserFeignService.queryUserInfo();
-		if (user == null || user.getId() == null) {
-			return failed(HttpStatus.FORBIDDEN, "请登录");
-		}
-		memberPriceSettings.setUpdateBy(user.getId());
+		memberPriceSettings.setUpdateBy(sysUserService.getUserId());
 		memberPriceSettings.setUpdateTime(new Date());
 		boolean update = memberPriceSettingsService.update(memberPriceSettings, new UpdateWrapper<MemberPriceSettings>().lambda()
 				.set(MemberPriceSettings::getDesc, memberPriceSettings.getDesc())

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dto/search/MemberPriceSettingsSearch.java

@@ -27,4 +27,7 @@ public class MemberPriceSettingsSearch extends QueryInfo{
 	@ApiModelProperty("VIP,SVIP")
 	private EVipType vipType;
 
+	@ApiModelProperty("会员类型")
+	private String searchType;
+
 }

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/entity/MemberPriceSettings.java

@@ -25,47 +25,58 @@ public class MemberPriceSettings implements Serializable {
 	private static final long serialVersionUID = 1L;
 	@TableId(value = "id_", type = IdType.AUTO)
 	private Long id;
+
 	@ApiModelProperty("周期 ")
 	@TableField(value = "period_")
 	private PeriodEnum period;
+
 	@PositiveOrZero(message = "销售价必须大于等于0")
 	@ApiModelProperty("销售价 ")
 	@TableField(value = "sale_price_")
 	private BigDecimal salePrice;
+
 	@PositiveOrZero(message = "原价必须大于等于0")
 	@ApiModelProperty("原价 ")
 	@TableField(value = "original_price_")
 	private BigDecimal originalPrice;
+
 	@ApiModelProperty("创建时间 ")
 	@TableField(value = "create_time_")
 	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
 	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
 	private Date createTime;
+
 	@ApiModelProperty("更新时间 ")
 	@TableField(value = "update_time_")
 	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
 	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
 	private Date updateTime;
+
 	@ApiModelProperty("创建人 ")
 	@TableField(value = "create_by_")
 	private Long createBy;
+
 	@ApiModelProperty("更新人 ")
 	@TableField(value = "update_by_")
 	private Long updateBy;
 
-
     @ApiModelProperty("状态 1:启用 0:停用 ")
     @TableField(value = "status_")
     private Boolean status;
 
-
     @ApiModelProperty("描述文案")
     @TableField(value = "desc_")
     private String desc;
 
-
-
     @ApiModelProperty("会员类型")
     @TableField(value = "vip_type_")
     private EVipType vipType;
+
+	@ApiModelProperty("折扣")
+	@TableField(value = "discount_rate_")
+	private BigDecimal discountRate;
+
+	@ApiModelProperty("适用范围")
+	@TableField(value = "product_type_")
+	private String productType;
 }

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/enums/EVipType.java

@@ -15,6 +15,7 @@ public enum EVipType implements BaseEnum<String, EVipType> {
 
     VIP("VIP"),
     SVIP("SVIP"),
+    DISCOUNT("DISCOUNT"),
 
 
     // 业务用字段

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/MemberPriceSettingsServiceImpl.java

@@ -6,21 +6,16 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.google.common.collect.Lists;
 import com.yonge.cooleshow.auth.api.client.SysUserFeignService;
 import com.yonge.cooleshow.auth.api.entity.SysUser;
+import com.yonge.cooleshow.biz.dal.dao.MemberPriceSettingsDao;
 import com.yonge.cooleshow.biz.dal.dao.UserOrderDao;
 import com.yonge.cooleshow.biz.dal.dto.ActivityPlanRewardDto;
 import com.yonge.cooleshow.biz.dal.dto.req.OrderReq;
+import com.yonge.cooleshow.biz.dal.dto.search.MemberPriceSettingsSearch;
 import com.yonge.cooleshow.biz.dal.dto.search.OrderSearch;
 import com.yonge.cooleshow.biz.dal.entity.*;
 import com.yonge.cooleshow.biz.dal.enums.*;
-import com.yonge.cooleshow.biz.dal.entity.VipCardRecord;
 import com.yonge.cooleshow.biz.dal.service.*;
-
-import com.yonge.cooleshow.biz.dal.vo.ShareProfitVo;
-import com.yonge.cooleshow.biz.dal.vo.StudentVo;
-import com.yonge.cooleshow.biz.dal.vo.UserOrderDetailVo;
-
 import com.yonge.cooleshow.biz.dal.vo.*;
-
 import com.yonge.cooleshow.biz.dal.vo.res.OrderCreateRes;
 import com.yonge.cooleshow.biz.dal.wrapper.UserPaymentOrderWrapper;
 import com.yonge.cooleshow.biz.dal.wrapper.VipCardRecordWrapper;
@@ -31,17 +26,18 @@ import com.yonge.toolset.base.exception.BizException;
 import com.yonge.toolset.thirdparty.message.MessageSenderPluginContext;
 import com.yonge.toolset.utils.date.DateUtil;
 import org.joda.time.DateTime;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import com.yonge.cooleshow.biz.dal.dto.search.MemberPriceSettingsSearch;
-import com.yonge.cooleshow.biz.dal.dao.MemberPriceSettingsDao;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.math.BigDecimal;
-import java.util.*;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 import java.util.stream.Collectors;
 
 
@@ -71,9 +67,6 @@ public class MemberPriceSettingsServiceImpl extends ServiceImpl<MemberPriceSetti
     @Autowired
     private UserOrderDao userOrderDao;
 
-    @Autowired
-    private RedisCacheService redisCacheService;
-
     @Override
     public MemberPriceSettingsVo detail(Long id) {
         return baseMapper.detail(id);

cooleshow-user/user-biz/src/main/resources/config/mybatis/MemberPriceSettingsMapper.xml

@@ -13,6 +13,8 @@
 		<result column="status_" property="status" />
 		<result column="desc_" property="desc" />
 		<result column="vip_type_" property="vipType" />
+		<result column="discount_rate_" property="discountRate" />
+		<result column="product_type_" property="productType" />
 	</resultMap>
 
 	<!-- 表字段 -->
@@ -28,6 +30,8 @@
         , t.status_ as status
         , t.desc_ as `desc`
         , t.vip_type_ as vipType
+		, t.discount_rate_ as discountRate
+        , t.product_type_ as productType
         </sql>
 
 	<select id="detail" resultType="com.yonge.cooleshow.biz.dal.vo.MemberPriceSettingsVo">
@@ -52,6 +56,9 @@
 			<if test="param.vipType != null">
 				and t.vip_type_ = #{param.vipType}
 			</if>
+			<if test="param.searchType != null and param.searchType != ''">
+				and FIND_IN_SET(t.vip_type_,#{param.searchType})
+			</if>
 		</where>
 	</sql>