管乐迷商城改造

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

@@ -45,6 +45,9 @@ public class MusicGroupCalenderRefundPeriod {
 
 	@ApiModelProperty(value = "备注",required = false)
 	private String memo;
+
+	@ApiModelProperty(value = "责任人",required = false)
+	private Integer responsiblePerson;
 	
 	/**  */
 	private java.util.Date createTime;

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

@@ -1049,6 +1049,7 @@ public class MusicGroupPaymentCalenderServiceImpl extends BaseServiceImpl<Long,
                 OrderCreate orderCreate = new OrderCreate();
                 String orderNo = idGeneratorService.generatorId("payment") + "";
                 address.setOrderNo(orderNo);
+                musicGroupPaymentCalenderAddressService.updateById(address);
                 orderCreate.setOrderNo(orderNo);
 //                orderCreate.setOrchestraId(musicGroup.getId());
                 orderCreate.setMemberId(musicGroup.getSchoolId().longValue());
@@ -1063,6 +1064,7 @@ public class MusicGroupPaymentCalenderServiceImpl extends BaseServiceImpl<Long,
                 orderCreate.setReceiverCity(address.getCity());
                 orderCreate.setReceiverRegion(address.getRegion());
                 orderCreate.setReceiverDetailAddress(address.getAddress());
+                orderCreate.setStatus(1);
                 List<OrderCreate.OrderItem> orderItems = new ArrayList<>();
                 for (MusicGroupPaymentCalenderGoods e : goods) {
                     BigDecimal totalPrice = e.getTotalPrice();
@@ -1433,7 +1435,18 @@ public class MusicGroupPaymentCalenderServiceImpl extends BaseServiceImpl<Long,
         if (musicGroupPaymentCalenderDetailList != null && musicGroupPaymentCalenderDetailList.size() > 0) {
             throw new BizException("操作失败：缴费项目中已存在学员");
         }
-        //TODO 商品采购订单是否已经发货
+        //商品采购订单
+        if(calender.getPaymentType() == GOODS_PURCHASE){
+            //TODO 商品采购订单是否已经发货
+            MusicGroupPaymentCalenderAddress address = musicGroupPaymentCalenderAddressService.lambdaQuery().eq(MusicGroupPaymentCalenderAddress::getCalenderId, id).one();
+            if(address != null){
+                if (address.getDeliveryFlag()) {
+                    throw new BizException("操作失败：商品采购订单已发货");
+                }
+                musicGroupPaymentCalenderAddressService.removeById(address.getId());
+            }
+            musicGroupPaymentCalenderGoodsService.lambdaUpdate().eq(MusicGroupPaymentCalenderGoods::getCalenderId,id).remove();
+        }
 
         //如果是学校缴费，删除缴费周期
         musicGroupCalenderRefundPeriodService.deleteByCalenderId(id);
@@ -1472,8 +1485,6 @@ public class MusicGroupPaymentCalenderServiceImpl extends BaseServiceImpl<Long,
         musicGroupPaymentCalenderActivityService.delByCalenderId(id);
         musicGroupPaymentCalenderMemberService.deleteByCalenderId(id);
         musicGroupPaymentCalenderRepairService.deleteByCalenderId(id);
-        musicGroupPaymentCalenderGoodsService.lambdaUpdate().eq(MusicGroupPaymentCalenderGoods::getCalenderId,id).remove();
-        musicGroupPaymentCalenderAddressService.lambdaUpdate().eq(MusicGroupPaymentCalenderAddress::getCalenderId,id).remove();
         List<Long> calenderIds = new ArrayList<Long>();
         calenderIds.add(id);
         musicGroupPaymentCalenderCourseSettingsService.deleteByMusicGroupPaymentCalenderId(calenderIds);

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

@@ -55,16 +55,18 @@
 	<!-- 向数据库增加一条记录 -->
 	<insert id="insert" parameterType="com.ym.mec.biz.dal.entity.MusicGroupCalenderRefundPeriod" useGeneratedKeys="true" keyColumn="id" keyProperty="id">
 		INSERT INTO music_group_calender_refund_period (organ_id_,cooperation_organ_id_,calender_id_,
-		                                                refund_date_,refund_amount_,sub_refund_amount_,income_,refund_flag_,order_nos_,create_time_,update_time_)
-		VALUES(#{organId},#{cooperationOrganId},#{calenderId},#{refundDate},#{refundAmount},#{subRefundAmount},#{income},#{refundFlag},#{orderNos},NOW(),NOW())
+		                                                refund_date_,refund_amount_,sub_refund_amount_,income_,refund_flag_,order_nos_,responsible_person_,create_time_,update_time_)
+		VALUES(#{organId},#{cooperationOrganId},#{calenderId},#{refundDate},#{refundAmount},#{subRefundAmount},#{income},#{refundFlag},#{orderNos},#{responsiblePerson},NOW(),NOW())
 	</insert>
 	<insert id="batchInsert">
 		INSERT INTO music_group_calender_refund_period (organ_id_,cooperation_organ_id_,calender_id_,
-														refund_date_,refund_amount_,sub_refund_amount_,income_,refund_flag_,order_nos_,create_time_,update_time_)
+														refund_date_,refund_amount_,sub_refund_amount_,income_,refund_flag_,
+		                                                order_nos_,responsible_person_,create_time_,update_time_)
 		VALUES
 		<foreach collection="refundPeriods" separator="," item="bean">
 			(#{bean.organId},#{bean.cooperationOrganId},#{bean.calenderId},#{bean.refundDate},
-			 #{bean.refundAmount},#{bean.subRefundAmount},#{bean.income},#{bean.refundFlag},#{bean.orderNos},#{bean.createTime},#{bean.updateTime})
+			 #{bean.refundAmount},#{bean.subRefundAmount},#{bean.income},#{bean.refundFlag},#{bean.orderNos},
+			 #{bean.responsiblePerson},#{bean.createTime},#{bean.updateTime})
 		</foreach>
 	</insert>