Merge branch '20221101' into master_saas

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

@@ -7,6 +7,12 @@ public class MusicGroupDeliveryRecordDto extends MusicGroupDeliveryRecord {
 	private String musicGroupShippingAddress;
 	
 	private String operatorUserName;
+	
+	/** 收货人 */
+	private String consigneeName;
+	
+	/** 手机号码 */
+	private String mobile;
 
 	public String getMusicGroupShippingAddress() {
 		return musicGroupShippingAddress;
@@ -23,4 +29,20 @@ public class MusicGroupDeliveryRecordDto extends MusicGroupDeliveryRecord {
 	public void setOperatorUserName(String operatorUserName) {
 		this.operatorUserName = operatorUserName;
 	}
+
+	public String getConsigneeName() {
+		return consigneeName;
+	}
+
+	public void setConsigneeName(String consigneeName) {
+		this.consigneeName = consigneeName;
+	}
+
+	public String getMobile() {
+		return mobile;
+	}
+
+	public void setMobile(String mobile) {
+		this.mobile = mobile;
+	}
 }

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

@@ -92,7 +92,8 @@ public class MusicGroupDeliveryRecordServiceImpl extends BaseServiceImpl<Long, M
 		
 		//查询student_payment_order_detail，剔除有声部更换的用户
 		List<StudentPaymentOrderDetail> studentPaymentOrderDetailList = studentPaymentOrderDetailDao.findUserApplyOrder(null, musicGroupId, DealStatusEnum.SUCCESS);
-		studentPaymentOrderDetailList = studentPaymentOrderDetailList.stream().filter(t -> StringUtils.isNotBlank(t.getGoodsIdList())).collect(Collectors.toList());
+		
+		studentPaymentOrderDetailList = studentPaymentOrderDetailList.stream().filter((t) -> StringUtils.isNotBlank(t.getGoodsIdList()) && StringUtils.equals(t.getDeliveryBatchNo(), deliveryBatchNo)).collect(Collectors.toList());
 		
 		if(changeUserIdList != null && changeUserIdList.size() > 0){
 			Iterator<StudentPaymentOrderDetail> iterator = studentPaymentOrderDetailList.iterator();
@@ -109,14 +110,16 @@ public class MusicGroupDeliveryRecordServiceImpl extends BaseServiceImpl<Long, M
 		}
 		
 		List<Goods> goodsList = goodsService.findGoodsByIds(goodsIdsStr.toString());
-		Map<Integer,Goods> goodsMap = new HashMap<Integer, Goods>();
-		
-		for (Goods g : goodsList) {
-			if (goodsMap.containsKey(g.getId())) {
-				g.setSellCount(goodsMap.get(g.getId()).getSellCount() + 1);
-			} else {
-				g.setSellCount(1);
-			}
+		Map<Integer, Goods> goodsMap = goodsList.stream().collect(Collectors.toMap(Goods::getId, t -> t));
+
+		Goods g = null;
+		for (String goodsId : goodsIdsStr.toString().split(",")) {
+			g = goodsMap.get(Integer.parseInt(goodsId));
+			
+			if(g == null) continue;
+			
+			g.setSellCount(g.getSellCount() + 1);
+			
 			goodsMap.put(g.getId(), g);
 		}
 		

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

@@ -19,6 +19,8 @@
 	<resultMap type="com.ym.mec.biz.dal.dto.MusicGroupDeliveryRecordDto" id="MusicGroupDeliveryRecordDto" extends="MusicGroupDeliveryRecord">
 		<result column="address_name_" property="musicGroupShippingAddress" />
 		<result column="operator_name_" property="operatorUserName" />
+		<result column="consignee_name_" property="consigneeName" />
+		<result column="mobile_" property="mobile" />
 	</resultMap>
 
 	<!-- 根据主键查询一条记录 -->
@@ -106,7 +108,7 @@
 	<!-- 分页查询 -->
 	<select id="queryPageList" resultMap="MusicGroupDeliveryRecordDto"
 		parameterType="map">
-		SELECT mgdr.*,u.real_name_ operator_name_,a.address_name_ FROM music_group_delivery_record mgdr
+		SELECT mgdr.*,u.real_name_ operator_name_,a.address_name_,a.consignee_name_,a.mobile_ FROM music_group_delivery_record mgdr
 		left join sys_user u on u.id_ = mgdr.operator_user_id_
 		left join 
 		(