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

Dev

See merge request quanshu/mp-server!721

mp-admin/src/main/java/com/qs/mp/web/controller/api/channel/mall/ChannelTicketController.java

@@ -15,6 +15,7 @@ import com.qs.mp.common.core.domain.AjaxResult;
 import com.qs.mp.common.core.page.TableDataInfo;
 import com.qs.mp.common.enums.TicketBoxSaleChannelTypeEnum;
 import com.qs.mp.common.enums.TicketBoxStatusEnum;
+import com.qs.mp.common.enums.TicketTypeEnum;
 import com.qs.mp.common.utils.StringUtils;
 import com.qs.mp.utils.SecurityUtils;
 import com.qs.mp.web.controller.common.BaseApiController;
@@ -87,7 +88,28 @@ public class ChannelTicketController extends BaseApiController {
       queryWrapper.eq("t1.category_id",param.getCategoryId());
     }
     queryWrapper.eq("t1.status", TicketBoxStatusEnum.PUT_ON);
-    queryWrapper.orderByDesc("t1.sort_weight");
+
+    if (param.getType() != null) {
+      if (TicketTypeEnum.OFFLINE.equals(param.getType())) {
+        queryWrapper.orderByDesc("t1.sort_weight");
+      }
+    }
+
+    if (param.getSaleQtySort() != null) {
+      if (param.getSaleQtySort() == 1) {
+        queryWrapper.orderByAsc("t1.sale_qty");
+      } else if (param.getSaleQtySort() == 2) {
+        queryWrapper.orderByDesc("t1.sale_qty");
+      }
+    }
+
+    if (param.getSalePriceSort() != null) {
+      if (param.getSalePriceSort() == 1) {
+        queryWrapper.orderByAsc("t1.sale_price");
+      } else if (param.getSalePriceSort() == 2) {
+        queryWrapper.orderByDesc("t1.sale_price");
+      }
+    }
 
     queryWrapper.nested(wrapper -> {
       wrapper.eq("t1.sale_channel_type", TicketBoxSaleChannelTypeEnum.ALL.getValue());

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

@@ -27,4 +27,10 @@ public class TicketBoxParam {
 	@ApiModelProperty(value = "盲票类型",required=true)
 	private TicketTypeEnum type;
 
+	@ApiModelProperty("销量排序,1正序,2倒序")
+	private Integer saleQtySort;
+
+	@ApiModelProperty("价格排序,1正序,2倒序")
+	private Integer salePriceSort;
+
 }

mp-service/src/main/java/com/qs/mp/user/service/impl/UserDeliverOrderServiceImpl.java

@@ -330,9 +330,9 @@ public class UserDeliverOrderServiceImpl extends ServiceImpl<UserDeliverOrderMap
                     flag = false;
                     failContent = "订单不存在";
                 } else {
-                    if (!DeliverOrderStatusEnum.NOT_DELIVER.equals(userDeliverOrder.getStatus())) {
+                    if (!DeliverOrderStatusEnum.NOT_DELIVER.equals(userDeliverOrder.getStatus()) && !DeliverOrderStatusEnum.PART_DELIVER.equals(userDeliverOrder.getStatus())) {
                         flag = false;
-                        failContent = "订单状态不为待发货";
+                        failContent = "订单状态不为待发货和部分发货";
                     }
                 }
             }