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

mec-biz/src/main/java/com/ym/mec/biz/dal/dao/MusicGroupShippingAddressDao.java

@@ -0,0 +1,9 @@
+package com.ym.mec.biz.dal.dao;
+
+import com.ym.mec.common.dal.BaseDAO;
+import com.ym.mec.biz.dal.entity.MusicGroupShippingAddress;
+
+public interface MusicGroupShippingAddressDao extends BaseDAO<Integer, MusicGroupShippingAddress> {
+
+	
+}

mec-biz/src/main/java/com/ym/mec/biz/dal/dao/SubjectChangeDao.java

@@ -1,12 +1,14 @@
 package com.ym.mec.biz.dal.dao;
 
-import com.ym.mec.biz.dal.entity.SubjectChange;
-import com.ym.mec.common.dal.BaseDAO;
-import org.apache.ibatis.annotations.Param;
-
+import java.math.BigDecimal;
 import java.util.List;
 import java.util.Map;
 
+import org.apache.ibatis.annotations.Param;
+
+import com.ym.mec.biz.dal.entity.SubjectChange;
+import com.ym.mec.common.dal.BaseDAO;
+
 public interface SubjectChangeDao extends BaseDAO<Integer, SubjectChange> {
 
 
@@ -74,4 +76,11 @@ public interface SubjectChangeDao extends BaseDAO<Integer, SubjectChange> {
      * @return
      */
     List<SubjectChange> getMargin(@Param("musicGroupId") String musicGroupId);
+    
+    /**
+     * 获取总的课程差额
+     * @param musicGroupId
+     * @return
+     */
+    BigDecimal getTotalCourseMargin(@Param("musicGroupId") String musicGroupId);
 }

mec-biz/src/main/java/com/ym/mec/biz/dal/dto/TeacherBasicDto.java

@@ -9,6 +9,8 @@ public class TeacherBasicDto {
     private String username;
 
     private Integer organId;
+    
+    private String mobile;
 
     public Integer getOrganId() {
         return organId;
@@ -41,4 +43,12 @@ public class TeacherBasicDto {
     public void setUsername(String username) {
         this.username = username;
     }
+
+	public String getMobile() {
+		return mobile;
+	}
+
+	public void setMobile(String mobile) {
+		this.mobile = mobile;
+	}
 }

mec-biz/src/main/java/com/ym/mec/biz/dal/entity/MusicGroupShippingAddress.java

@@ -0,0 +1,125 @@
+package com.ym.mec.biz.dal.entity;
+
+import org.apache.commons.lang3.builder.ToStringBuilder;
+
+/**
+ * 对应数据库表(music_group_shipping_address):
+ */
+public class MusicGroupShippingAddress {
+
+	/**  */
+	private Integer id;
+	
+	/**  */
+	private String musicGroupId;
+	
+	/** 收货人 */
+	private Integer consigneeName;
+	
+	/** 手机号码 */
+	private String mobile;
+	
+	/** 省 */
+	private String regionProvince;
+	
+	/** 市 */
+	private String regionCity;
+	
+	/** 县/街道 */
+	private String regionCounty;
+	
+	/** 详细地址 */
+	private String detailAddress;
+	
+	/**  */
+	private java.util.Date updateTime;
+	
+	/**  */
+	private java.util.Date createTime;
+	
+	public void setId(Integer id){
+		this.id = id;
+	}
+	
+	public Integer getId(){
+		return this.id;
+	}
+			
+	public void setMusicGroupId(String musicGroupId){
+		this.musicGroupId = musicGroupId;
+	}
+	
+	public String getMusicGroupId(){
+		return this.musicGroupId;
+	}
+			
+	public void setConsigneeName(Integer consigneeName){
+		this.consigneeName = consigneeName;
+	}
+	
+	public Integer getConsigneeName(){
+		return this.consigneeName;
+	}
+			
+	public void setMobile(String mobile){
+		this.mobile = mobile;
+	}
+	
+	public String getMobile(){
+		return this.mobile;
+	}
+			
+	public void setRegionProvince(String regionProvince){
+		this.regionProvince = regionProvince;
+	}
+	
+	public String getRegionProvince(){
+		return this.regionProvince;
+	}
+			
+	public void setRegionCity(String regionCity){
+		this.regionCity = regionCity;
+	}
+	
+	public String getRegionCity(){
+		return this.regionCity;
+	}
+			
+	public void setRegionCounty(String regionCounty){
+		this.regionCounty = regionCounty;
+	}
+	
+	public String getRegionCounty(){
+		return this.regionCounty;
+	}
+			
+	public void setDetailAddress(String detailAddress){
+		this.detailAddress = detailAddress;
+	}
+	
+	public String getDetailAddress(){
+		return this.detailAddress;
+	}
+			
+	public void setUpdateTime(java.util.Date updateTime){
+		this.updateTime = updateTime;
+	}
+	
+	public java.util.Date getUpdateTime(){
+		return this.updateTime;
+	}
+			
+	public void setCreateTime(java.util.Date createTime){
+		this.createTime = createTime;
+	}
+	
+	public java.util.Date getCreateTime(){
+		return this.createTime;
+	}
+			
+	@Override
+	public String toString() {
+		return ToStringBuilder.reflectionToString(this);
+	}
+
+}

mec-biz/src/main/java/com/ym/mec/biz/dal/page/MusicGroupShippingAddressQueryInfo.java

@@ -0,0 +1,16 @@
+package com.ym.mec.biz.dal.page;
+
+import com.ym.mec.common.page.QueryInfo;
+
+public class MusicGroupShippingAddressQueryInfo extends QueryInfo {
+
+	private String musicGroupId;
+
+	public String getMusicGroupId() {
+		return musicGroupId;
+	}
+
+	public void setMusicGroupId(String musicGroupId) {
+		this.musicGroupId = musicGroupId;
+	}
+}

mec-biz/src/main/java/com/ym/mec/biz/service/MusicGroupShippingAddressService.java

@@ -0,0 +1,8 @@
+package com.ym.mec.biz.service;
+
+import com.ym.mec.biz.dal.entity.MusicGroupShippingAddress;
+import com.ym.mec.common.service.BaseService;
+
+public interface MusicGroupShippingAddressService extends BaseService<Integer, MusicGroupShippingAddress> {
+
+}

mec-biz/src/main/java/com/ym/mec/biz/service/impl/CooperationShareProfitServiceImpl.java

@@ -1,6 +1,7 @@
 package com.ym.mec.biz.service.impl;
 
 import com.ym.mec.biz.dal.dao.CourseScheduleDao;
+import com.ym.mec.biz.dal.dao.SubjectChangeDao;
 import com.ym.mec.biz.dal.dao.TeacherDao;
 import com.ym.mec.biz.dal.entity.CooperationShareProfitDto;
 import com.ym.mec.biz.dal.entity.CourseSchedule;
@@ -9,16 +10,20 @@ import com.ym.mec.common.exception.BizException;
 import com.ym.mec.common.page.PageInfo;
 import com.ym.mec.common.page.QueryInfo;
 import com.ym.mec.util.collection.MapUtil;
+
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+
 import com.ym.mec.common.service.impl.BaseServiceImpl;
 import com.ym.mec.biz.dal.entity.CooperationShareProfit;
 import com.ym.mec.biz.service.CooperationShareProfitService;
 import com.ym.mec.biz.dal.dao.CooperationShareProfitDao;
+
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 
+import java.math.BigDecimal;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -31,6 +36,9 @@ public class CooperationShareProfitServiceImpl extends BaseServiceImpl<Integer,
 	private CourseScheduleDao courseScheduleDao;
 	@Autowired
 	private TeacherDao teacherDao;
+	
+	@Autowired
+	private SubjectChangeDao subjectChangeDao;
 
 	@Override
 	public BaseDAO<Integer, CooperationShareProfit> getDAO() {
@@ -85,10 +93,21 @@ public class CooperationShareProfitServiceImpl extends BaseServiceImpl<Integer,
 		if(CollectionUtils.isEmpty(musicGroupIds)){
 			return;
 		}
+		
 		List<CooperationShareProfit> profits = cooperationShareProfitDao.initShareProfit(musicGroupIds);
 		if(CollectionUtils.isEmpty(profits)){
 			return;
 		}
+		
+		//存在声部更换的学生
+		BigDecimal courseMargin = BigDecimal.ZERO;
+		for(CooperationShareProfit sp : profits){
+			courseMargin = subjectChangeDao.getTotalCourseMargin(sp.getMusicGroupId());
+			if(courseMargin != null){
+				sp.setTotalAmount(courseMargin.add(sp.getTotalAmount()));
+			}
+		}
+		
 		cooperationShareProfitDao.batchInsert(profits);
 	}
 

mec-biz/src/main/java/com/ym/mec/biz/service/impl/MusicGroupShippingAddressServiceImpl.java

@@ -0,0 +1,23 @@
+package com.ym.mec.biz.service.impl;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import com.ym.mec.biz.dal.dao.MusicGroupShippingAddressDao;
+import com.ym.mec.biz.dal.entity.MusicGroupShippingAddress;
+import com.ym.mec.biz.service.MusicGroupShippingAddressService;
+import com.ym.mec.common.dal.BaseDAO;
+import com.ym.mec.common.service.impl.BaseServiceImpl;
+
+@Service
+public class MusicGroupShippingAddressServiceImpl extends BaseServiceImpl<Integer, MusicGroupShippingAddress>  implements MusicGroupShippingAddressService {
+	
+	@Autowired
+	private MusicGroupShippingAddressDao musicGroupShippingAddressDao;
+
+	@Override
+	public BaseDAO<Integer, MusicGroupShippingAddress> getDAO() {
+		return musicGroupShippingAddressDao;
+	}
+	
+}

mec-biz/src/main/java/com/ym/mec/biz/service/impl/StudentRegistrationServiceImpl.java

@@ -728,6 +728,7 @@ public class StudentRegistrationServiceImpl extends BaseServiceImpl<Long, Studen
                 spod.setCreateTime(date);
                 spod.setUpdateTime(date);
                 spod.setPaymentOrderId(studentPaymentOrder.getId());
+                spod.setTenantId(musicGroup.getTenantId());
                 studentPaymentOrderDetailList.add(spod);
             }
         }

mec-biz/src/main/java/com/ym/mec/biz/service/impl/SubjectChangeServiceImpl.java

@@ -50,6 +50,7 @@ import com.ym.mec.biz.dal.entity.StudentRegistration;
 import com.ym.mec.biz.dal.entity.SubjectChange;
 import com.ym.mec.biz.dal.entity.SysUserCashAccount;
 import com.ym.mec.biz.dal.entity.SysUserCashAccountDetail;
+import com.ym.mec.biz.dal.entity.SysUserCashAccountLog;
 import com.ym.mec.biz.dal.enums.AccountType;
 import com.ym.mec.biz.dal.enums.CouponDetailTypeEnum;
 import com.ym.mec.biz.dal.enums.DealStatusEnum;
@@ -61,6 +62,7 @@ import com.ym.mec.biz.dal.enums.OrderTypeEnum;
 import com.ym.mec.biz.dal.enums.PayStatus;
 import com.ym.mec.biz.dal.enums.PaymentChannelEnum;
 import com.ym.mec.biz.dal.enums.PlatformCashAccountDetailTypeEnum;
+import com.ym.mec.biz.dal.enums.ReturnFeeEnum;
 import com.ym.mec.biz.dal.enums.SellTypeEnum;
 import com.ym.mec.biz.dal.enums.StudentMusicGroupStatusEnum;
 import com.ym.mec.biz.dal.enums.SubjectChangeStatusEnum;
@@ -380,12 +382,15 @@ public class SubjectChangeServiceImpl extends BaseServiceImpl<Integer, SubjectCh
                 spod.setCreateTime(date);
                 spod.setUpdateTime(date);
                 spod.setPaymentOrderId(studentPaymentOrder.getId());
+                spod.setTenantId(tenantId);
                 studentPaymentOrderDetailList.add(spod);
                 
                 totalPrice = totalPrice.add(spod.getPrice());
             }
         	
+            int i = 0;
         	for(String goodsIdStr : goodsIdsStr.split(",")){
+        		i++;
         		if(StringUtils.isBlank(goodsIdStr)){
 					continue;
 				}
@@ -406,7 +411,7 @@ public class SubjectChangeServiceImpl extends BaseServiceImpl<Integer, SubjectCh
                 
                 BigDecimal tempPrice = studentPaymentOrder.getExpectAmount().multiply(goods.getGroupPurchasePrice()).divide(goodsTotalGroupPurchasePrice, BigDecimal.ROUND_DOWN).setScale(2, BigDecimal.ROUND_DOWN);
                 
-                if(totalPrice.add(tempPrice).compareTo(studentPaymentOrder.getExpectAmount()) > 0 || goodsIdsStr.split(",").length == studentPaymentOrderDetailList.size() + 1){
+                if(totalPrice.add(tempPrice).compareTo(studentPaymentOrder.getExpectAmount()) > 0 || goodsIdsStr.split(",").length == i){
                 	studentPaymentOrderDetail.setPrice(studentPaymentOrder.getExpectAmount().subtract(totalPrice));
                 }else{
                 	studentPaymentOrderDetail.setPrice(tempPrice);
@@ -555,6 +560,18 @@ public class SubjectChangeServiceImpl extends BaseServiceImpl<Integer, SubjectCh
         subjectChangeDao.insert(subjectChange);
         //差价小于0退到余额
         if (amountMargin.compareTo(BigDecimal.ZERO) <= 0) {
+            //sysUserCashAccountService.updateBalance(subjectChange.getStudentId(), amountMargin.negate(), PlatformCashAccountDetailTypeEnum.REFUNDS, "声部更换退还");
+            if (amountMargin.compareTo(BigDecimal.ZERO) < 0) {
+                SysUserCashAccountLog sysUserCashAccountLog = new SysUserCashAccountLog();
+                sysUserCashAccountLog.setUserId(subjectChange.getStudentId());
+                sysUserCashAccountLog.setGroupType(SUBJECT_CHANGE);
+                sysUserCashAccountLog.setOrganId(subjectChange.getOrganId());
+                sysUserCashAccountLog.setGroupId(subjectChange.getId().toString());
+                sysUserCashAccountLog.setAmount(amountMargin.negate());
+                sysUserCashAccountLog.setReturnFeeType(ReturnFeeEnum.SUBJECT_CHANGE);
+                sysUserCashAccountLog.setComment("声部更换退还");
+                sysUserCashAccountLogDao.insert(sysUserCashAccountLog);
+            }
             studentRegistrationService.changeStudentSubject(subjectChange.getStudentId(), subjectChange.getMusicGroupId(), subjectChange.getOriginalSubjectId(), subjectChange.getChangeSubjectId());
         }
 
@@ -712,6 +729,7 @@ public class SubjectChangeServiceImpl extends BaseServiceImpl<Integer, SubjectCh
 	                    spod.setCreateTime(nowDate);
 	                    spod.setUpdateTime(nowDate);
 	                    spod.setPaymentOrderId(studentPaymentOrder.getId());
+	                    spod.setTenantId(studentPaymentOrder.getTenantId());
 	                    studentPaymentOrderDetailList.add(spod);
 	                }
 				}

mec-biz/src/main/resources/config/mybatis/MusicGroupShippingAddressMapper.xml

@@ -0,0 +1,93 @@
+<?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.ym.mec.biz.dal.dao.MusicGroupShippingAddressDao">
+
+	<resultMap type="com.ym.mec.biz.dal.entity.MusicGroupShippingAddress"
+		id="MusicGroupShippingAddress">
+		<result column="id_" property="id" />
+		<result column="music_group_id_" property="musicGroupId" />
+		<result column="consignee_name_" property="consigneeName" />
+		<result column="mobile_" property="mobile" />
+		<result column="region_province_" property="regionProvince" />
+		<result column="region_city_" property="regionCity" />
+		<result column="region_county_" property="regionCounty" />
+		<result column="detail_address_" property="detailAddress" />
+		<result column="update_time_" property="updateTime" />
+		<result column="create_time_" property="createTime" />
+	</resultMap>
+
+	<!-- 根据主键查询一条记录 -->
+	<select id="get" resultMap="MusicGroupShippingAddress">
+		SELECT * FROM music_group_shipping_address WHERE id_ = #{id}
+	</select>
+
+	<!-- 全查询 -->
+	<select id="findAll" resultMap="MusicGroupShippingAddress">
+		SELECT * FROM music_group_shipping_address ORDER BY id_
+	</select>
+
+	<!-- 向数据库增加一条记录 -->
+	<insert id="insert" parameterType="com.ym.mec.biz.dal.entity.MusicGroupShippingAddress"
+		useGeneratedKeys="true" keyColumn="id" keyProperty="id">
+		<!-- <selectKey resultClass="int" keyProperty="id" > SELECT SEQ_WSDEFINITION_ID.nextval 
+			AS ID FROM DUAL </selectKey> -->
+		INSERT INTO music_group_shipping_address
+		(id_,music_group_id_,consignee_name_,mobile_,region_province_,region_city_,region_county_,detail_address_,update_time_,create_time_)
+		VALUES(#{id},#{musicGroupId},#{consigneeName},#{mobile},#{regionProvince},#{regionCity},#{regionCounty},#{detailAddress},#{updateTime},#{createTime})
+	</insert>
+
+	<!-- 根据主键查询一条记录 -->
+	<update id="update" parameterType="com.ym.mec.biz.dal.entity.MusicGroupShippingAddress">
+		UPDATE music_group_shipping_address
+		<set>
+			<if test="consigneeName != null">
+				consignee_name_ = #{consigneeName},
+			</if>
+			<if test="id != null">
+				id_ = #{id},
+			</if>
+			<if test="detailAddress != null">
+				detail_address_ = #{detailAddress},
+			</if>
+			<if test="updateTime != null">
+				update_time_ = #{updateTime},
+			</if>
+			<if test="regionCounty != null">
+				region_county_ = #{regionCounty},
+			</if>
+			<if test="regionProvince != null">
+				region_province_ = #{regionProvince},
+			</if>
+			<if test="mobile != null">
+				mobile_ = #{mobile},
+			</if>
+			<if test="regionCity != null">
+				region_city_ = #{regionCity},
+			</if>
+			<if test="musicGroupId != null">
+				music_group_id_ = #{musicGroupId},
+			</if>
+			<if test="createTime != null">
+				create_time_ = #{createTime},
+			</if>
+		</set>
+		WHERE id_ = #{id}
+	</update>
+
+	<!-- 根据主键删除一条记录 -->
+	<delete id="delete">
+		DELETE FROM music_group_shipping_address WHERE id_ = #{id}
+	</delete>
+
+	<!-- 分页查询 -->
+	<select id="queryPage" resultMap="MusicGroupShippingAddress" parameterType="map">
+		SELECT * FROM music_group_shipping_address ORDER BY id_
+		<include refid="global.limit" />
+	</select>
+
+	<!-- 查询当前表的总记录数 -->
+	<select id="queryCount" resultType="int">
+		SELECT COUNT(*) FROM music_group_shipping_address
+	</select>
+</mapper>

mec-biz/src/main/resources/config/mybatis/SubjectChangeMapper.xml

@@ -317,4 +317,12 @@
           AND status_ = 2
         GROUP BY student_id_
     </select>
+    
+    <select id="getTotalCourseMargin" resultType="java.math.BigDecimal">
+        SELECT SUM(course_margin_)
+        FROM subject_change
+        WHERE music_group_id_ = #{musicGroupId}
+          AND status_ = 2
+        GROUP BY music_group_id_
+    </select>
 </mapper>

mec-biz/src/main/resources/config/mybatis/TeacherMapper.xml

@@ -520,6 +520,7 @@
         <result property="username" column="username_"/>
         <result property="realName" column="real_name_"/>
         <result property="organId" column="organ_id_"/>
+        <result property="mobile" column="phone_"/>
     </resultMap>
 
     <resultMap id="ExtendTeacherBasicDto" type="com.ym.mec.biz.dal.dto.ExtendTeacherBasicDto" extends="TeacherBasicDto">
@@ -565,7 +566,8 @@
             su.id_,
             su.username_,
             su.real_name_,
-            t.organ_id_
+            t.organ_id_,
+            su.phone_
         FROM
             teacher t
             LEFT JOIN sys_user su ON t.id_ = su.id_
@@ -666,7 +668,8 @@
             su.id_,
             su.username_,
             su.real_name_,
-            t.organ_id_
+            t.organ_id_,
+            su.phone_
         FROM
             teacher t
             LEFT JOIN sys_user su ON t.id_ = su.id_
@@ -679,7 +682,8 @@
             su.id_,
             su.username_,
             su.real_name_,
-            t.organ_id_
+            t.organ_id_,
+            su.phone_
         FROM
             teacher t
             LEFT JOIN sys_user su ON t.id_ = su.id_
@@ -935,7 +939,7 @@
                 and FIND_IN_SET(organ_id_,#{organId})
     </select>
     <select id="findByFlowOrganRangeTeachers" resultMap="TeacherBasicDto">
-        SELECT su.id_,su.username_,su.real_name_,t.organ_id_ FROM teacher t
+        SELECT su.id_,su.username_,su.real_name_,t.organ_id_,su.phone_ FROM teacher t
         LEFT JOIN sys_user su ON t.id_ = su.id_
         WHERE su.del_flag_ = 0
             AND (INTE_ARRAY(#{organId},t.flow_organ_range_) OR FIND_IN_SET(t.organ_id_,#{organId}))
@@ -956,7 +960,7 @@
         </foreach>
     </select>
     <select id="findTeacherByOrganId" resultMap="TeacherBasicDto">
-        SELECT su.id_,su.username_,su.real_name_ FROM teacher t
+        SELECT su.id_,su.username_,su.real_name_,su.phone_ FROM teacher t
         LEFT JOIN sys_user su ON t.id_ = su.id_
         WHERE su.del_flag_ != 1 AND su.lock_flag_!=1
             AND (FIND_IN_SET(t.organ_id_,#{organId}) OR INTE_ARRAY(t.flow_organ_range_,#{organId}))

mec-web/src/main/java/com/ym/mec/web/controller/MusicGroupShippingAddressController.java

@@ -0,0 +1,71 @@
+package com.ym.mec.web.controller;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+
+import java.util.Date;
+
+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.ym.mec.biz.dal.entity.MusicGroupShippingAddress;
+import com.ym.mec.biz.dal.page.MusicGroupShippingAddressQueryInfo;
+import com.ym.mec.biz.service.MusicGroupShippingAddressService;
+import com.ym.mec.common.controller.BaseController;
+import com.ym.mec.common.entity.HttpResponseResult;
+import com.ym.mec.common.page.PageInfo;
+import com.yonge.log.model.AuditLogAnnotation;
+
+@Api(tags = "乐团收货地址")
+@RestController
+@RequestMapping("musicGroupShippingAddress")
+public class MusicGroupShippingAddressController extends BaseController {
+
+	@Autowired
+	private MusicGroupShippingAddressService musicGroupShippingAddressService;
+
+	@ApiOperation(value = "查询所有收货地址列表")
+	@GetMapping(value = "/queryPage", consumes = MediaType.APPLICATION_FORM_URLENCODED_VALUE, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
+	@PreAuthorize("@pcs.hasPermissions('musicGroupShippingAddress/queryPage')")
+	public HttpResponseResult<PageInfo<MusicGroupShippingAddress>> findAll(MusicGroupShippingAddressQueryInfo queryInfo) {
+
+		return succeed(musicGroupShippingAddressService.queryPage(queryInfo));
+	}
+
+	@ApiOperation(value = "查询所有收货地址列表")
+	@GetMapping(value = "/query", consumes = MediaType.APPLICATION_FORM_URLENCODED_VALUE, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
+	@PreAuthorize("@pcs.hasPermissions('musicGroupShippingAddress/query')")
+	public HttpResponseResult<MusicGroupShippingAddress> query(Integer id) {
+		return succeed(musicGroupShippingAddressService.get(id));
+	}
+
+	@ApiOperation("新增")
+	@PostMapping(value = "/add", consumes = MediaType.APPLICATION_JSON_UTF8_VALUE, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
+	@AuditLogAnnotation(operateName = "乐团收货地址新增", interfaceURL = "musicGroupShippingAddress/add")
+	@PreAuthorize("@pcs.hasPermissions('musicGroupShippingAddress/add')")
+	public Object add(@RequestBody MusicGroupShippingAddress shippingAddress) {
+
+		return succeed(musicGroupShippingAddressService.insert(shippingAddress));
+	}
+
+	@ApiOperation("修改")
+	@PostMapping(value = "/update", consumes = MediaType.APPLICATION_JSON_UTF8_VALUE, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
+	@AuditLogAnnotation(operateName = "乐团收货地址修改", interfaceURL = "musicGroupShippingAddress/update")
+	@PreAuthorize("@pcs.hasPermissions('musicGroupShippingAddress/update')")
+	public Object update(@RequestBody MusicGroupShippingAddress shippingAddress) {
+		Date date = new Date();
+		shippingAddress.setUpdateTime(date);
+		MusicGroupShippingAddress originNewsInfo = musicGroupShippingAddressService.get(shippingAddress.getId());
+		if (originNewsInfo == null) {
+			return failed("请求参数错误");
+		}
+
+		return succeed(musicGroupShippingAddressService.update(shippingAddress));
+	}
+}