Merge branch 'zx_1026_1111' into test

mec-application/src/main/java/com/ym/mec/student/controller/ActivityController.java

@@ -136,6 +136,20 @@ public class ActivityController extends BaseController {
         JSONObject jsonObject = JSONObject.parseObject(configValue);
         return succeed(jsonObject.getJSONObject("musical"));
     }
+    @ApiOperation("校验用户分部是否参与活动")
+    @PostMapping(value = "/checkActivityOrgan")
+    @AuditLogAnnotation(operateName = "校验用户分部是否参与活动")
+    public HttpResponseResult<Boolean> checkActivityOrgan(){
+        String configValue = sysConfigDao.findConfigValue("2023_activity_organ");
+        if (StringUtils.isEmpty(configValue)) {
+            return succeed(true);
+        }
+        SysUser user = sysUserService.getUser();
+        if(configValue.contains(user.getOrganId().toString())){
+            return succeed(true);
+        }
+        return succeed(false);
+    }
 
 
     @ApiOperation(value = "学员已购买的双十一活动信息")

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

@@ -1290,7 +1290,7 @@
             LEFT JOIN sell_order so on t.order_no_ = so.order_no_
         </if>
         <where>
-            status_ = 'SUCCESS'
+            t.status_ = 'SUCCESS'
             <if test="param.tenantId != null">
                 AND t.tenant_id_ =#{param.tenantId}
             </if>