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

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

@@ -85,6 +85,8 @@ public class GoodsMgrController extends BaseApiController {
 		queryWrapper.lambda().le(null != queryParam && null != queryParam.getMaxValue(), Goods::getValue, queryParam.getMaxValue());
 		// 状态
 		queryWrapper.lambda().eq(null != queryParam && null != queryParam.getStatus(), Goods::getStatus, queryParam.getStatus());
+		// 是否支持兑换
+		queryWrapper.lambda().eq(null != queryParam && null != queryParam.getExchangeShow(), Goods::getExchangeShow, queryParam.getExchangeShow());
 		queryWrapper.lambda().eq(Goods::getIsDeleted, 0);
 		queryWrapper.orderByAsc("FIELD(`status`, 'init', 'on', 'off')");
 		queryWrapper.lambda().orderByDesc(Goods::getGoodsId);

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

@@ -33,6 +33,7 @@ import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.Calendar;
 import java.util.Date;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -595,4 +596,27 @@ public class ChannelController extends BaseApiController {
 		}
 		return AjaxResult.success(channelVO);
 	}
+	
+	
+	/**
+	 * 场景是这里要显示待审核数量
+	 *
+	 * @param
+	 * @return
+	 */
+	@PostMapping(value = "subchannel/index")
+	public AjaxResult getChannelIndex() {
+		int waitVerifyNum = 0;
+		Long channelId = SecurityUtils.getLoginUser().getChannelId();
+		if(null != channelId && 0 != channelId) {
+			LambdaQueryWrapper<Channel> queryWrapper = new LambdaQueryWrapper<Channel>();
+			queryWrapper.eq(Channel::getParentId, channelId);
+			queryWrapper.eq(Channel::getVerifyStatus, ChannelVerifyStatusEnum.WAIT);
+			queryWrapper.eq(Channel::getLevel, 0);
+			waitVerifyNum = channelService.count(queryWrapper);
+		}
+	    Map<String,Object> map = new HashMap<String,Object>();
+	    map.put("waitVerifyNum", waitVerifyNum);
+		return AjaxResult.success(map);
+	}
 }

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

@@ -143,87 +143,4 @@ public class Goods implements Serializable {
    */
   @TableField("updated_time")
   private Date updatedTime;
-  
-  public static void main(String[] args) {
-	  List<Map<String,Object>> lists=new ArrayList<>();
-	  Map<String,Object> map1 = new HashMap<String,Object>();
-	  map1.put("大小", 1);
-	  lists.add(map1);
-	  Map<String,Object> map2 = new HashMap<String,Object>();
-	  map2.put("大小", 2);
-	  lists.add(map2);
-	  Map<String,Object> map3 = new HashMap<String,Object>();
-	  map3.put("名字", "胜多负少");
-	  lists.add(map3);
-	  
-	  Map<String,Object> map4 = new HashMap<String,Object>();
-	  map4.put("大小", 4);
-	  lists.add(map4);
-	  
-	  System.out.println(lists.toString());
-	  
-	  Map<String,Object> map = lists.stream().flatMap(m -> m.entrySet().stream())
-              .collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue, (a, b) -> getObjValue(a,b))); 
-	  
-	  System.out.println(map.toString());
-	  
-	  List<Map<String,Object>> mapList=new ArrayList<>(); 
-	  
-	  for(Map.Entry<String, Object> entry:map.entrySet()) {
-          //map.entrySet()  返回此映射中包含的映射关系的Set视图
-          //Map.Entry<Integer, String> 映射项 (键值对)
-		  String key = entry.getKey();
-		  Object value = entry.getValue();
-          System.out.println("key="+entry.getKey()+" value="+entry.getValue());
-
-          
-          Map<String,Object> mapObj = new HashMap<String,Object>();
-          mapObj.put("name", key);
-          if(value instanceof List<?>) {
-        	  mapObj.put("value", value);
-          }else {
-        	  List<Object> list = new ArrayList<>();
-        	  list.add(value+"");
-        	  mapObj.put("value", list);
-          }
-         
-          mapList.add(mapObj);
-      }
-	  
-	  System.out.println(JSONArray.toJSONString(mapList));
-	  
-}
-  
- 
-  
-  static Object getObjValue(Object a, Object b){
-		boolean isa = (a instanceof List<?>);
-		boolean isb = (b instanceof List<?>);
-		System.out.println("isa == " + isa);
-		System.out.println("isb == " + isb);
-		List<Object> list = new ArrayList<>();
-		if (isa) {
-			list.addAll((List<?>) a);
-		} else {
-			list.add(a+"");
-		}
-		if (isb) {
-			list.addAll((List<?>) b);
-		} else {
-			list.add(b+"");
-		}
-	  return list;
-	  
-  }
-  
-  
-  public static boolean isArray(Object obj) {
-      if (obj == null) {
-          return false;
-      }
-
-      return obj.getClass().isArray();
-  }
-
-
 }

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

@@ -50,6 +50,12 @@ public class GoodsQueryParam {
 	 */
 	@ApiModelProperty(value = "最高价格", required = false)
 	private Integer maxValue;
+	
+	/**
+	 * 兑换大厅是否展示，0不展示，1展示
+	 */
+	@ApiModelProperty(value = "兑换大厅是否展示", required = false)
+	private Integer exchangeShow;
 
 	/**
 	 * 上架状态;上架/下架