管乐迷商城改造

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

@@ -30,5 +30,5 @@ public interface MusicGroupCalenderRefundPeriodDao extends BaseDAO<Integer, Musi
 
     void batchUpdate(@Param("refundPeriods") List<MusicGroupCalenderRefundPeriod> refundPeriods);
 
-    List<MusicGroupCalenderRefundPeriod> queryByIds(@Param("periodsIds") List<Long> periodsIds);
+    List<MusicGroupCalenderRefundPeriod> queryByIds(@Param("periodsIds") List<Integer> periodsIds);
 }

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

@@ -10,11 +10,17 @@ import java.math.BigDecimal;
 public class CooperationCalenderRefundUpdateDto {
 
     @ApiModelProperty(value = "回款周期编号",required = false)
-    private Long id;
+    private Integer id;
 
     @ApiModelProperty(value = "回款金额",required = false)
     private BigDecimal refundAmount;
 
+    @ApiModelProperty(value = "回款时间",required = false)
+    private String refundDate;
+
+    @ApiModelProperty(value = "责任人",required = false)
+    private Integer responsiblePerson;
+
     @ApiModelProperty(value = "修改原因",required = false)
     private String memo;
 }

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

@@ -29,4 +29,5 @@ public class GoodsOrderItemVO {
     private String promotionName; // 促销名称
     private BigDecimal realAmount; // 实际支付金额
     private int returnStatus; // 退货状态
+    private String productType; // 商品类型
 }

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

@@ -192,13 +192,15 @@ public class MusicGroupCalenderRefundPeriodServiceImpl extends BaseServiceImpl<I
 
     @Override
     public void batchUpdate(List<CooperationCalenderRefundUpdateDto> refundPeriods) {
-        List<Long> periodsIds = refundPeriods.stream().map(e -> e.getId()).collect(Collectors.toList());
+        List<Integer> periodsIds = refundPeriods.stream().map(e -> e.getId()).collect(Collectors.toList());
         List<MusicGroupCalenderRefundPeriod> periods = musicGroupCalenderRefundPeriodDao.queryByIds(periodsIds);
-        Map<Long, CooperationCalenderRefundUpdateDto> periodMap = refundPeriods.stream().collect(Collectors.toMap(e -> e.getId(), e -> e));
+        Map<Integer, CooperationCalenderRefundUpdateDto> periodMap = refundPeriods.stream().collect(Collectors.toMap(e -> e.getId(), e -> e));
         periods.forEach(e->{
             CooperationCalenderRefundUpdateDto dto = periodMap.get(e.getId());
             e.setRefundAmount(dto.getRefundAmount());
             e.setMemo(dto.getMemo());
+            e.setRefundDate(dto.getRefundDate());
+            e.setResponsiblePerson(dto.getResponsiblePerson());
             if (e.getRefundAmount().compareTo(e.getIncome()) <= 0) {
                 e.setSubRefundAmount(BigDecimal.ZERO);
                 e.setRefundFlag(true);

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

@@ -17,6 +17,7 @@
 		<result column="income_" property="income" />
 		<result column="sub_refund_amount_" property="subRefundAmount" />
 		<result column="refund_flag_" property="refundFlag" />
+		<result column="memo_" property="memo" />
 		<result column="create_time_" property="createTime" />
 		<result column="update_time_" property="updateTime" />
 	</resultMap>
@@ -27,6 +28,9 @@
 			<if test="bean.orderNos != null and bean.orderNos != ''">
 				order_nos_ = #{bean.orderNos},
 			</if>
+			<if test="bean.memo != null and bean.memo != ''">
+				memo_ = #{bean.memo},
+			</if>
 			<if test="bean.subRefundAmount != null">
 				sub_refund_amount_ = #{bean.subRefundAmount},
 			</if>
@@ -39,7 +43,6 @@
 			<if test="bean.refundFlag != null">
 				refund_flag_ = #{bean.refundFlag},
 			</if>
-			update_time_ = #{bean.updateTime}
 		</set> WHERE id_ = #{bean.id}
 		</foreach>
 	</update>