add 福袋活动接口

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

@@ -9,6 +9,7 @@
 		<result column="charge_type_" property="chargeType"/>
 		<result column="organ_id_" property="organId"/>
 		<result column="amount_" property="amount" />
+		<result column="discount_amount_" property="discountAmount" />
 		<result column="detail_" property="detail" />
 		<result column="create_time_" property="createTime" />
 		<result column="update_time_" property="updateTime" />
@@ -32,8 +33,8 @@
 	<insert id="insert" parameterType="com.ym.mec.biz.dal.entity.SporadicChargeInfo"
 		useGeneratedKeys="true" keyColumn="id" keyProperty="id">
 		INSERT INTO sporadic_charge_info
-		(title_,charge_type_,organ_id_,amount_,detail_,create_time_,update_time_,operator_id_,user_id_)
-		VALUES(#{title},#{chargeType},#{organId},#{amount},#{detail},now(),now(),#{operatorId},#{userId})
+		(title_,charge_type_,organ_id_,amount_,discount_amount_,detail_,create_time_,update_time_,operator_id_,user_id_)
+		VALUES(#{title},#{chargeType},#{organId},#{amount},#{discountAmount},#{detail},now(),now(),#{operatorId},#{userId})
 	</insert>
 
 	<!-- 根据主键查询一条记录 -->
@@ -52,6 +53,9 @@
 			<if test="amount != null">
 				amount_ = #{amount},
 			</if>
+			<if test="discountAmount != null">
+				discount_amount_ = #{discountAmount},
+			</if>
 			<if test="detail != null">
 				detail_ = #{detail},
 			</if>

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

@@ -87,6 +87,12 @@ public class SporadicChargeInfoController extends BaseController {
 			}
 			sporadicChargeInfo.setOrganId(Integer.parseInt(user.getOrganId()));
 		}
+		if(sporadicChargeInfo.getChargeType().equals("6")){
+			SporadicChargeInfo info = sporadicChargeInfoService.findByOrganIdAndType(sporadicChargeInfo.getOrganId(), Integer.parseInt(sporadicChargeInfo.getChargeType()));
+			if(info != null){
+				return failed("分部活动已存在，请勿重复创建");
+			}
+		}
 		return succeed(sporadicChargeInfoService.insert(sporadicChargeInfo));
 	}