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

mp-service/src/main/java/com/qs/mp/channel/domain/param/ChannelParam.java

@@ -39,17 +39,17 @@ public class ChannelParam {
 	@ApiModelProperty(value = "区ID",required=true)
 	private Long areaId;
 
-//	@NotNull(message = "省不能为空")
-//	@ApiModelProperty(value = "省",required=true)
-//	private String province;
-//
-//	@NotNull(message = "城市不能为空")
-//	@ApiModelProperty(value = "城市",required=true)
-//	private String city;
-//
-//	@NotNull(message = "区不能为空")
-//	@ApiModelProperty(value = "区",required=true)
-//	private String area;
+	@NotNull(message = "省不能为空")
+	@ApiModelProperty(value = "省",required=true)
+	private String province;
+
+	@NotNull(message = "城市不能为空")
+	@ApiModelProperty(value = "城市",required=true)
+	private String city;
+
+	@NotNull(message = "区不能为空")
+	@ApiModelProperty(value = "区",required=true)
+	private String area;
 
 	@NotNull(message = "分佣百分比不能为空")
 	@ApiModelProperty(value = "分佣百分比",required=true)

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

@@ -40,7 +40,7 @@
 			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 > between DATE_SUB(CURDATE(),INTERVAL #{days} DAY)
+			AND t1.created_time > DATE_SUB(CURDATE(),INTERVAL #{days} DAY)
 			GROUP BY t1.ticket_id
 		) t3
 	</select>