Merge branch 'zx_1026_1111' of http://git.dayaedu.com/yonge/mec into test

mec-application/src/main/java/com/ym/mec/web/controller/open/OpenDouble11StaticsController.java

@@ -12,7 +12,9 @@ import com.ym.mec.biz.dal.wrapper.Double11StaticWrapper;
 import com.ym.mec.biz.service.OrganizationService;
 import com.ym.mec.biz.service.SysConfigService;
 import com.ym.mec.common.controller.BaseController;
+import com.ym.mec.common.entity.HttpResponseResult;
 import com.ym.mec.common.page.PageInfo;
+import com.ym.mec.common.tenant.TenantContextHolder;
 import com.ym.mec.util.collection.MapUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -29,6 +31,7 @@ import java.text.ParsePosition;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Collection;
+import java.util.Comparator;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -57,7 +60,7 @@ public class OpenDouble11StaticsController extends BaseController {
 
 
     @ApiOperation(value = "2023双11销售统计", notes = "2023双11销售统计")
-    @PostMapping("/saleStatics")
+    @GetMapping("/saleStatics")
     public R<Double11StaticWrapper.SaleStatics> saleStatics() {
         Double11StaticWrapper.SaleStaticsQuery query = new Double11StaticWrapper.SaleStaticsQuery();
 
@@ -198,6 +201,18 @@ public class OpenDouble11StaticsController extends BaseController {
         return R.from(pageInfo);
     }
 
+    @ApiOperation(value = "获取分部列表")
+    @GetMapping("/getOrgans")
+    public HttpResponseResult<List<Organization>> getOrgans() {
+        SysConfig config = sysConfigService.findByParamName("2023_double_eleven_active_config");
+        Double11StaticWrapper.SaleStaticConfigParam configParam =
+                JSON.parseObject(config.getParanValue(), Double11StaticWrapper.SaleStaticConfigParam.class);
+        Integer tenantId = Optional.ofNullable(configParam.getTenantId()).orElse(1);
+        List<Organization> allOrgans = organizationService.findAllOrgans(tenantId);
+        allOrgans.sort(Comparator.comparing(Organization::getName));
+        return succeed(allOrgans);
+    }
+
     private void setQueryParam(Double11StaticWrapper.SaleStaticsQuery query,
                                Double11StaticWrapper.SaleStaticConfigParam configParam) {