merge

cooleshow-mall/mall-admin/src/main/resources/config/mybatis/OmsOrderDao.xml

@@ -89,7 +89,7 @@
             oi.product_quantity item_product_quantity,
             oi.product_attr item_product_attr,
             if(oora.status is null,-1,oora.status) item_returnStatus,
-            if(oora.status = 2, 3, if(o.status = 2, 2, 1))  item_productStatus,
+            if(oora.status = 1, 4,if(oora.status = 2, 3, if(o.status = 2, 2, 1))) item_productStatus,
             oh.id history_id,
             oh.operate_man history_operate_man,
             oh.create_time history_create_time,

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/CbsSubjectServiceImpl.java

@@ -47,7 +47,6 @@ public class CbsSubjectServiceImpl implements CbsSubjectService {
             .filter(Objects::nonNull)
             .filter(subject -> subject.getCbsSubjectId() != null && subject.getName() != null)
             .collect(Collectors.toMap(SubjectWrapper.Subject::getCbsSubjectId, SubjectWrapper.Subject::getName));
-
         List<CbsSubjectApiWrapper.Subject> subjects = subjectService.getDao().queryCbsList(query);
         for (CbsSubjectApiWrapper.Subject subject : subjects) {
             Long cbsSubjectId = subject.getCbsSubjectId();

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/MusicSheetServiceImpl.java

@@ -864,6 +864,7 @@ public class MusicSheetServiceImpl extends ServiceImpl<MusicSheetDao, MusicSheet
             query.setRows(cbsMusicSheetIds.size());
             query.setMusicSheetIds(cbsMusicSheetIds);
             query.setDetailFlag(true);
+            query.setDelFlag(true);
             R<PageInfo<CbsMusicSheetWrapper.MusicSheetApplication>> pageInfoR = cbsMusicScoreService.selectPage(query);
             if(pageInfoR.getCode() != 200){
                 throw new BizException("获取曲目信息失败");

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/SysUserServiceImpl.java

@@ -15,7 +15,6 @@ import com.yonge.cooleshow.biz.dal.entity.CourseGroup;
 import com.yonge.cooleshow.biz.dal.entity.ImGroup;
 import com.yonge.cooleshow.biz.dal.entity.ImGroupMember;
 import com.yonge.cooleshow.biz.dal.entity.Student;
-import com.yonge.cooleshow.biz.dal.entity.Subject;
 import com.yonge.cooleshow.biz.dal.entity.Teacher;
 import com.yonge.cooleshow.biz.dal.entity.UserOrder;
 import com.yonge.cooleshow.biz.dal.entity.UserOrderRefund;
@@ -38,6 +37,7 @@ import com.yonge.toolset.thirdparty.user.realname.RealnameAuthenticationPlugin;
 import com.yonge.toolset.utils.idcard.IdcardInfoExtractor;
 import com.yonge.toolset.utils.idcard.IdcardValidator;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
@@ -73,8 +73,6 @@ public class SysUserServiceImpl implements SysUserService {
     private TeacherService teacherService;
     @Resource
     private MessageSenderPluginContext messageSenderPluginContext;
-    @Resource
-    private MessageFeignClientService messageFeignClientService;
 
     @Autowired
     private UserOrderService userOrderService;
@@ -103,6 +101,8 @@ public class SysUserServiceImpl implements SysUserService {
     @Autowired
     private ImUserFriendService imUserFriendService;
 
+    @Resource
+    private MessageFeignClientService messageFeignClientService;
     @Override
     public SysUserMapper getDao() {
         return sysUserMapper;
@@ -237,17 +237,6 @@ public class SysUserServiceImpl implements SysUserService {
             }
         }
     }
-    public EClientType getClientType(String jpushType){
-        if(StringUtils.isEmpty(jpushType)){
-            return null;
-        }else if(jpushType.contains("STUDENT")){
-            return EClientType.STUDENT;
-        }else if(jpushType.contains("TEACHER")){
-            return EClientType.TEACHER;
-        }else {
-            return EClientType.BACKEND;
-        }
-    }
 
     @Override
     public List<String> accountLogoffCheck(String phone) {
@@ -403,4 +392,15 @@ public class SysUserServiceImpl implements SysUserService {
                     .remove();
         }
     }
+    public EClientType getClientType(String jpushType){
+        if(StringUtils.isEmpty(jpushType)){
+            return null;
+        }else if(jpushType.contains("STUDENT")){
+            return EClientType.STUDENT;
+        }else if(jpushType.contains("TEACHER")){
+            return EClientType.TEACHER;
+        }else {
+            return EClientType.BACKEND;
+        }
+    }
 }