Merge branch 'dev' of 113.31.163.91:quanshu/mp-server into dev

mp-admin/src/main/java/com/qs/mp/web/controller/api/admin/CouponMgrController.java

@@ -92,12 +92,13 @@ public class CouponMgrController extends BaseApiController {
 	public TableDataInfo listCoupon(@RequestBody Coupon coupon) {
 		List<Coupon> list = new ArrayList<Coupon>();
 		startPage();
-		LambdaQueryWrapper<Coupon> queryWrapper = new LambdaQueryWrapper<Coupon>();
-		queryWrapper.like(null != coupon && StringUtils.isNotBlank(coupon.getTitle()), Coupon::getTitle, coupon.getTitle());
-		queryWrapper.eq(null != coupon && null != coupon.getStatus(), Coupon::getStatus, coupon.getStatus());
-		queryWrapper.eq(null != coupon && null != coupon.getType(), Coupon::getType, coupon.getType());
-		queryWrapper.eq(Coupon::getIsDeleted, 0);
-		queryWrapper.orderByAsc(Coupon::getCreatedTime);
+		QueryWrapper<Coupon> queryWrapper = new QueryWrapper<Coupon>();
+		queryWrapper.lambda().like(null != coupon && StringUtils.isNotBlank(coupon.getTitle()), Coupon::getTitle, coupon.getTitle());
+		queryWrapper.lambda().eq(null != coupon && null != coupon.getStatus(), Coupon::getStatus, coupon.getStatus());
+		queryWrapper.lambda().eq(null != coupon && null != coupon.getType(), Coupon::getType, coupon.getType());
+		queryWrapper.lambda().eq(Coupon::getIsDeleted, 0);
+		queryWrapper.orderByAsc("FIELD(`status`, 'init', 'on', 'off')");
+		queryWrapper.lambda().orderByDesc(Coupon::getCouponId);
 		list = couponService.list(queryWrapper);
 		return getDataTable(list);
 	}

mp-admin/src/main/java/com/qs/mp/web/controller/api/admin/TicketBoxMgrController.java

@@ -178,6 +178,10 @@ public class TicketBoxMgrController extends BaseApiController {
 		if (null == ids || null == ids.getIds() || ids.getIds().size() == 0) {
 			return AjaxResult.error("请选择需要导出的盲票组");
 		}
+		TicketBox ticketBox = ticketBoxService.getById(ids.getIds().get(0));
+		if (null == ticketBox || StringUtils.isBlank(ticketBox.getBoxId())) {
+			return AjaxResult.error("选择的盲票组数据异常， 请联系管理员或重试");
+		}
 		List<TicketExcel> excelList = new ArrayList<TicketExcel>();
 		List<Ticket> listAll = new ArrayList<Ticket>();
 		// 首先查询要导出的数据总数
@@ -221,7 +225,7 @@ public class TicketBoxMgrController extends BaseApiController {
 		}
 
 		ExcelUtil<TicketExcel> util = new ExcelUtil<TicketExcel>(TicketExcel.class);
-		return util.exportExcel(excelList, "盲票导出数据", true);
+		return util.exportExcel(excelList, ticketBox.getTitle(), false);
 	}
 
 
@@ -229,7 +233,7 @@ public class TicketBoxMgrController extends BaseApiController {
     public AjaxResult importTemplate()
     {
         ExcelUtil<TicketExcel> util = new ExcelUtil<TicketExcel>(TicketExcel.class);
-        return util.importTemplateExcel("盲票导出数据",true);
+        return util.importTemplateExcel("盲票导出数据",false);
     }
 
 	@Log(title = "盲票导入", businessType = BusinessType.IMPORT)

mp-service/src/main/resources/mapper/channel/ChannelCommissionMapper.xml

@@ -36,12 +36,12 @@
     <select id="getChannelSaleAmtCnt" resultType="integer">
 		select IFNULL(SUM(t3.sale_amt),0) as saleAmt
 		from (
-			select t1.ticket_id, MIN(t1.sale_amt) sale_amt
+			select t1.order_id, MIN(t1.sale_amt) sale_amt
 			from mp_channel_commission t1
 			left join mp_channel t2 on t1.channel_id = t2.channel_id
 			where (t2.channel_no like concat(#{channelNo},'.%') or t2.channel_no = #{channelNo})
 			AND t1.created_time > DATE_SUB(CURDATE(),INTERVAL #{days} DAY)
-			GROUP BY t1.ticket_id
+			GROUP BY t1.order_id
 		) t3
 	</select>
 
@@ -59,11 +59,11 @@
     <select id="getChannelTotalSaleAmtCnt" resultType="integer">
 		select IFNULL(SUM(t3.sale_amt),0) as saleAmt
 		from (
-			select t1.ticket_id, MIN(t1.sale_amt) sale_amt
+			select t1.order_id, MIN(t1.sale_amt) sale_amt
 			from mp_channel_commission t1
 			left join mp_channel t2 on t1.channel_id = t2.channel_id
 			where (t2.channel_no like concat(#{channelNo},'.%') or t2.channel_no = #{channelNo})
-			GROUP BY t1.ticket_id
+			GROUP BY t1.order_id
 		) t3
 	</select>