商品购买订单列表

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

@@ -88,6 +88,7 @@ public class UserDeliverOrderMgrController extends BaseApiController {
 		queryWrapper.eq(null != queryParam && StringUtils.isNotBlank(queryParam.getOrderId()), "t1.order_id", queryParam.getOrderId());
 		queryWrapper.eq(null != queryParam && null != queryParam.getStatus(), "t1.`status`", queryParam.getStatus());
 		queryWrapper.eq(null != queryParam && StringUtils.isNotBlank(queryParam.getTel()) , "t1.`tel`", queryParam.getTel());
+		queryWrapper.eq(null != queryParam && null != queryParam.getResource(), "t1.`resource`", queryParam.getResource());
 		queryWrapper.ge(null != queryParam && null != queryParam.getStartTime(), "t1.created_time", queryParam.getStartTime());
 		queryWrapper.le(null != queryParam && null != queryParam.getEndTime(), "t1.created_time", queryParam.getEndTime());
 		queryWrapper.like(null != queryParam && StringUtils.isNotBlank(queryParam.getNickName()), "t2.nick_name", queryParam.getNickName());

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

@@ -139,7 +139,7 @@ public class UserTicketController extends BaseApiController {
         continue;
 //        ticketAwardsLabelVO.setHitRate(new BigDecimal(0));
       }else {
-        ticketAwardsLabelVO.setHitRate(BigDecimal.valueOf(num).divide(BigDecimal.valueOf(quantity), 4, RoundingMode.HALF_UP).multiply(BigDecimal.valueOf(100)));
+        ticketAwardsLabelVO.setHitRate(BigDecimal.valueOf(num).divide(BigDecimal.valueOf(quantity), 3, RoundingMode.HALF_UP).multiply(BigDecimal.valueOf(100)));
       }
       ticketAwardsLabelVOS.add(ticketAwardsLabelVO);
     }

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

@@ -1,13 +1,11 @@
 package com.qs.mp.admin.domain.param;
 
+import com.qs.mp.common.enums.DeliverOrderResourceEnum;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
 import java.util.Date;
 
-import com.alibaba.fastjson.annotation.JSONField;
-import com.alibaba.fastjson.serializer.SerializerFeature;
-import com.qs.mp.common.enums.DeliverOrderStatusEnum;
 import lombok.Data;
 
 /**
@@ -46,5 +44,7 @@ public class UserDeliverOrderQueryParam {
 	@ApiModelProperty(value = "截止时间", required = false)
 	private Date endTime;
 
+	@ApiModelProperty("订单来源:1提货订单,2现金购买")
+	private DeliverOrderResourceEnum resource;
 
 }