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

商品列表增加盲豆兑换价格搜索

See merge request quanshu/mp-server!629

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

@@ -112,6 +112,13 @@ public class GoodsMgrController extends BaseApiController {
         .ge(null != queryParam.getMinValue(), Goods::getValue, queryParam.getMinValue());
     queryWrapper.lambda()
         .le(null != queryParam.getMaxValue(), Goods::getValue, queryParam.getMaxValue());
+
+    // 盲豆兑换价格
+    queryWrapper.lambda()
+            .ge(null != queryParam.getMinExchange(), Goods::getExchangePrice, queryParam.getMinExchange());
+    queryWrapper.lambda()
+            .le(null != queryParam.getMaxExchange(), Goods::getExchangePrice, queryParam.getMaxExchange());
+
     // 状态
     queryWrapper.lambda()
         .eq(null != queryParam.getStatus(), Goods::getStatus, queryParam.getStatus());

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

@@ -67,6 +67,12 @@ public class GoodsQueryParam {
 	@ApiModelProperty(value = "最高价格", required = false)
 	private Integer maxValue;
 
+	@ApiModelProperty("最低兑换价格")
+	private Integer minExchange;
+
+	@ApiModelProperty("最高兑换价格")
+	private Integer maxExchange;
+
 	/**
 	 * 兑换大厅是否展示，0不展示，1展示
 	 */