fix:用户

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

@@ -79,9 +79,10 @@ public class OmsOrderReturnApplyController {
                     return CommonResult.success(count);
                 }
             }
-        } catch (Exception e) {
-            log.error(e.getLocalizedMessage());
+        } catch (InterruptedException e) {
             e.printStackTrace();
+            log.warn("");
+        } finally {
             lock.unlock();
         }
 

cooleshow-mall/mall-admin/src/main/java/enums/OrderStatisticalEnum.java → cooleshow-mall/mall-admin/src/main/java/com/yonge/cooleshow/admin/enums/OrderStatisticalEnum.java

@@ -1,4 +1,4 @@
-package enums;
+package com.yonge.cooleshow.admin.enums;
 
 /**
  * Description

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

@@ -7,6 +7,7 @@ import com.yonge.cooleshow.admin.dto.HomeStatistical;
 import com.yonge.cooleshow.admin.dto.OmsOrderReturnApplyResult;
 import com.yonge.cooleshow.admin.dto.OmsReturnApplyQueryParam;
 import com.yonge.cooleshow.admin.dto.OmsUpdateStatusParam;
+import com.yonge.cooleshow.mall.common.exception.ApiException;
 import com.yonge.toolset.base.exception.BizException;
 import com.yonge.cooleshow.enums.PayStatusEnum;
 import com.yonge.cooleshow.mbg.mapper.OmsOrderReturnApplyMapper;
@@ -113,7 +114,7 @@ public class OmsOrderReturnApplyServiceImpl implements OmsOrderReturnApplyServic
         // 退款
         UserOrderPayment userOrderPayment = userOrderPaymentMapper.selectByOrderNoAndStatusSucceeded(returnApply.getOrderSn());
         if (userOrderPayment == null) {
-            throw new BizException("未找到付款信息");
+            throw new ApiException("未找到付款信息");
         }
         OrderRefundReq refundReq = new OrderRefundReq();
         refundReq.setOrderNo(returnApply.getOrderSn());

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

@@ -15,7 +15,7 @@ import com.yonge.cooleshow.mbg.model.OmsOrderExample;
 import com.yonge.cooleshow.mbg.model.OmsOrderOperateHistory;
 import com.yonge.cooleshow.admin.service.OmsOrderService;
 import com.yonge.toolset.utils.date.DateUtil;
-import enums.OrderStatisticalEnum;
+import com.yonge.cooleshow.admin.enums.OrderStatisticalEnum;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;

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

@@ -240,7 +240,7 @@ public class UmsAdminServiceImpl implements UmsAdminService {
         UmsAdmin admin = new UmsAdmin();
         admin.setId(row.getId());
         admin.setCreateTime(row.getCreateTime());
-        admin.setUsername(row.getPhone());
+        admin.setUsername(row.getUsername());
         admin.setNickName(row.getUsername());
         admin.setPassword(row.getPassword());
         admin.setStatus(1);

cooleshow-mall/mall-mbg/src/main/java/com/yonge/cooleshow/mbg/model/OmsCartItem.java

@@ -8,8 +8,10 @@ import java.util.Date;
 public class OmsCartItem implements Serializable {
     private Long id;
 
+    @ApiModelProperty("商品id")
     private Long productId;
 
+    @ApiModelProperty("商品属性id")
     private Long productSkuId;
 
     private Long memberId;

cooleshow-mall/mall-portal/src/main/java/com/yonge/cooleshow/portal/domain/OmsOrderReturnApplyParam.java

@@ -12,6 +12,10 @@ import java.math.BigDecimal;
 public class OmsOrderReturnApplyParam {
     @ApiModelProperty("订单id")
     private Long orderId;
+
+    @ApiModelProperty("订单商品id")
+    private Long orderItemId;
+
     @ApiModelProperty("退货商品id")
     private Long productId;
     @ApiModelProperty("订单编号")
@@ -171,4 +175,12 @@ public class OmsOrderReturnApplyParam {
     public void setProofPics(String proofPics) {
         this.proofPics = proofPics;
     }
+
+    public Long getOrderItemId() {
+        return orderItemId;
+    }
+
+    public void setOrderItemId(Long orderItemId) {
+        this.orderItemId = orderItemId;
+    }
 }

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

@@ -625,28 +625,29 @@ public class MusicSheetServiceImpl extends ServiceImpl<MusicSheetDao,MusicSheet>
 
             // TODO 导入
             String musicTags = sheetExport.getMusicTags();
+            StringBuilder musicTagIds = new StringBuilder();
             if (musicTags == null || musicTags.equals("")) {
                 errMsgList.add(new ErrMsg(readerProperty.getRowIndex(), "曲目标签不能为空"));
-            }
-            List<String> stringList = Arrays.asList(musicTags.split(",|，"));
-            StringBuilder musicTagIds = new StringBuilder();
-            List<MusicTag> childrenMusicTag = new ArrayList<>();
-            for (MusicTagVo musicTagVo : musicTagVoList) {
-                childrenMusicTag.addAll(musicTagVo.getChildren());
-            }
-            for (String s : stringList) {
-                boolean  b = false;
-                for (MusicTag musicTag : childrenMusicTag) {
-                    if(musicTag.getName().equals(s)) {
-                        if (musicTagIds.length() != 0) {
-                            musicTagIds.append(",");
+            }  else {
+                List<String> stringList = Arrays.asList(musicTags.split(",|，"));
+                List<MusicTag> childrenMusicTag = new ArrayList<>();
+                for (MusicTagVo musicTagVo : musicTagVoList) {
+                    childrenMusicTag.addAll(musicTagVo.getChildren());
+                }
+                for (String s : stringList) {
+                    boolean b = false;
+                    for (MusicTag musicTag : childrenMusicTag) {
+                        if (musicTag.getName().equals(s)) {
+                            if (musicTagIds.length() != 0) {
+                                musicTagIds.append(",");
+                            }
+                            musicTagIds.append(musicTag.getId());
+                            b = true;
                         }
-                        musicTagIds.append(musicTag.getId());
-                        b = true;
                     }
-                }
-                if (!b) {
-                    errMsgList.add(new ErrMsg(readerProperty.getRowIndex(), "曲目名称错误：" + s));
+                    if (!b) {
+                        errMsgList.add(new ErrMsg(readerProperty.getRowIndex(), "曲目名称错误：" + s));
+                    }
                 }
             }
             if (StringUtil.isEmpty(sheetExport.getComposer())) {