Merge branch 'master' of http://git.dayaedu.com/yonge/cooleshow into master

cooleshow-user/user-admin/src/main/java/com/yonge/cooleshow/admin/controller/ContractTemplateController.java

@@ -10,6 +10,7 @@ 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.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
@@ -62,9 +63,9 @@ public class ContractTemplateController extends BaseController {
 	}
 
 	@ApiOperation("新增")
-	@PostMapping(value = "/add", consumes = MediaType.APPLICATION_FORM_URLENCODED_VALUE, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
+	@PostMapping(value = "/add", consumes = MediaType.APPLICATION_JSON_UTF8_VALUE, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
 	@PreAuthorize("@pcs.hasPermissions('contractTemplate/add')")
-	public Object add(ContractTemplate contractTemplate) {
+	public HttpResponseResult<Object> add(@RequestBody ContractTemplate contractTemplate) {
         SysUser sysUser = sysUserFeignService.queryUserInfo();
         
         if(sysUser == null || sysUser.getId() == null){
@@ -78,9 +79,9 @@ public class ContractTemplateController extends BaseController {
 	}
 
 	@ApiOperation("更新")
-	@PostMapping(value = "/update", consumes = MediaType.APPLICATION_FORM_URLENCODED_VALUE, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
+	@PostMapping(value = "/update", consumes = MediaType.APPLICATION_JSON_UTF8_VALUE, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
 	@PreAuthorize("@pcs.hasPermissions('contractTemplate/update')")
-	public Object update(ContractTemplate tenantContractTemplate) {
+	public HttpResponseResult<Object> update(@RequestBody ContractTemplate tenantContractTemplate) {
 		contractTemplateService.update(tenantContractTemplate);
 		return succeed();
 	}
@@ -88,7 +89,7 @@ public class ContractTemplateController extends BaseController {
 	@ApiOperation("启用协议")
 	@PostMapping(value = "/updateStatus", consumes = MediaType.APPLICATION_FORM_URLENCODED_VALUE, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
 	@PreAuthorize("@pcs.hasPermissions('contractTemplate/updateStatus')")
-	public Object enableContract(int id) {
+	public HttpResponseResult<Object> enableContract(int id) {
         SysUser sysUser = sysUserFeignService.queryUserInfo();
         
 		contractTemplateService.enableContract(id, sysUser.getId());

cooleshow-user/user-admin/src/main/java/com/yonge/cooleshow/admin/controller/HolidaysFestivalsController.java

@@ -22,6 +22,7 @@ import com.yonge.cooleshow.auth.api.entity.SysUser;
 import com.yonge.cooleshow.biz.dal.entity.HolidaysFestivals;
 import com.yonge.cooleshow.biz.dal.service.HolidaysFestivalsService;
 import com.yonge.cooleshow.common.controller.BaseController;
+import com.yonge.cooleshow.common.entity.HttpResponseResult;
 import com.yonge.toolset.log.model.AuditLogAnnotation;
 
 @RequestMapping("holidaysFestivals")
@@ -38,7 +39,7 @@ public class HolidaysFestivalsController extends BaseController {
 	@ApiOperation("按年查询节假日")
 	@ApiImplicitParam(name = "year", value = "年份", required = false, dataType = "Integer", paramType = "path")
 	@GetMapping(value = "/query/{year}", consumes = MediaType.APPLICATION_FORM_URLENCODED_VALUE, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
-	public Object query(@PathVariable("year") Integer year) {
+	public HttpResponseResult<HolidaysFestivals> query(@PathVariable("year") Integer year) {
 		
 		HolidaysFestivals originHolidaysFestivals = holidaysFestivalsService.queryByYear(year);
 

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

@@ -0,0 +1,44 @@
+package com.yonge.cooleshow.admin.controller;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+
+import org.springframework.beans.factory.annotation.Autowired;
+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.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import com.yonge.cooleshow.biz.dal.entity.MemberPriceSettings;
+import com.yonge.cooleshow.biz.dal.service.MemberPriceSettingsService;
+import com.yonge.cooleshow.common.controller.BaseController;
+import com.yonge.cooleshow.common.entity.HttpResponseResult;
+import com.yonge.cooleshow.common.page.PageInfo;
+import com.yonge.cooleshow.common.page.QueryInfo;
+
+@RequestMapping("memberPriceSettings")
+@Api(tags = "会员价格设置")
+@RestController
+public class MemberPriceSettingsController extends BaseController {
+
+	@Autowired
+	private MemberPriceSettingsService memberPriceSettingsService;
+
+	@ApiOperation("分页查询")
+	@GetMapping(value = "/list")
+	@PreAuthorize("@pcs.hasPermissions('memberPriceSettings/list')")
+	public HttpResponseResult<PageInfo<MemberPriceSettings>> getList(QueryInfo queryInfo) {
+		return succeed(memberPriceSettingsService.queryPage(queryInfo));
+	}
+
+	@ApiOperation("更新")
+	@PostMapping(value = "/update", consumes = MediaType.APPLICATION_JSON_UTF8_VALUE, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
+	@PreAuthorize("@pcs.hasPermissions('memberPriceSettings/update')")
+	public HttpResponseResult<Object> update(@RequestBody MemberPriceSettings memberPriceSettings) {
+		memberPriceSettingsService.update(memberPriceSettings);
+		return succeed();
+	}
+}

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dao/MemberPriceSettingsDao.java

@@ -0,0 +1,9 @@
+package com.yonge.cooleshow.biz.dal.dao;
+
+import com.yonge.cooleshow.common.dal.BaseDAO;
+import com.yonge.cooleshow.biz.dal.entity.MemberPriceSettings;
+
+public interface MemberPriceSettingsDao extends BaseDAO<Integer, MemberPriceSettings> {
+
+	
+}

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

@@ -0,0 +1,115 @@
+package com.yonge.cooleshow.biz.dal.entity;
+
+import io.swagger.annotations.ApiModelProperty;
+
+import org.apache.commons.lang3.builder.ToStringBuilder;
+
+import com.yonge.cooleshow.biz.dal.enums.PeriodEnum;
+
+/**
+ * 对应数据库表(member_price_settings):
+ */
+public class MemberPriceSettings {
+
+	@ApiModelProperty(value = "",required = false)
+	private Integer id;
+	
+	@ApiModelProperty(value = "周期",required = false)
+	private PeriodEnum period;
+	
+	@ApiModelProperty(value = "销售价",required = false)
+	private java.math.BigDecimal salePrice;
+	
+	@ApiModelProperty(value = "原价",required = false)
+	private java.math.BigDecimal originalPrice;
+	
+	@ApiModelProperty(value = "创建时间",required = false)
+	private java.util.Date createTime;
+	
+	@ApiModelProperty(value = "更新时间",required = false)
+	private java.util.Date updateTime;
+	
+	@ApiModelProperty(value = "创建人",required = false)
+	private Long createBy;
+	
+	@ApiModelProperty(value = "更新人",required = false)
+	private Long updateBy;
+	
+	public MemberPriceSettings setId(Integer id){
+		this.id = id;
+		return this;
+	}
+	
+	public Integer getId(){
+		return this.id;
+	}
+			
+	public MemberPriceSettings setPeriod(PeriodEnum period){
+		this.period = period;
+		return this;
+	}
+	
+	public PeriodEnum getPeriod(){
+		return this.period;
+	}
+			
+	public MemberPriceSettings setSalePrice(java.math.BigDecimal salePrice){
+		this.salePrice = salePrice;
+		return this;
+	}
+	
+	public java.math.BigDecimal getSalePrice(){
+		return this.salePrice;
+	}
+			
+	public MemberPriceSettings setOriginalPrice(java.math.BigDecimal originalPrice){
+		this.originalPrice = originalPrice;
+		return this;
+	}
+	
+	public java.math.BigDecimal getOriginalPrice(){
+		return this.originalPrice;
+	}
+			
+	public MemberPriceSettings setCreateTime(java.util.Date createTime){
+		this.createTime = createTime;
+		return this;
+	}
+	
+	public java.util.Date getCreateTime(){
+		return this.createTime;
+	}
+			
+	public MemberPriceSettings setUpdateTime(java.util.Date updateTime){
+		this.updateTime = updateTime;
+		return this;
+	}
+	
+	public java.util.Date getUpdateTime(){
+		return this.updateTime;
+	}
+			
+	public MemberPriceSettings setCreateBy(Long createBy){
+		this.createBy = createBy;
+		return this;
+	}
+	
+	public Long getCreateBy(){
+		return this.createBy;
+	}
+			
+	public MemberPriceSettings setUpdateBy(Long updateBy){
+		this.updateBy = updateBy;
+		return this;
+	}
+	
+	public Long getUpdateBy(){
+		return this.updateBy;
+	}
+			
+	@Override
+	public String toString() {
+		return ToStringBuilder.reflectionToString(this);
+	}
+
+}

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

@@ -0,0 +1,29 @@
+package com.yonge.cooleshow.biz.dal.enums;
+
+import com.yonge.cooleshow.common.enums.BaseEnum;
+
+/**
+ * 周期
+ */
+public enum PeriodEnum implements BaseEnum<String, PeriodEnum> {
+	DAY("日"), MONTH("月"), QUARTERLY("季度"), YEAR_HALF("半年"), YEAR("年");
+
+	private String msg;
+
+	PeriodEnum(String msg) {
+		this.msg = msg;
+	}
+
+	public String getMsg() {
+		return msg;
+	}
+
+	public void setMsg(String msg) {
+		this.msg = msg;
+	}
+
+	@Override
+	public String getCode() {
+		return name();
+	}
+}

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

@@ -0,0 +1,8 @@
+package com.yonge.cooleshow.biz.dal.service;
+
+import com.yonge.cooleshow.biz.dal.entity.MemberPriceSettings;
+import com.yonge.cooleshow.common.service.BaseService;
+
+public interface MemberPriceSettingsService extends BaseService<Integer, MemberPriceSettings> {
+
+}

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

@@ -0,0 +1,23 @@
+package com.yonge.cooleshow.biz.dal.service.impl;
+
+import com.yonge.cooleshow.common.dal.BaseDAO;
+import org.springframework.beans.factory.annotation.Autowired;
+import com.yonge.cooleshow.common.service.impl.BaseServiceImpl;
+import org.springframework.stereotype.Service;
+
+import com.yonge.cooleshow.biz.dal.entity.MemberPriceSettings;
+import com.yonge.cooleshow.biz.dal.service.MemberPriceSettingsService;
+import com.yonge.cooleshow.biz.dal.dao.MemberPriceSettingsDao;
+
+@Service
+public class MemberPriceSettingsServiceImpl extends BaseServiceImpl<Integer, MemberPriceSettings>  implements MemberPriceSettingsService {
+	
+	@Autowired
+	private MemberPriceSettingsDao memberPriceSettingsDao;
+
+	@Override
+	public BaseDAO<Integer, MemberPriceSettings> getDAO() {
+		return memberPriceSettingsDao;
+	}
+	
+}

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

@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<!-- 这个文件是自动生成的。 不要修改此文件。所有改动将在下次重新自动生成时丢失。 -->
+<mapper namespace="com.yonge.cooleshow.biz.dal.dao.MemberPriceSettingsDao">
+
+	<resultMap type="com.yonge.cooleshow.biz.dal.entity.MemberPriceSettings"
+		id="BaseResultMap">
+		<result column="id_" property="id" />
+		<result column="period_" property="period" typeHandler="com.yonge.cooleshow.common.dal.CustomEnumTypeHandler" />
+		<result column="sale_price_" property="salePrice" />
+		<result column="original_price_" property="originalPrice" />
+		<result column="create_time_" property="createTime" />
+		<result column="update_time_" property="updateTime" />
+		<result column="create_by_" property="createBy" />
+		<result column="update_by_" property="updateBy" />
+	</resultMap>
+
+	<!-- 根据主键查询一条记录 -->
+	<select id="get" resultMap="BaseResultMap">
+		SELECT * FROM member_price_settings WHERE id_ = #{id}
+	</select>
+
+	<!-- 全查询 -->
+	<select id="findAll" resultMap="BaseResultMap">
+		SELECT * FROM member_price_settings ORDER BY id_
+	</select>
+
+	<!-- 向数据库增加一条记录 -->
+	<insert id="insert"
+		parameterType="com.yonge.cooleshow.biz.dal.entity.MemberPriceSettings"
+		useGeneratedKeys="true" keyColumn="id" keyProperty="id">
+		INSERT INTO
+		member_price_settings
+		(id_,period_,sale_price_,original_price_,create_time_,update_time_,create_by_,update_by_)
+		VALUES(#{id},#{period, typeHandler=com.yonge.cooleshow.common.dal.CustomEnumTypeHandler},#{salePrice},#{originalPrice},#{createTime},#{updateTime},#{createBy},#{updateBy})
+	</insert>
+
+	<!-- 根据主键查询一条记录 -->
+	<update id="update"
+		parameterType="com.yonge.cooleshow.biz.dal.entity.MemberPriceSettings">
+		UPDATE member_price_settings
+		<set>
+			<if test="salePrice != null">
+				sale_price_ = #{salePrice},
+			</if>
+			<if test="updateBy != null">
+				update_by_ = #{updateBy},
+			</if>
+			<if test="createBy != null">
+				create_by_ = #{createBy},
+			</if>
+			<if test="id != null">
+				id_ = #{id},
+			</if>
+			<if test="period != null">
+				period_ = #{period, typeHandler=com.yonge.cooleshow.common.dal.CustomEnumTypeHandler},
+			</if>
+			<if test="updateTime != null">
+				update_time_ = #{updateTime},
+			</if>
+			<if test="originalPrice != null">
+				original_price_ = #{originalPrice},
+			</if>
+			<if test="createTime != null">
+				create_time_ = #{createTime},
+			</if>
+		</set>
+		WHERE id_ = #{id}
+	</update>
+
+	<!-- 根据主键删除一条记录 -->
+	<delete id="delete">
+		DELETE FROM member_price_settings WHERE id_ = #{id}
+	</delete>
+
+	<!-- 分页查询 -->
+	<select id="queryPage" resultMap="BaseResultMap" parameterType="map">
+		SELECT * FROM member_price_settings ORDER BY id_
+		<include refid="global.limit" />
+	</select>
+
+	<!-- 查询当前表的总记录数 -->
+	<select id="queryCount" resultType="int">
+		SELECT COUNT(*) FROM member_price_settings
+	</select>
+</mapper>