Merge branch 'developer' of http://115.159.76.241/haoban3.0/haoban-manage3.0.git into developer

haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/controller/StoreController.java

@@ -2,6 +2,7 @@ package com.gic.haoban.manage.web.controller;
 
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
+import java.util.Comparator;
 import java.util.Date;
 import java.util.List;
 import java.util.Map;
@@ -15,6 +16,7 @@ import org.springframework.web.bind.annotation.RestController;
 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.date.DateUtil;
 
+import com.alibaba.dubbo.common.utils.CollectionUtils;
 import com.gic.clerk.api.dto.ClerkDTO;
 import com.gic.clerk.api.service.ClerkService;
 import com.gic.commons.util.EntityUtil;
@@ -125,17 +127,24 @@ public class StoreController extends WebBaseController{
 				VO.setStoreImg(imgList.get(0).getImageUrl());;
 			}
 		}
+		if(CollectionUtils.isNotEmpty(resultList)){
+			resultList = resultList.stream().sorted(Comparator.comparing(StoreVO::getBindFlag).thenComparing(StoreVO::getClerkType).reversed()).collect(Collectors.toList());
+		}
 		return resultResponse(HaoBanErrCode.ERR_1,resultList);
 	}
 	//获取首页销售数据
 	@RequestMapping("/sale-date")
-	public HaobanResponse saleDate(String storeId) {
-		if(StringUtils.isAnyBlank(storeId)){
+	public HaobanResponse saleDate(String storeId,String clerkType,String clerkId) {
+		if(StringUtils.isAnyBlank(storeId,clerkType,clerkId)){
 			return resultResponse(HaoBanErrCode.ERR_2);
 		}
 		StoreDTO store = storeService.getStore(storeId);
 		String enterpriseId = store.getEnterpriseId();
 		String date = DateUtil.format(new Date(), "yyyy-MM-dd");
+		if("0".equals(clerkType)){
+			HaobanDataDTO HaobanDataDTO = haobanDataApiService.getSaleDataByDateByClerkId(enterpriseId, storeId,clerkId, date);
+			return resultResponse(HaoBanErrCode.ERR_1,HaobanDataDTO);
+		}
 		HaobanDataDTO HaobanDataDTO = haobanDataApiService.getSaleDataByDate(enterpriseId, storeId, date);
 		return resultResponse(HaoBanErrCode.ERR_1,HaobanDataDTO);
 	}