Merge remote-tracking branch 'origin/master_saas' into master_saas

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

@@ -1,9 +1,25 @@
 package com.ym.mec.biz.dal.dao;
 
-import com.ym.mec.common.dal.BaseDAO;
+import java.util.List;
+import java.util.Map;
+
+import com.ym.mec.biz.dal.dto.MusicGroupDeliveryRecordDto;
 import com.ym.mec.biz.dal.entity.MusicGroupDeliveryRecord;
+import com.ym.mec.common.dal.BaseDAO;
 
 public interface MusicGroupDeliveryRecordDao extends BaseDAO<Long, MusicGroupDeliveryRecord> {
 
+	/**
+	 * 通过参数查找结果集，适合分页场景
+	 * @param params
+	 * @return
+	 */
+	public List<MusicGroupDeliveryRecordDto> queryPageList(Map<String, Object> params);
 	
+	/**
+	 * 通过参数查找结果集数目
+	 * @param params
+	 * @return
+	 */
+	public int queryCount(Map<String, Object> params);
 }

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

@@ -0,0 +1,48 @@
+package com.ym.mec.biz.dal.dto;
+
+import com.ym.mec.biz.dal.entity.MusicGroupDeliveryRecord;
+
+public class MusicGroupDeliveryRecordDto extends MusicGroupDeliveryRecord {
+
+	private String musicGroupShippingAddress;
+	
+	private String operatorUserName;
+	
+	/** 收货人 */
+	private String consigneeName;
+	
+	/** 手机号码 */
+	private String mobile;
+
+	public String getMusicGroupShippingAddress() {
+		return musicGroupShippingAddress;
+	}
+
+	public void setMusicGroupShippingAddress(String musicGroupShippingAddress) {
+		this.musicGroupShippingAddress = musicGroupShippingAddress;
+	}
+
+	public String getOperatorUserName() {
+		return operatorUserName;
+	}
+
+	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/MusicGroupDeliveryRecordService.java

@@ -2,11 +2,16 @@ package com.ym.mec.biz.service;
 
 import java.util.List;
 
+import com.ym.mec.biz.dal.dto.MusicGroupDeliveryRecordDto;
 import com.ym.mec.biz.dal.entity.Goods;
 import com.ym.mec.biz.dal.entity.MusicGroupDeliveryRecord;
+import com.ym.mec.biz.dal.page.MusicGroupDeliveryRecordQueryInfo;
+import com.ym.mec.common.page.PageInfo;
 import com.ym.mec.common.service.BaseService;
 
 public interface MusicGroupDeliveryRecordService extends BaseService<Long, MusicGroupDeliveryRecord> {
+	
+	PageInfo<MusicGroupDeliveryRecordDto> queryPage(MusicGroupDeliveryRecordQueryInfo queryInfo);
 
 	/**
 	 * 查询已发货清单

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

@@ -14,15 +14,19 @@ import org.springframework.stereotype.Service;
 import com.ym.mec.biz.dal.dao.MusicGroupDeliveryRecordDao;
 import com.ym.mec.biz.dal.dao.StudentPaymentOrderDetailDao;
 import com.ym.mec.biz.dal.dao.SubjectChangeDao;
+import com.ym.mec.biz.dal.dto.MusicGroupDeliveryRecordDto;
 import com.ym.mec.biz.dal.entity.Goods;
 import com.ym.mec.biz.dal.entity.MusicGroupDeliveryRecord;
 import com.ym.mec.biz.dal.entity.StudentPaymentOrderDetail;
 import com.ym.mec.biz.dal.entity.SubjectChange;
 import com.ym.mec.biz.dal.enums.DealStatusEnum;
+import com.ym.mec.biz.dal.page.MusicGroupDeliveryRecordQueryInfo;
 import com.ym.mec.biz.service.GoodsService;
 import com.ym.mec.biz.service.MusicGroupDeliveryRecordService;
 import com.ym.mec.common.dal.BaseDAO;
+import com.ym.mec.common.page.PageInfo;
 import com.ym.mec.common.service.impl.BaseServiceImpl;
+import com.ym.mec.util.collection.MapUtil;
 
 @Service
 public class MusicGroupDeliveryRecordServiceImpl extends BaseServiceImpl<Long, MusicGroupDeliveryRecord>  implements MusicGroupDeliveryRecordService {
@@ -45,6 +49,26 @@ public class MusicGroupDeliveryRecordServiceImpl extends BaseServiceImpl<Long, M
 	}
 
 	@Override
+	public PageInfo<MusicGroupDeliveryRecordDto> queryPage(MusicGroupDeliveryRecordQueryInfo queryInfo) {
+		PageInfo<MusicGroupDeliveryRecordDto> pageInfo = new PageInfo<MusicGroupDeliveryRecordDto>(queryInfo.getPage(), queryInfo.getRows());
+		Map<String, Object> params = new HashMap<String, Object>();
+		MapUtil.populateMap(params, queryInfo);
+		
+		List<MusicGroupDeliveryRecordDto> dataList = null;
+		int count = this.findCount(params);
+		if (count > 0) {
+			pageInfo.setTotal(count);
+			params.put("offset", pageInfo.getOffset());
+			dataList = musicGroupDeliveryRecordDao.queryPageList(params);
+		}
+		if (count == 0) {
+			dataList = new ArrayList<MusicGroupDeliveryRecordDto>();
+		}
+		pageInfo.setRows(dataList);
+		return pageInfo;
+	}
+
+	@Override
 	public List<Goods> queryDeliveryList(String musicGroupId, String deliveryBatchNo) {
 		
 		//查询subject_change
@@ -68,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();
@@ -85,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

@@ -15,6 +15,13 @@
 		<result column="update_time_" property="updateTime" />
 		<result column="create_time_" property="createTime" />
 	</resultMap>
+	
+	<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>
 
 	<!-- 根据主键查询一条记录 -->
 	<select id="get" resultMap="MusicGroupDeliveryRecord">
@@ -98,18 +105,46 @@
 		<include refid="global.limit" />
 	</select>
 
+	<!-- 分页查询 -->
+	<select id="queryPageList" resultMap="MusicGroupDeliveryRecordDto"
+		parameterType="map">
+		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 
+		(
+		SELECT sa.*,concat(pa.name_,ca.name_,coa.name_,sa.detail_address_) address_name_ FROM music_group_shipping_address sa 
+		left join sys_area pa on sa.region_province_id_ = pa.id_
+		left join sys_area ca on sa.region_city_id_ = ca.id_
+		left join sys_area coa on sa.region_county_id_ = coa.id_
+		where sa.del_flag_ = 0 and sa.music_group_id_ = #{musicGroupId}
+		) a on a.id_ = mgdr.music_group_shipping_address_id_
+		<where>
+			<if test="musicGroupId != null and musicGroupId != ''">
+				and mgdr.music_group_id_ = #{musicGroupId}
+			</if>
+			<if test="expressCompany != null and expressCompany != ''">
+				and mgdr.express_company_ = #{expressCompany}
+			</if>
+			<if test="expressBillNo != null and expressBillNo != ''">
+				and mgdr.express_bill_no_ = #{expressBillNo}
+			</if>
+		</where>
+		 ORDER BY id_
+		<include refid="global.limit" />
+	</select>
+
 	<!-- 查询当前表的总记录数 -->
 	<select id="queryCount" resultType="int">
-		SELECT COUNT(*) FROM music_group_delivery_record
+		SELECT COUNT(mgdr.id_) FROM music_group_delivery_record mgdr
 		<where>
 			<if test="musicGroupId != null and musicGroupId != ''">
-				and music_group_id_ = #{musicGroupId}
+				and mgdr.music_group_id_ = #{musicGroupId}
 			</if>
 			<if test="expressCompany != null and expressCompany != ''">
-				and express_company_ = #{expressCompany}
+				and mgdr.express_company_ = #{expressCompany}
 			</if>
 			<if test="expressBillNo != null and expressBillNo != ''">
-				and express_bill_no_ = #{expressBillNo}
+				and mgdr.express_bill_no_ = #{expressBillNo}
 			</if>
 		</where>
 	</select>

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

@@ -225,7 +225,7 @@
 
     <!-- 查询用户注册订单详情 -->
     <select id="findUserApplyOrder" resultMap="StudentPaymentOrderDetail">
-        SELECT spod.*
+        SELECT spod.*,spo.user_id_
         FROM student_payment_order_detail spod
                  LEFT JOIN student_payment_order spo ON spo.id_ = spod.payment_order_id_
         WHERE 

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

@@ -7,7 +7,7 @@ import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import com.ym.mec.biz.dal.entity.MusicGroupDeliveryRecord;
+import com.ym.mec.biz.dal.dto.MusicGroupDeliveryRecordDto;
 import com.ym.mec.biz.dal.page.MusicGroupDeliveryRecordQueryInfo;
 import com.ym.mec.biz.service.MusicGroupDeliveryRecordService;
 import com.ym.mec.common.controller.BaseController;
@@ -22,7 +22,7 @@ public class MusicGroupDeliveryRecordController extends BaseController {
 	private MusicGroupDeliveryRecordService musicGroupDeliveryRecordService;
 	
 	@GetMapping("/queryPage")
-	public HttpResponseResult<PageInfo<MusicGroupDeliveryRecord>> queryPage(MusicGroupDeliveryRecordQueryInfo queryInfo) {
+	public HttpResponseResult<PageInfo<MusicGroupDeliveryRecordDto>> queryPage(MusicGroupDeliveryRecordQueryInfo queryInfo) {
 		return succeed(musicGroupDeliveryRecordService.queryPage(queryInfo));
 	}