Merge branch 'dev' into 'mp-server-test'

Dev

See merge request quanshu/mp-server!507

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

@@ -98,6 +98,10 @@ public class GoodsMgrController extends BaseApiController {
     queryWrapper.lambda()
         .eq(null != queryParam.getGoodsId() && 0 != queryParam.getGoodsId(),
             Goods::getGoodsId, queryParam.getGoodsId());
+    // 供应商
+    queryWrapper.lambda()
+            .eq(null != queryParam.getSupplierId() && 0 != queryParam.getSupplierId(),
+                    Goods::getSupplierId, queryParam.getSupplierId());
     // 成本
     queryWrapper.lambda()
         .ge(null != queryParam.getMinCost(), Goods::getCost, queryParam.getMinCost());

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

@@ -73,6 +73,9 @@ public class UserTicketOrderMgrController extends BaseApiController {
         if (Objects.nonNull(userTicketOrderQueryParam.getStartTime()) && Objects.nonNull(userTicketOrderQueryParam.getEndTime())) {
             queryWrapper.between("t1.created_time", userTicketOrderQueryParam.getStartTime(), userTicketOrderQueryParam.getEndTime());
         }
+        if (Objects.nonNull(userTicketOrderQueryParam.getChannelId()) && userTicketOrderQueryParam.getChannelId() != 0) {
+            queryWrapper.eq("t1.channel_id", userTicketOrderQueryParam.getChannelId());
+        }
 
         queryWrapper.orderByDesc("t1.created_time");
 
@@ -112,6 +115,9 @@ public class UserTicketOrderMgrController extends BaseApiController {
         if (Objects.nonNull(userTicketOrderQueryParam.getStartTime()) && Objects.nonNull(userTicketOrderQueryParam.getEndTime())) {
             queryWrapper.between("t1.created_time", userTicketOrderQueryParam.getStartTime(), userTicketOrderQueryParam.getEndTime());
         }
+        if (Objects.nonNull(userTicketOrderQueryParam.getChannelId()) && userTicketOrderQueryParam.getChannelId() != 0) {
+            queryWrapper.eq("t1.channel_id", userTicketOrderQueryParam.getChannelId());
+        }
         queryWrapper.orderByDesc("t1.created_time");
         int totalSize = userTicketOrderService.countUserTicketOrder(queryWrapper);
         if (totalSize == 0) {

mp-service/src/main/java/com/qs/mp/admin/domain/param/GoodsQueryParam.java

@@ -33,6 +33,11 @@ public class GoodsQueryParam {
 	@ApiModelProperty(value = "商品名称", required = true)
 	private String title;
 
+
+	@ApiModelProperty(value = "供应商id", required = false)
+	private Long supplierId;
+
+
 	/**
 	 * 最低成本
 	 */

mp-service/src/main/java/com/qs/mp/admin/domain/param/UserTicketOrderQueryParam.java

@@ -33,6 +33,9 @@ public class UserTicketOrderQueryParam {
     @ApiModelProperty("订单状态;-1 已取消 0:待付款 1:已完成")
     private Integer status;
 
+    @ApiModelProperty("经销商id")
+    private Long channelId;
+
     @ApiModelProperty("开始时间")
     private Date startTime;
 

mp-service/src/main/java/com/qs/mp/admin/domain/vo/UserTicketOrderListVO.java

@@ -54,6 +54,9 @@ public class UserTicketOrderListVO {
     @ApiModelProperty("手机号")
     private String phone;
 
+    @ApiModelProperty("经销商")
+    private String channelName;
+
 
     @ApiModelProperty("创建时间")
     private Date createdTime;

mp-service/src/main/resources/mapper/user/UserTicketOrderMapper.xml

@@ -143,10 +143,12 @@
 				t1.ticket_num,
 				t2.nick_name,
 				t2.phonenumber phone,
-				t3.type boxType
+				t3.type boxType,
+				t4.name channelName
 		from mp_user_ticket_order t1
-				 left join sys_user t2 on t1.user_id = t2.user_id
-				 left join mp_ticket_box t3 on t1.box_id = t3.box_id
+			left join sys_user t2 on t1.user_id = t2.user_id
+			left join mp_ticket_box t3 on t1.box_id = t3.box_id
+			left join mp_channel t4 on t1.channel_id = t4.channel_id
 		${ew.customSqlSegment}
     </select>
 
@@ -162,13 +164,12 @@
 				t1.ticket_num,
 				t2.nick_name,
 				t2.phonenumber phone,
-				t4.name channelName,
-				t5.type ticketBoxType
+				t3.name channelName,
+				t4.type ticketBoxType
 		from mp_user_ticket_order t1
 			left join sys_user t2 on t1.user_id = t2.user_id
-			left join mp_channel_user_rel t3 on t2.user_id = t3.user_id
-			left join mp_channel t4 on t3.channel_id = t4.channel_id
-			left join mp_ticket_box t5 on t1.box_id = t5.box_id
+			left join mp_channel t3 on t1.channel_id = t3.channel_id
+			left join mp_ticket_box t4 on t1.box_id = t4.box_id
 		${ew.customSqlSegment}
 	</select>