111

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

@@ -10,11 +10,15 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.core.date.DateUtil;
 
 import com.gic.clerk.api.dto.ClerkDTO;
 import com.gic.clerk.api.service.ClerkService;
 import com.gic.commons.util.EntityUtil;
+import com.gic.enterprise.api.dto.StoreDTO;
+import com.gic.enterprise.api.service.StoreService;
 import com.gic.haoban.common.utils.HaobanResponse;
+import com.gic.haoban.data.api.dto.HaobanDataDTO;
 import com.gic.haoban.data.api.service.HaobanDataApiService;
 import com.gic.haoban.manage.api.dto.DepartmentDTO;
 import com.gic.haoban.manage.api.dto.StaffDTO;
@@ -40,6 +44,8 @@ public class StoreController extends WebBaseController{
 	private WxEnterpriseRelatedApiService wxEnterpriseRelatedApiService;
 	@Autowired
 	private HaobanDataApiService haobanDataApiService;
+	@Autowired
+	private StoreService storeService;
 	//门店列表
 	@RequestMapping("/store-list")
 	public HaobanResponse storeList(String staffId) {
@@ -55,11 +61,10 @@ public class StoreController extends WebBaseController{
 	//获取首页销售数据
 	@RequestMapping("/sale-date")
 	public HaobanResponse saleDate(String storeId,String wxEnterpriseId) {
-		wxEnterpriseRelatedApiService.listEnterpriseByWxEnterpriseId(wxEnterpriseId);
-		
-		return resultResponse(HaoBanErrCode.ERR_1);
-
-//		haobanDataApiService.getSaleDataByDate(arg0, storeId, arg2);
-//		return resultResponse(HaoBanErrCode.ERR_1,resultList);
+		StoreDTO store = storeService.getStore(storeId);
+		String enterpriseId = store.getEnterpriseId();
+		String date = DateUtil.format(new Date(), "yyyy-MM-dd");
+		HaobanDataDTO HaobanDataDTO = haobanDataApiService.getSaleDataByDate(enterpriseId, storeId, date);
+		return resultResponse(HaoBanErrCode.ERR_1,HaobanDataDTO);
 	}
 }