fixed 平台方编辑功能

fuint-application/src/main/java/com/fuint/common/service/AccountService.java

@@ -76,14 +76,35 @@ public interface AccountService extends IService<TAccount> {
     List<Long> getDutyIdsByAccountId(long accountId);
 
     /**
-     * 更新账户
+     * 更新账户信息
+     *
      * @param tAccount
+     * @return
      */
     void updateAccount(TAccount tAccount);
 
+    /**
+     * 删除后台账号
+     *
+     * @param userId
+     * @return
+     * */
     void deleteAccount(Long userId);
 
+    /**
+     * 密码加密
+     *
+     * @param user
+     * @return
+     * */
     void entryptPassword(TAccount user);
 
+    /**
+     * 获取加密密码
+     *
+     * @param password
+     * @param salt
+     * @return
+     * */
     String getEntryptPassword(String password, String salt);
 }

fuint-application/src/main/java/com/fuint/common/service/ArticleService.java

@@ -58,6 +58,9 @@ public interface ArticleService extends IService<MtArticle> {
 
     /**
      * 根据条件搜索文章
+     *
+     * @param params
+     * @return
      * */
     List<MtArticle> queryArticleListByParams(Map<String, Object> params) throws BusinessCheckException;
 

fuint-application/src/main/java/com/fuint/common/service/impl/AccountServiceImpl.java

@@ -217,7 +217,7 @@ public class AccountServiceImpl extends ServiceImpl<TAccountMapper, TAccount> im
     /**
      * 修改账户
      *
-     * @param tAccount 账户实体
+     * @param  tAccount 账户实体
      * @throws BusinessCheckException
      */
     @Override
@@ -275,7 +275,8 @@ public class AccountServiceImpl extends ServiceImpl<TAccountMapper, TAccount> im
     /**
      * 删除账号
      *
-     * @param
+     * @param userId
+     * @return
      * */
     @Override
     @Transactional(rollbackFor = Exception.class)
@@ -288,7 +289,10 @@ public class AccountServiceImpl extends ServiceImpl<TAccountMapper, TAccount> im
     }
 
     /**
-     * 设定安全的密码，生成随机的salt并经过1024次 sha-1 hash
+     * 设定安全的密码
+     *
+     * @param user
+     * @return
      */
     @Override
     public void entryptPassword(TAccount user) {
@@ -300,6 +304,10 @@ public class AccountServiceImpl extends ServiceImpl<TAccountMapper, TAccount> im
 
     /**
      * 获取加密密码
+     *
+     * @param password
+     * @param salt
+     * @return
      * */
     @Override
     public String getEntryptPassword(String password, String salt) {

fuint-application/src/main/java/com/fuint/common/service/impl/ArticleServiceImpl.java

@@ -190,9 +190,6 @@ public class ArticleServiceImpl extends ServiceImpl<MtArticleMapper, MtArticle>
         if (articleDto.getMerchantId() != null) {
             mtArticle.setMerchantId(articleDto.getMerchantId());
         }
-        if (articleDto.getMerchantId() != null) {
-            mtArticle.setMerchantId(articleDto.getMerchantId());
-        }
         if (articleDto.getStoreId() != null) {
             mtArticle.setStoreId(articleDto.getStoreId());
         }
@@ -216,6 +213,12 @@ public class ArticleServiceImpl extends ServiceImpl<MtArticleMapper, MtArticle>
         return mtArticle;
     }
 
+    /**
+     * 根据条件搜索文章
+     *
+     * @param params
+     * @return
+     * */
     @Override
     public List<MtArticle> queryArticleListByParams(Map<String, Object> params) {
         String status =  params.get("status") == null ? StatusEnum.ENABLED.getKey(): params.get("status").toString();

fuint-application/src/main/java/com/fuint/common/service/impl/CouponGroupServiceImpl.java

@@ -201,7 +201,6 @@ public class CouponGroupServiceImpl extends ServiceImpl<MtCouponGroupMapper, MtC
     public MtCouponGroup updateCouponGroup(ReqCouponGroupDto reqcouponGroupDto) throws BusinessCheckException {
         MtCouponGroup couponGroup = queryCouponGroupById(reqcouponGroupDto.getId());
         if (null == couponGroup || StatusEnum.DISABLE.getKey().equalsIgnoreCase(couponGroup.getStatus())) {
-            log.error("该分组不存在或已被删除");
             throw new BusinessCheckException("该分组不存在或已被删除");
         }
         if (reqcouponGroupDto.getName() != null) {
@@ -216,12 +215,9 @@ public class CouponGroupServiceImpl extends ServiceImpl<MtCouponGroupMapper, MtC
         if (reqcouponGroupDto.getStatus() != null) {
             couponGroup.setStatus(reqcouponGroupDto.getStatus());
         }
-
         couponGroup.setUpdateTime(new Date());
         couponGroup.setOperator(reqcouponGroupDto.getOperator());
-
         this.updateById(couponGroup);
-
         return couponGroup;
     }
 
@@ -241,7 +237,7 @@ public class CouponGroupServiceImpl extends ServiceImpl<MtCouponGroupMapper, MtC
     /**
      * 获取卡券总价值
      *
-     * @param groupId
+     * @param  groupId
      * @throws BusinessCheckException
      */
     @Override
@@ -328,8 +324,8 @@ public class CouponGroupServiceImpl extends ServiceImpl<MtCouponGroupMapper, MtC
                     continue;
                 }
 
-                if (j%2 != 0) {
-                    Pattern pattern = Pattern.compile("^[1-9]\\d*$");
+                Pattern pattern = Pattern.compile("^[1-9]\\d*$");
+                if ((j%2) != 0) {
                     if (item == null || (!pattern.matcher(cellContent).matches())) {
                         throw new BusinessCheckException("第" + (i+1) + "行第"+ j +"列错误, 卡券ID异常");
                     }
@@ -341,7 +337,6 @@ public class CouponGroupServiceImpl extends ServiceImpl<MtCouponGroupMapper, MtC
                     }
                     groupIdArr.add(item);
                 } else {
-                    Pattern pattern = Pattern.compile("^[1-9]\\d*$");
                     if (item == null || (!pattern.matcher(rowContent.get(j)).matches())) {
                         throw new BusinessCheckException("第" + (i+1) + "行第"+ j +"列错误, 数量异常");
                     }

fuint-application/src/main/java/com/fuint/common/service/impl/GoodsServiceImpl.java

@@ -164,6 +164,7 @@ public class GoodsServiceImpl extends ServiceImpl<MtGoodsMapper, MtGoods> implem
         MtGoods mtGoods = new MtGoods();
         if (reqDto.getId() > 0) {
             mtGoods = queryGoodsById(reqDto.getId());
+            reqDto.setMerchantId(mtGoods.getMerchantId());
         }
         if (reqDto.getMerchantId() != null) {
             mtGoods.setMerchantId(reqDto.getMerchantId() >= 0 ? reqDto.getMerchantId() : 0);
@@ -392,15 +393,13 @@ public class GoodsServiceImpl extends ServiceImpl<MtGoodsMapper, MtGoods> implem
      */
     @Override
     @OperationServiceLog(description = "删除商品信息")
-    public void deleteGoods(Integer id, String operator) {
+    public void deleteGoods(Integer id, String operator) throws BusinessCheckException {
         MtGoods cateInfo = queryGoodsById(id);
         if (null == cateInfo) {
-            return;
+            throw new BusinessCheckException("该商品不存在");
         }
-
         cateInfo.setStatus(StatusEnum.DISABLE.getKey());
         cateInfo.setUpdateTime(new Date());
-
         mtGoodsMapper.updateById(cateInfo);
     }
 

fuint-application/src/main/java/com/fuint/common/service/impl/OpenGiftServiceImpl.java

@@ -170,40 +170,40 @@ public class OpenGiftServiceImpl extends ServiceImpl<MtOpenGiftMapper, MtOpenGif
     @Transactional(rollbackFor = Exception.class)
     @OperationServiceLog(description = "更新开卡赠礼")
     public MtOpenGift updateOpenGift(MtOpenGift reqDto) throws BusinessCheckException {
-        MtOpenGift MtOpenGift = mtOpenGiftMapper.selectById(reqDto.getId());
-        if (MtOpenGift == null) {
+        MtOpenGift mtOpenGift = mtOpenGiftMapper.selectById(reqDto.getId());
+        if (mtOpenGift == null) {
             throw new BusinessCheckException("该数据状态异常");
         }
 
-        MtOpenGift.setId(reqDto.getId());
-        MtOpenGift.setUpdateTime(new Date());
+        mtOpenGift.setId(reqDto.getId());
+        mtOpenGift.setUpdateTime(new Date());
 
         if (null != reqDto.getOperator()) {
-            MtOpenGift.setOperator(reqDto.getOperator());
+            mtOpenGift.setOperator(reqDto.getOperator());
         }
 
         if (null != reqDto.getStatus()) {
-            MtOpenGift.setStatus(reqDto.getStatus());
+            mtOpenGift.setStatus(reqDto.getStatus());
         }
 
         if (null != reqDto.getCouponId()) {
-            MtOpenGift.setCouponId(reqDto.getCouponId());
+            mtOpenGift.setCouponId(reqDto.getCouponId());
         }
 
         if (null != reqDto.getGradeId()) {
-            MtOpenGift.setGradeId(reqDto.getGradeId());
+            mtOpenGift.setGradeId(reqDto.getGradeId());
         }
 
         if (null != reqDto.getPoint()) {
-            MtOpenGift.setPoint(reqDto.getPoint());
+            mtOpenGift.setPoint(reqDto.getPoint());
         }
 
         if (null != reqDto.getCouponNum()) {
-            MtOpenGift.setCouponNum(reqDto.getCouponNum());
+            mtOpenGift.setCouponNum(reqDto.getCouponNum());
         }
 
-        mtOpenGiftMapper.updateById(MtOpenGift);
-        return MtOpenGift;
+        mtOpenGiftMapper.updateById(mtOpenGift);
+        return mtOpenGift;
     }
 
     /**

fuint-application/src/main/java/com/fuint/common/service/impl/SmsTemplateServiceImpl.java

@@ -7,6 +7,7 @@ import com.fuint.common.dto.SmsTemplateDto;
 import com.fuint.common.enums.StatusEnum;
 import com.fuint.common.service.SmsTemplateService;
 import com.fuint.framework.annoation.OperationServiceLog;
+import com.fuint.framework.exception.BusinessCheckException;
 import com.fuint.framework.pagination.PaginationRequest;
 import com.fuint.framework.pagination.PaginationResponse;
 import com.fuint.repository.mapper.MtSmsTemplateMapper;
@@ -91,7 +92,7 @@ public class SmsTemplateServiceImpl extends ServiceImpl<MtSmsTemplateMapper, MtS
     @Override
     @Transactional(rollbackFor = Exception.class)
     @OperationServiceLog(description = "保存短信模板")
-    public MtSmsTemplate saveSmsTemplate(SmsTemplateDto mtSmsTemplateDto) {
+    public MtSmsTemplate saveSmsTemplate(SmsTemplateDto mtSmsTemplateDto) throws BusinessCheckException {
         MtSmsTemplate mtSmsTemplate = new MtSmsTemplate();
         mtSmsTemplate.setMerchantId(mtSmsTemplateDto.getMerchantId());
         mtSmsTemplate.setCode(mtSmsTemplateDto.getCode());
@@ -106,6 +107,11 @@ public class SmsTemplateServiceImpl extends ServiceImpl<MtSmsTemplateMapper, MtS
             mtSmsTemplate.setUpdateTime(new Date());
             mtSmsTemplateMapper.insert(mtSmsTemplate);
         } else {
+            MtSmsTemplate oldSmsTemplate = getById(mtSmsTemplateDto.getId());
+            if (oldSmsTemplate == null) {
+                throw new BusinessCheckException("该短信模板不存在");
+            }
+            mtSmsTemplate.setMerchantId(oldSmsTemplate.getMerchantId());
             mtSmsTemplate.setId(mtSmsTemplateDto.getId());
             mtSmsTemplate.setUpdateTime(new Date());
             this.updateById(mtSmsTemplate);

fuint-application/src/main/java/com/fuint/common/service/impl/StaffServiceImpl.java

@@ -121,6 +121,7 @@ public class StaffServiceImpl extends ServiceImpl<MtStaffMapper, MtStaff> implem
      * 保存员工信息
      *
      * @param  mtStaff
+     * @return
      * @throws BusinessCheckException
      */
     @Override
@@ -137,10 +138,11 @@ public class StaffServiceImpl extends ServiceImpl<MtStaffMapper, MtStaff> implem
             this.save(mtStaff);
         } else {
             Integer id = mtStaff.getId();
-            MtStaff mtStaffTemp = mtStaffMapper.selectById(id);
-            if (mtStaffTemp.getAuditedStatus().equals(StatusEnum.ENABLED.getKey())) {
+            MtStaff mtStaffOld = mtStaffMapper.selectById(id);
+            if (mtStaffOld.getAuditedStatus().equals(StatusEnum.ENABLED.getKey())) {
                 mtStaff.setAuditedTime(new Date());
             }
+            mtStaff.setMerchantId(mtStaffOld.getMerchantId());
         }
 
         MtUser mtUser = null;
@@ -245,7 +247,7 @@ public class StaffServiceImpl extends ServiceImpl<MtStaffMapper, MtStaff> implem
     /**
      * 根据会员ID获取员工信息
      *
-     * @param userId 会员ID
+     * @param  userId 会员ID
      * @throws BusinessCheckException
      */
     @Override

fuint-application/src/main/java/com/fuint/common/service/impl/UserGradeServiceImpl.java

@@ -149,6 +149,7 @@ public class UserGradeServiceImpl extends ServiceImpl<MtUserGradeMapper, MtUserG
         }
         MtUserGrade userGrade = mtUserGradeMapper.selectById(mtUserGrade.getId());
         if (null != userGrade) {
+            mtUserGrade.setMerchantId(userGrade.getMerchantId());
             mtUserGradeMapper.updateById(mtUserGrade);
         }
         return mtUserGrade;

fuint-application/src/main/java/com/fuint/module/backendApi/controller/BackendGoodsController.java

@@ -182,13 +182,8 @@ public class BackendGoodsController extends BaseController {
         if (accountInfo == null) {
             return getFailureResult(1001, "请先登录");
         }
-        try {
-            String operator = accountInfo.getAccountName();
-            goodsService.deleteGoods(id, operator);
-        } catch (BusinessCheckException e) {
-            return getFailureResult(201, e.getMessage() == null ? "删除失败" : e.getMessage());
-        }
-
+        String operator = accountInfo.getAccountName();
+        goodsService.deleteGoods(id, operator);
         return getSuccessResult(true);
     }
 

fuint-application/src/main/java/com/fuint/module/backendApi/controller/BackendStaffController.java

@@ -47,7 +47,7 @@ public class BackendStaffController extends BaseController {
     /**
      * 获取员工列表
      *
-     * @param request HttpServletRequest对象
+     * @param  request HttpServletRequest对象
      * @return 员工列表页面
      */
     @ApiOperation(value = "获取员工列表")

fuint-application/src/main/java/com/fuint/module/backendApi/controller/BackendUserGradeController.java

@@ -205,43 +205,43 @@ public class BackendUserGradeController extends BaseController {
         if (!CommonUtil.isNumeric(speedPoint) || Integer.parseInt(speedPoint) < 0) {
             return getFailureResult(201, "积分加速必须为正整数");
         }
-        MtUserGrade info;
+        MtUserGrade mtUserGrade;
         if (StringUtil.isEmpty(id)) {
-            info = new MtUserGrade();
+            mtUserGrade = new MtUserGrade();
         } else {
-            info = userGradeService.queryUserGradeById(accountInfo.getMerchantId(), Integer.parseInt(id), 0);
+            mtUserGrade = userGradeService.queryUserGradeById(accountInfo.getMerchantId(), Integer.parseInt(id), 0);
         }
 
-        info.setGrade(Integer.parseInt(grade));
-        info.setName(name);
-        info.setMerchantId(accountInfo.getMerchantId());
+        mtUserGrade.setGrade(Integer.parseInt(grade));
+        mtUserGrade.setName(name);
+        mtUserGrade.setMerchantId(accountInfo.getMerchantId());
         if (StringUtil.isNotEmpty(catchType)) {
-            info.setCatchType(catchType);
+            mtUserGrade.setCatchType(catchType);
         }
         if (StringUtil.isNotEmpty(condition)) {
-            info.setCatchCondition(condition);
+            mtUserGrade.setCatchCondition(condition);
         }
         if (StringUtil.isNotEmpty(privilege)) {
-            info.setUserPrivilege(privilege);
+            mtUserGrade.setUserPrivilege(privilege);
         }
         if (StringUtil.isNotEmpty(catchValue)) {
-            info.setCatchValue(new BigDecimal(catchValue));
+            mtUserGrade.setCatchValue(new BigDecimal(catchValue));
         }
         if (StringUtil.isNotEmpty(validDay)) {
-            info.setValidDay(Integer.parseInt(validDay));
+            mtUserGrade.setValidDay(Integer.parseInt(validDay));
         }
         if (StringUtil.isNotEmpty(discount)) {
-            info.setDiscount(Float.parseFloat(discount));
+            mtUserGrade.setDiscount(Float.parseFloat(discount));
         }
         if (StringUtil.isNotEmpty(speedPoint)) {
-            info.setSpeedPoint(Float.parseFloat(speedPoint));
+            mtUserGrade.setSpeedPoint(Float.parseFloat(speedPoint));
         }
-        info.setStatus(status);
+        mtUserGrade.setStatus(status);
         if (StringUtil.isEmpty(id)) {
-            userGradeService.addUserGrade(info);
+            userGradeService.addUserGrade(mtUserGrade);
         } else {
-            info.setId(Integer.parseInt(id));
-            userGradeService.updateUserGrade(info);
+            mtUserGrade.setId(Integer.parseInt(id));
+            userGradeService.updateUserGrade(mtUserGrade);
         }
         return getSuccessResult(true);
     }