优化

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

@@ -93,13 +93,14 @@ public class CouponMgrController extends BaseApiController {
 	 */
 	@PostMapping("/list")
 	@PreAuthorize("@ss.hasPermi('business:coupon:list')")
-	public TableDataInfo listCoupon(@RequestBody Coupon coupon) {
+	public TableDataInfo listCoupon(@RequestBody CouponParam coupon) {
 		List<Coupon> list = new ArrayList<Coupon>();
 		startPage();
 		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().notIn(null != coupon && null != coupon.getExcludeCouponIds(), Coupon::getCouponId, coupon.getExcludeCouponIds());
 		queryWrapper.lambda().eq(Coupon::getIsDeleted, 0);
 		queryWrapper.orderByAsc("FIELD(`status`, 'init', 'on', 'off')");
 		queryWrapper.lambda().orderByDesc(Coupon::getCouponId);

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

@@ -10,6 +10,8 @@ import io.swagger.annotations.ApiModelProperty;
 import javax.validation.constraints.NotNull;
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * @describe 优惠券实体类
  * @auther quanshu
@@ -111,4 +113,8 @@ public class CouponParam {
   private String boxIds;
 
 
+  @ApiModelProperty("排除的优惠券id列表")
+  private List<Long> excludeCouponIds;
+
+
 }

mp-service/src/main/java/com/qs/mp/user/domain/excel/DeliverOrderExcel.java

@@ -42,10 +42,10 @@ public class DeliverOrderExcel {
     @Excel(name = "数量")
     private Integer goodsNum;
 
-    @ApiModelProperty("供应商名称")
+    @Excel(name = "供应商名称")
     private String supplierName;
 
-    @ApiModelProperty("商品采购链接")
+    @Excel(name = "商品采购链接")
     private String shoppingLink;
 
     /**