Merge branch 'zx_1026_1111' into test

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

@@ -1,7 +1,6 @@
 package com.ym.mec.web.controller.open;
 
 import com.alibaba.fastjson.JSON;
-import com.alipay.api.domain.BizActionComsumedAmountDTO;
 import com.microsvc.toolkit.common.response.template.R;
 import com.ym.mec.biz.dal.dao.StudentPaymentOrderDao;
 import com.ym.mec.biz.dal.entity.Organization;
@@ -14,15 +13,14 @@ 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;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
@@ -181,6 +179,7 @@ public class OpenDouble11StaticsController extends BaseController {
         SysConfig config = sysConfigService.findByParamName("2023_double_eleven_active_config");
         Double11StaticWrapper.SaleStaticConfigParam configParam =
                 JSON.parseObject(config.getParanValue(), Double11StaticWrapper.SaleStaticConfigParam.class);
+        temp.setSaleStaticsType(query.getSaleStaticsType());
         setQueryParam(temp, configParam);
         Map<String, Object> tempMap = new HashMap<>();
         MapUtil.populateMap(tempMap, temp);
@@ -196,6 +195,12 @@ public class OpenDouble11StaticsController extends BaseController {
             pageInfo.setTotal(count);
             params.put("offset", pageInfo.getOffset());
             dataList = studentPaymentOrderDao.queryPaymentStudentByPage(params);
+            dataList.forEach(next -> {
+                String phone = next.getPhone();
+                if (StringUtils.isNotEmpty(phone)) {
+                    next.setPhone(phone.replaceAll("(\\d{3})\\d*(\\d{4})", "$1****$2"));
+                }
+            });
         }
         pageInfo.setRows(dataList);
         return R.from(pageInfo);
@@ -231,8 +236,8 @@ public class OpenDouble11StaticsController extends BaseController {
             query.setActivityId(configParam.getV1());
         } else if (saleStaticsType == 2) {
             // 乐理
-            query.setGroupType(GroupType.LIVE);
-            query.setType(OrderTypeEnum.LIVE_BUY);
+            query.setGroupType(GroupType.VIP);
+            query.setType(OrderTypeEnum.SMALL_CLASS_TO_BUY);
             query.setActivityId(configParam.getV2());
         } else if (saleStaticsType == 3) {
             // 乐理

mec-biz/src/main/java/com/ym/mec/biz/dal/wrapper/Double11StaticWrapper.java

@@ -73,7 +73,7 @@ public class Double11StaticWrapper {
         private String userName;
 
         @ApiModelProperty("统计类型，1:1V1，2:1v2,3:乐理，4:云教练，5:乐器销售，6:报价卡")
-        private Integer saleType = 1;
+        private Integer saleStaticsType = 1;
 
         @ApiModelProperty("默认为时间")
         private String orderBy;