111

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

@@ -134,13 +134,17 @@ public class StoreController extends WebBaseController{
 	}
 	//获取首页销售数据
 	@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);
 	}