Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop into feature/pg

framework/src/main/java/cn/lili/modules/distribution/entity/dos/DistributionOrder.java

@@ -50,6 +50,9 @@ public class DistributionOrder extends BaseIdEntity {
     private String distributionId;
     @ApiModelProperty(value = "分销员名称")
     private String distributionName;
+
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @ApiModelProperty(value = "解冻日期")
     private Date settleCycle;
     @ApiModelProperty(value = "提成金额")

framework/src/main/java/cn/lili/modules/distribution/serviceimpl/DistributionCashServiceImpl.java

@@ -73,6 +73,7 @@ public class DistributionCashServiceImpl extends ServiceImpl<DistributionCashMap
             }
             //将提现金额存入冻结金额,扣减可提现金额
             distribution.setCanRebate(CurrencyUtil.sub(distribution.getCanRebate(), applyMoney));
+            distribution.setCommissionFrozen(CurrencyUtil.add(distribution.getCommissionFrozen(), applyMoney));
             distributionService.updateById(distribution);
             //提现申请记录
             DistributionCash distributionCash = new DistributionCash("D" + SnowFlake.getId(), distribution.getId(), applyMoney, distribution.getMemberName());

framework/src/main/java/cn/lili/modules/file/plugin/impl/MinioFilePlugin.java

@@ -1,5 +1,7 @@
 package cn.lili.modules.file.plugin.impl;
 
+import cn.lili.common.enums.ResultCode;
+import cn.lili.common.exception.ServiceException;
 import cn.lili.modules.file.entity.enums.OssEnum;
 import cn.lili.modules.file.plugin.FilePlugin;
 import cn.lili.modules.system.entity.dto.OssSetting;
@@ -62,10 +64,9 @@ public class MinioFilePlugin implements FilePlugin {
     public String pathUpload(String filePath, String key) {
         try {
             return this.inputStreamUpload(new FileInputStream(filePath), key);
-        } catch (FileNotFoundException e) {
+        } catch (Exception e) {
-            e.printStackTrace();
+            throw new ServiceException(ResultCode.OSS_DELETE_ERROR, e.getMessage());
         }
-        return null;
     }
 
     @Override
@@ -80,12 +81,9 @@ public class MinioFilePlugin implements FilePlugin {
                     .contentType("image/png")
                     .build();
             client.putObject(putObjectArgs);
-        } catch (ErrorResponseException e) {
-            e.printStackTrace();
-            return null;
         } catch (Exception e) {
             log.error("上传失败2，", e);
-            return null;
+            throw new ServiceException(ResultCode.OSS_DELETE_ERROR, e.getMessage());
         }
         //拼接出可访问的url地址
         return ossSetting.getM_endpoint() + "/" + bucket + "/" + key;
@@ -129,8 +127,10 @@ public class MinioFilePlugin implements FilePlugin {
                         log.info("创建minio桶成功{}", ossSetting.getM_bucketName());
                     }
                 } catch (Exception e) {
-                    e.printStackTrace();
+                    //晴空配置
+                    minioClient = null;
                     log.error("创建[{}]bucket失败", ossSetting.getM_bucketName());
+                    throw new ServiceException(ResultCode.OSS_DELETE_ERROR, e.getMessage());
                 }
             }
         }

framework/src/main/java/cn/lili/modules/member/serviceimpl/MemberServiceImpl.java

@@ -15,10 +15,7 @@ import cn.lili.common.security.context.UserContext;
 import cn.lili.common.security.enums.UserEnums;
 import cn.lili.common.security.token.Token;
 import cn.lili.common.sensitive.SensitiveWordsFilter;
-import cn.lili.common.utils.BeanUtil;
+import cn.lili.common.utils.*;
-import cn.lili.common.utils.CookieUtil;
-import cn.lili.common.utils.SnowFlake;
-import cn.lili.common.utils.UuidUtils;
 import cn.lili.common.vo.PageVO;
 import cn.lili.modules.connect.config.ConnectAuthEnum;
 import cn.lili.modules.connect.entity.Connect;
@@ -405,11 +402,11 @@ public class MemberServiceImpl extends ServiceImpl<MemberMapper, Member> impleme
     @Override
     public Member updateMember(ManagerMemberEditDTO managerMemberEditDTO) {
         //过滤会员昵称敏感词
-        if (com.baomidou.mybatisplus.core.toolkit.StringUtils.isNotBlank(managerMemberEditDTO.getNickName())) {
+        if (StringUtils.isNotBlank(managerMemberEditDTO.getNickName())) {
             managerMemberEditDTO.setNickName(SensitiveWordsFilter.filter(managerMemberEditDTO.getNickName()));
         }
         //如果密码不为空则加密密码
-        if (com.baomidou.mybatisplus.core.toolkit.StringUtils.isNotBlank(managerMemberEditDTO.getPassword())) {
+        if (StringUtils.isNotBlank(managerMemberEditDTO.getPassword())) {
             managerMemberEditDTO.setPassword(new BCryptPasswordEncoder().encode(managerMemberEditDTO.getPassword()));
         }
         //查询会员信息

framework/src/main/java/cn/lili/modules/sms/impl/SmsUtilAliImplService.java

@@ -156,6 +156,9 @@ public class SmsUtilAliImplService implements SmsUtil, AliSmsUtil {
                 .setTemplateParam(JSONUtil.toJsonStr(param));
         try {
             SendSmsResponse response = client.sendSms(sendSmsRequest);
+            if (!("OK").equals(response.getBody().getCode())) {
+                throw new ServiceException(response.getBody().getMessage());
+            }
         } catch (Exception e) {
             log.error("发送短信错误", e);
         }