Merge remote-tracking branch 'origin/zx_1026_1111' into zx_1026_1111

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

@@ -180,7 +180,7 @@ public class OpenDouble11StaticsController extends BaseController {
         int asc = Optional.ofNullable(query.getAsc()).orElse(0);
         if ("saleAmount".equals(orderBy)) {
             result.sort((o1, o2) -> {
-                if (0 == asc) {
+                if (1 == asc) {
                     return o1.getSaleAmount().compareTo(o2.getSaleAmount());
                 } else {
                     return o2.getSaleAmount().compareTo(o1.getSaleAmount());
@@ -188,7 +188,7 @@ public class OpenDouble11StaticsController extends BaseController {
             });
         } else if ("userCount".equals(orderBy)) {
             result.sort((o1, o2) -> {
-                if (0 == asc) {
+                if (1 == asc) {
                     return o1.getUserPurchaseNumber().compareTo(o2.getUserPurchaseNumber());
                 } else {
                     return o2.getUserPurchaseNumber().compareTo(o1.getUserPurchaseNumber());
@@ -207,10 +207,6 @@ public class OpenDouble11StaticsController extends BaseController {
         Double11StaticWrapper.SaleStaticConfigParam configParam =
                 JSON.parseObject(config.getParanValue(), Double11StaticWrapper.SaleStaticConfigParam.class);
         temp.setSaleStaticsType(query.getSaleStaticsType());
-        SysConfig orgs = sysConfigService.findByParamName("2023_activity_organ");
-        if (orgs != null) {
-            query.setOrganId(orgs.getParanValue());
-        }
         setQueryParam(temp, configParam);
 
         Map<String, Object> params = new HashMap<>();
@@ -278,16 +274,14 @@ public class OpenDouble11StaticsController extends BaseController {
             query.setMusicGroupId(configParam.getTheoryLive());
         } else if (saleStaticsType == 4) {
             // 云教练
-            query.setGroupType(GroupType.MEMBER);
+            query.setGroupType(GroupType.ACTIVITY);
             query.setType(OrderTypeEnum.MEMBER);
             query.setActivityId(configParam.getCloudTeacher());
         } else if (saleStaticsType == 5) {
             // 乐器销售
-            Map<String, Long> musical = configParam.getMusical();
-            if (musical != null) {
-                Collection<String> values = musical.values().stream().map(String::valueOf).collect(Collectors.toList());
-                query.setGoodId(String.join(",", values));
-            }
+            SysConfig good = sysConfigService.findByParamName("2023_activity_good");
+            query.setGoodId(good.getParanValue());
+
             SysConfig startTime = sysConfigService.findByParamName("2023_activity_start_time");
             query.setStartPayTime(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").parse(
                     Optional.ofNullable(startTime.getParanValue()).orElse("2023-11-11 00:00:00"),

mec-biz/src/main/resources/config/mybatis/StudentPaymentOrderMapper.xml

@@ -1349,9 +1349,6 @@
             <if test="organId != null">
                 AND find_in_set(t.organ_id_,#{organId})
             </if>
-            <if test="organId != null">
-                AND t.organ_id_ = #{organId}
-            </if>
             <if test="userName != null and userName.trim() !=''">
                 AND su.username_ like concat('%',#{userName},'%')
             </if>