fix:商城同步用户

cooleshow-mall/mall-admin/src/main/java/com/yonge/cooleshow/admin/controller/UmsAdminController.java

@@ -82,6 +82,9 @@ public class UmsAdminController {
         if (umsAdmin == null) {
             return CommonResult.failed("用户同步失败");
         }
+
+        adminService.updateInfo(umsAdmin.getId(),sysUser);
+
         if (umsAdmin.getStatus() == 0) {
             return CommonResult.failed("用户被禁用");
         }

cooleshow-mall/mall-admin/src/main/java/com/yonge/cooleshow/admin/service/UmsAdminService.java

@@ -2,6 +2,7 @@ package com.yonge.cooleshow.admin.service;
 
 import com.yonge.cooleshow.admin.dto.UmsAdminParam;
 import com.yonge.cooleshow.admin.dto.UpdateAdminPasswordParam;
+import com.yonge.cooleshow.auth.api.entity.SysUser;
 import com.yonge.cooleshow.mbg.model.UmsAdmin;
 import com.yonge.cooleshow.mbg.model.UmsResource;
 import com.yonge.cooleshow.mbg.model.UmsRole;
@@ -85,4 +86,12 @@ public interface UmsAdminService {
      */
     @Transactional
     void saveAdmin();
+
+    /**
+     * 更新登录用户信息
+     *
+     * @param umsAdminId
+     * @param sysUser
+     */
+    void updateInfo(Long umsAdminId, SysUser sysUser);
 }

cooleshow-mall/mall-admin/src/main/java/com/yonge/cooleshow/admin/service/impl/OmsOrderReturnApplyServiceImpl.java

@@ -90,7 +90,7 @@ public class OmsOrderReturnApplyServiceImpl implements OmsOrderReturnApplyServic
             returnApply.setReceiveTime(new Date());
             returnApply.setReceiveMan(statusParam.getReceiveMan());
             returnApply.setReceiveNote(statusParam.getReceiveNote());
-            refundAmount(returnApply);
+            refundAmount(omsOrderReturnApply);
         }else if(status.equals(3)){
             //拒绝退货
             returnApply.setId(id);

cooleshow-mall/mall-admin/src/main/java/com/yonge/cooleshow/admin/service/impl/UmsAdminServiceImpl.java

@@ -222,14 +222,7 @@ public class UmsAdminServiceImpl implements UmsAdminService {
             List<SysUser> rows = result.getData();
             List<UmsAdmin> adminList = new ArrayList<>();
             for (SysUser row : rows) {
-                UmsAdmin admin = new UmsAdmin();
-                admin.setId(row.getId());
-                admin.setCreateTime(row.getCreateTime());
-                admin.setUsername(row.getPhone());
-                admin.setNickName(row.getUsername());
-                admin.setPassword(row.getPassword());
-                admin.setStatus(1);
-                admin.setIcon(row.getAvatar());
+                UmsAdmin admin = getUmsAdmin(row);
                 adminList.add(admin);
             }
             addRootAdmin(adminList);
@@ -237,6 +230,24 @@ public class UmsAdminServiceImpl implements UmsAdminService {
         configMapper.setConfig(SysConfig.SYNC_TIME,now);
     }
 
+    @Override
+    public void updateInfo(Long umsAdminId, SysUser sysUser) {
+        UmsAdmin umsAdmin = getUmsAdmin(sysUser);
+        adminMapper.updateByPrimaryKeySelective(umsAdmin);
+    }
+
+    private UmsAdmin getUmsAdmin(SysUser row) {
+        UmsAdmin admin = new UmsAdmin();
+        admin.setId(row.getId());
+        admin.setCreateTime(row.getCreateTime());
+        admin.setUsername(row.getPhone());
+        admin.setNickName(row.getUsername());
+        admin.setPassword(row.getPassword());
+        admin.setStatus(1);
+        admin.setIcon(row.getAvatar());
+        return admin;
+    }
+
     /**
      * 添加默认权限
      *

cooleshow-mall/mall-common/src/main/java/com/yonge/cooleshow/mall/common/exception/GlobalExceptionHandler.java

@@ -1,6 +1,9 @@
 package com.yonge.cooleshow.mall.common.exception;
 
 import com.yonge.cooleshow.mall.common.api.CommonResult;
+import com.yonge.cooleshow.mall.common.api.IErrorCode;
+import com.yonge.toolset.base.exception.BizException;
+import org.springframework.http.HttpStatus;
 import org.springframework.validation.BindException;
 import org.springframework.validation.BindingResult;
 import org.springframework.validation.FieldError;
@@ -52,4 +55,11 @@ public class GlobalExceptionHandler {
         }
         return CommonResult.validateFailed(message);
     }
+
+
+    @ResponseBody
+    @ExceptionHandler(value = BizException.class)
+    public CommonResult handleBizException(BizException e) {
+        return  CommonResult.failed(e.getMessage());
+    }
 }

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/convert/AudioTypeConverter.java

@@ -28,7 +28,7 @@ public class AudioTypeConverter implements Converter<AudioTypeEnum> {
     @Override
     public AudioTypeEnum convertToJavaData(CellData cellData, ExcelContentProperty contentProperty, GlobalConfiguration globalConfiguration) throws Exception {
         try {
-            if ("MAP".equals(cellData.getStringValue())) {
+            if ("MP3".equals(cellData.getStringValue())) {
                 return AudioTypeEnum.MP3;
             } else if ("MIDI".equals(cellData.getStringValue())){
                 return AudioTypeEnum.MIDI;

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dto/MusicSheetExport.java

@@ -19,7 +19,7 @@ import io.swagger.annotations.ApiModelProperty;
 @ApiModel("曲目导入格式")
 public class MusicSheetExport {
 
-    @ExcelProperty(value = "曲目名称", index = 1)
+    @ExcelProperty(value = "曲目名称")
     private String musicSheetName;  //曲谱名称
 
     @ApiModelProperty(value = "曲目音频类型 MP3：mp3, MIDI:midi,")
@@ -27,25 +27,25 @@ public class MusicSheetExport {
     private AudioTypeEnum audioType;
 
     @ApiModelProperty(value = "mp3类型 MP3：mp3, MP3_METRONOME:MP3_METRONOME,")
-    @ExcelProperty(value = "是否含节拍器", index = 0)
+    @ExcelProperty(value = "是否含节拍器",converter = AudioTypeConverter.class)
     private AudioTypeEnum mp3Type;
 
     @ApiModelProperty(value = "XML文件存储路径")
-    @ExcelProperty(value = "XML文件地址", index = 0)
+    @ExcelProperty(value = "XML文件地址")
     private String xmlFileUrl;  //XML文件存储路径
 
     @ApiModelProperty(value = "midi路径")
-    @ExcelProperty(value = "伴奏文件地址", index = 0)
+    @ExcelProperty(value = "伴奏文件地址")
     private String midiUrl;  //XML文件存储路径
 
     @ApiModelProperty(value = "曲谱标签(多个标签用逗号分隔)")
-    @ExcelProperty(value = "曲目标签", index = 0)
+    @ExcelProperty(value = "曲目标签")
     private String musicTags;  //曲谱标签(多个标签用逗号分隔)
 
-    @ExcelProperty(value = "可用声部", index = 0)
+    @ExcelProperty(value = "可用声部")
     private String musicSubjects;  //曲谱声部(适用的乐器,可能是多个,用逗号分隔)
 
-    @ExcelProperty(value = "音乐人", index = 0)
+    @ExcelProperty(value = "音乐人")
     private String composer;  //作曲人
 
     @ExcelProperty(value = "指法是否展示",converter = YesOrNoConverter.class)
@@ -56,11 +56,7 @@ public class MusicSheetExport {
     @ApiModelProperty(value = "是否可以评测(0:否;1:是)")
     private YesOrNoEnum canEvaluate;  //是否可以评测(0:否;1:是)
 
-    @ExcelProperty(value = "收费方式",converter = ChargeTypeConverter.class)
-    @ApiModelProperty(value = "收费类型(FREE:免费;VIP:会员;CHARGE:单曲收费)")
-    private ChargeTypeEnum chargeType;  //收费类型(0:免费;1:会员;2:单曲收费)
-
-    @ExcelProperty(value = "MP3原音", index = 0)
+    @ExcelProperty(value = "MP3原音")
     @ApiModelProperty(value = "MP3原声音频文件URL")
     private String audioFileUrls;  //MP3原声音频文件URL
 
@@ -144,14 +140,6 @@ public class MusicSheetExport {
         this.canEvaluate = canEvaluate;
     }
 
-    public ChargeTypeEnum getChargeType() {
-        return chargeType;
-    }
-
-    public void setChargeType(ChargeTypeEnum chargeType) {
-        this.chargeType = chargeType;
-    }
-
     public String getAudioFileUrls() {
         return audioFileUrls;
     }

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

@@ -617,13 +617,19 @@ public class MusicSheetServiceImpl extends ServiceImpl<MusicSheetDao,MusicSheet>
             }
             MusicSheetExport sheetExport = readerProperty.getClazz();
             BeanUtils.copyProperties(sheetExport,musicSheetDto);
+
+            if (musicSheetDto.getAudioType().equals(AudioTypeEnum.MP3)) {
+                musicSheetDto.setUrl(musicSheetDto.getMidiUrl());
+                musicSheetDto.setMidiUrl("");
+            }
+
             // TODO 导入
             String musicTags = sheetExport.getMusicTags();
             if (musicTags == null || musicTags.equals("")) {
                 errMsgList.add(new ErrMsg(readerProperty.getRowIndex(), "曲目标签不能为空"));
             }
             List<String> stringList = Arrays.asList(musicTags.split(",|，"));
-            String musicTagIds = "";
+            StringBuilder musicTagIds = new StringBuilder();
             List<MusicTag> childrenMusicTag = new ArrayList<>();
             for (MusicTagVo musicTagVo : musicTagVoList) {
                 childrenMusicTag.addAll(musicTagVo.getChildren());
@@ -632,7 +638,10 @@ public class MusicSheetServiceImpl extends ServiceImpl<MusicSheetDao,MusicSheet>
                 boolean  b = false;
                 for (MusicTag musicTag : childrenMusicTag) {
                     if(musicTag.getName().equals(s)) {
-                        musicTagIds = musicTags + "," + musicTag.getId();
+                        if (musicTagIds.length() != 0) {
+                            musicTagIds.append(",");
+                        }
+                        musicTagIds.append(musicTag.getId());
                         b = true;
                     }
                 }
@@ -649,6 +658,9 @@ public class MusicSheetServiceImpl extends ServiceImpl<MusicSheetDao,MusicSheet>
                 List<Subject> subjects = subjectService.subjectSelect();
                 List<Subject> childrenSubject = new ArrayList<>();
                 for (Subject subject : subjects) {
+                    if (CollectionUtils.isEmpty(subject.getSubjects())) {
+                        continue;
+                    }
                     childrenSubject.addAll(subject.getSubjects());
                 }
                 List<Subject> collect = childrenSubject.stream()
@@ -672,7 +684,7 @@ public class MusicSheetServiceImpl extends ServiceImpl<MusicSheetDao,MusicSheet>
                 musicSheetDto.setBackground(background);
             }
 
-            musicSheetDto.setMusicTag(musicTagIds);
+            musicSheetDto.setMusicTag(musicTagIds.toString());
 
             musicSheetDtoList.add(musicSheetDto);
         }