Merge branch 'sys_coupon' of http://git.dayaedu.com/yonge/mec

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

@@ -40,4 +40,10 @@ public interface SysCouponCodeDao extends BaseDAO<Long, SysCouponCode> {
      * @return
      */
     List<HorseRaceLampDto> queryHorseRaceLampDtoList(Map<String, Object> params);
+
+    /**
+     * 支付失败退还优惠券
+     * @param couponCodeId
+     */
+    void quit(@Param("couponCodeId") String couponCodeId);
 }

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

@@ -30,6 +30,9 @@ public class SysCouponCodeDto {
     @ApiModelProperty("优惠券编号")
     private Integer couponId;
 
+    @ApiModelProperty("优惠券编号")
+    private Integer couponCodeId;
+
     @ApiModelProperty("优惠券类型")
     private CouponTypeEnum couponType;
 
@@ -66,6 +69,14 @@ public class SysCouponCodeDto {
     @ApiModelProperty("使用截止日期")
     private java.util.Date useDeadlineDate;
 
+    public Integer getCouponCodeId() {
+        return couponCodeId;
+    }
+
+    public void setCouponCodeId(Integer couponCodeId) {
+        this.couponCodeId = couponCodeId;
+    }
+
     public Integer getOrganId() {
         return organId;
     }

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

@@ -61,6 +61,17 @@ public class StudentGoodsSell {
 	@ApiModelProperty(value = "合作单位编号", required = false)
 	private Integer cooperationOrganId;
 
+	@ApiModelProperty(value = "优惠券列表", required = false)
+	private List<Integer> couponIdList;
+
+	public List<Integer> getCouponIdList() {
+		return couponIdList;
+	}
+
+	public void setCouponIdList(List<Integer> couponIdList) {
+		this.couponIdList = couponIdList;
+	}
+
 	public Integer getCooperationOrganId() {
 		return cooperationOrganId;
 	}

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

@@ -122,6 +122,28 @@ public class StudentPaymentOrder {
 	
 	private String batchNo;
 
+	@ApiModelProperty(value = "优惠券编号列表",required = true)
+	private String couponCodeId;
+
+	@ApiModelProperty(value = "优惠券减免总额",required = true)
+	private BigDecimal couponRemitFee = BigDecimal.ZERO;
+
+	public String getCouponCodeId() {
+		return couponCodeId;
+	}
+
+	public void setCouponCodeId(String couponCodeId) {
+		this.couponCodeId = couponCodeId;
+	}
+
+	public BigDecimal getCouponRemitFee() {
+		return couponRemitFee;
+	}
+
+	public void setCouponRemitFee(BigDecimal couponRemitFee) {
+		this.couponRemitFee = couponRemitFee;
+	}
+
 	public String getReceiveStatus() {
 		return receiveStatus;
 	}

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

@@ -3536,6 +3536,9 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
     @Override
     public MusicGroup getMusicGroupDetail(String musicGroupId) {
         MusicGroup musicGroup = musicGroupDao.get(musicGroupId);
+        if(musicGroup == null){
+            throw new BizException("乐团信息不存在");
+        }
         musicGroup.setEducationalTeacherName(teacherDao.queryNameById(musicGroup.getEducationalTeacherId()));
         musicGroup.setTeamTeacherName(teacherDao.queryNameById(musicGroup.getTeamTeacherId()));
         musicGroup.setDirectorUserName(teacherDao.queryNameById(musicGroup.getDirectorUserId()));

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

@@ -78,6 +78,8 @@ public class StudentRepairServiceImpl extends BaseServiceImpl<Integer, StudentRe
     private StudentInstrumentService studentInstrumentService;
     @Autowired
     private StudentGoodsSellService studentGoodsSellService;
+    @Autowired
+    private SysCouponCodeDao sysCouponCodeDao;
 
     private final Logger logger = LoggerFactory.getLogger(this.getClass());
 
@@ -144,6 +146,11 @@ public class StudentRepairServiceImpl extends BaseServiceImpl<Integer, StudentRe
                 if (orderByOrderNo.getBalancePaymentAmount() != null && orderByOrderNo.getBalancePaymentAmount().compareTo(BigDecimal.ZERO) > 0) {
                     sysUserCashAccountService.updateBalance(orderByOrderNo.getUserId(), orderByOrderNo.getBalancePaymentAmount(), PlatformCashAccountDetailTypeEnum.REFUNDS, "关闭订单");
                 }
+                //退优惠券
+                String couponCodeId = orderByOrderNo.getCouponCodeId();
+                if(StringUtils.isNotEmpty(couponCodeId)){
+                    sysCouponCodeDao.quit(couponCodeId);
+                }
             }
             StudentGoodsSell byOrderNo = studentGoodsSellDao.findByOrderNo(studentGoodsSell.getOrderNo());
             if (byOrderNo != null) {

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

@@ -35,6 +35,8 @@
         <result column="version_" property="version"/>
         <result column="receive_status_" property="receiveStatus"/>
         <result column="batch_no_" property="batchNo"/>
+        <result column="coupon_code_id_" property="couponCodeId"/>
+        <result column="coupon_remit_fee_" property="couponRemitFee"/>
     </resultMap>
 
     <resultMap type="com.ym.mec.biz.dal.dto.StudentPaymentOrderDto" extends="StudentPaymentOrder"

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

@@ -26,6 +26,7 @@
 		<result column="user_id_" property="userId"/>
 		<result column="username_" property="userName"/>
 		<result column="phone_" property="phone"/>
+		<result column="coupon_code_id_" property="couponCodeId"/>
 		<result column="coupon_id_" property="couponId"/>
 		<result column="coupon_type_" property="couponType" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
 		<result column="coupon_name_" property="couponName"/>
@@ -105,6 +106,9 @@
 		</set>
 		WHERE id_ = #{id}
 	</update>
+	<update id="quit">
+		UPDATE sys_coupon_code SET usage_status_ = 0,used_time_ = NULL,update_time_ = NOW() WHERE FIND_IN_SET(id_,#{couponCodeId})
+	</update>
 
 	<!-- 根据主键删除一条记录 -->
 	<delete id="delete" >
@@ -164,6 +168,7 @@
 		    scc.user_id_,
 			su.username_,
 			su.phone_,
+			scc.id_ coupon_code_id_,
 			scc.coupon_id_,
 			sc.type_ coupon_type_,
 			sc.name_ coupon_name_,

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

@@ -334,6 +334,9 @@ public class MusicGroupController extends BaseController {
 	@ApiImplicitParams({@ApiImplicitParam(name = "musicGroupId", value = "乐团编号", required = true, dataType = "String")})
 	public HttpResponseResult<Map<Integer,String>> getGradeList(String musicGroupId) {
 		MusicGroup musicGroup = musicGroupService.get(musicGroupId);
+		if (musicGroup == null) {
+			return failed("乐团信息不存在");
+		}
 		return succeed(organizationService.getGradeList(musicGroup.getOrganId()));
 	}