门店基础信息 编辑效验回显修改

alien-store/src/main/java/shop/alien/store/controller/StoreInfoController.java

@@ -61,9 +61,17 @@ public class StoreInfoController {
     @ApiOperation("新增或修改门店")
     @ApiOperationSupport(order = 3)
     @PostMapping("/saveOrUpdate")
-    public R saveOrUpdate(@RequestBody StoreInfoDto storeInfo) {
+    public R<StoreInfo> saveOrUpdate(@RequestBody StoreInfoDto storeInfo) {
         log.info("StoreInfoController.saveOrUpdate?storeInfo={}", storeInfo);
-        return R.data(storeInfoService.saveOrUpdateStoreInfo(storeInfo));
+        try{
+            int num = storeInfoService.saveOrUpdateStoreInfo(storeInfo);
+            if (num>0) {
+                return R.fail("成功");
+            }
+            return R.fail("失败");
+        } catch (Exception e) {
+            return R.fail(e.getMessage());
+        }
     }
 
     @ApiOperation("web端新增门店")

alien-store/src/main/java/shop/alien/store/service/StoreInfoService.java

@@ -225,11 +225,11 @@ public interface StoreInfoService extends IService<StoreInfo> {
     int editStoreCommissionRate(StoreInfoDto storeInfoDto);
 
     /**
-     * 新增或修改店铺信息
+     * 门店装修 - 编辑
      * @param storeInfo
      * @return
      */
-    R saveOrUpdateStoreInfo(StoreInfoDto storeInfo);
+    int saveOrUpdateStoreInfo(StoreInfoDto storeInfo);
 
     /**
      * 商家注销店铺效验

alien-store/src/main/java/shop/alien/store/service/impl/StoreInfoServiceImpl.java

@@ -192,7 +192,7 @@ public class StoreInfoServiceImpl extends ServiceImpl<StoreInfoMapper, StoreInfo
         String expirationDate = sdf.format(storeMainInfoVo.getExpirationTime());
         storeMainInfoVo.setExpirationDate(expirationDate);
         //审核通过给前台反显未提交
-        if(storeMainInfoVo.getRenewContractStatus() == 1){
+        if (storeMainInfoVo.getRenewContractStatus() == 1) {
             storeMainInfoVo.setRenewContractStatus(0);
         }
 
@@ -207,7 +207,7 @@ public class StoreInfoServiceImpl extends ServiceImpl<StoreInfoMapper, StoreInfo
         //存入门店地址
         storeMainInfoVo.setStoreAddress(storeInfo.getStoreAddress());
         //经营种类
-        if(storeInfo.getBusinessTypes()!=null){
+        if (storeInfo.getBusinessTypes() != null) {
             String[] strings = storeInfo.getBusinessTypes().split(",");
             storeMainInfoVo.setBusinessTypesList(Arrays.stream(strings).collect(Collectors.toList()));
         }
@@ -222,7 +222,7 @@ public class StoreInfoServiceImpl extends ServiceImpl<StoreInfoMapper, StoreInfo
         //合同照片
         storeMainInfoVo.setContractList(storeImgMapper.selectList(new LambdaQueryWrapper<StoreImg>().eq(StoreImg::getImgType, 15).eq(StoreImg::getStoreId, id)));
         //是否连锁
-        String isChain = (storeInfo.getIsChain() ==0) ?"否":"是";
+        String isChain = (storeInfo.getIsChain() == 0) ? "否" : "是";
         storeMainInfoVo.setIsChainStr(isChain);
         return storeMainInfoVo;
     }
@@ -1423,12 +1423,12 @@ public class StoreInfoServiceImpl extends ServiceImpl<StoreInfoMapper, StoreInfo
     public void logoutStore(StoreInfoVo storeInfo) {
         String key = "verification_" + storeInfo.getStorePhone();
         String redisVerificationCode = baseRedisService.getString(key);
-        if(redisVerificationCode.equals(storeInfo.getVerificationCode())){
+        if (redisVerificationCode.equals(storeInfo.getVerificationCode())) {
             // 通过id获取当前店铺信息
             LambdaQueryWrapper<StoreInfo> lambdaQueryWrapper = new LambdaQueryWrapper<>();
             lambdaQueryWrapper.eq(StoreInfo::getId, storeInfo.getId());
             StoreInfo storeIn = storeInfoMapper.selectOne(lambdaQueryWrapper);
-            if(storeIn!=null){
+            if (storeIn != null) {
                 // 添加注销原因
                 storeIn.setLogoutReason(storeIn.getLogoutReason());
                 // 添加注销code
@@ -1440,7 +1440,7 @@ public class StoreInfoServiceImpl extends ServiceImpl<StoreInfoMapper, StoreInfo
                 // 更新logout_flag状态为1
                 storeIn.setLogoutFlag(1);
                 int num = storeInfoMapper.updateById(storeIn);
-                if(num>0){
+                if (num > 0) {
                     // 发送通知
                     LifeNotice lifeMessage = new LifeNotice();
                     lifeMessage.setReceiverId("store_" + storeInfo.getStorePhone());
@@ -1455,7 +1455,7 @@ public class StoreInfoServiceImpl extends ServiceImpl<StoreInfoMapper, StoreInfo
                     lifeNoticeMapper.insert(lifeMessage);
                 }
             }
-        }else{
+        } else {
             throw new RuntimeException("验证码错误");
         }
     }
@@ -1514,24 +1514,21 @@ public class StoreInfoServiceImpl extends ServiceImpl<StoreInfoMapper, StoreInfo
     }
 
     @Override
-    public R saveOrUpdateStoreInfo(StoreInfoDto storeInfodto) {
-        try {
-            boolean flag = false;
+    public int saveOrUpdateStoreInfo(StoreInfoDto storeInfodto) {
             if (storeInfodto.getId() != null) {
                 //效验当前店铺存在未完成的订单及正在销售的商品
                 verificationStoreInfoStatus(storeInfodto);
-                    StoreInfo storeInfoOne = storeInfoMapper.selectOne(new LambdaQueryWrapper<StoreInfo>().eq(StoreInfo::getId, storeInfodto.getId()));
-                    if (storeInfoOne.getBusinessStatus() == 99) {
-                        throw new RuntimeException("该店铺已经永久关闭不能更改状态为正常营业");
-                    }
+                StoreInfo storeInfoOne = storeInfoMapper.selectOne(new LambdaQueryWrapper<StoreInfo>().eq(StoreInfo::getId, storeInfodto.getId()));
+
 
-                    //获取经营板块id
-                    Integer businessSection = storeInfodto.getBusinessSection();
-                    //查询经营板块名称
-                    StoreDictionary businessSectionName = storeDictionaryMapper.selectOne(new LambdaQueryWrapper<StoreDictionary>().eq(StoreDictionary::getDictId, businessSection).eq(StoreDictionary::getTypeName, "business_section"));
-                    //查询经营种类
-                    List<String> businessTypes = storeInfodto.getBusinessTypes();
-                    List<String> businessTypeNames = new ArrayList<>();
+                //获取经营板块id
+                Integer businessSection = storeInfodto.getBusinessSection();
+                //查询经营板块名称
+                StoreDictionary businessSectionName = storeDictionaryMapper.selectOne(new LambdaQueryWrapper<StoreDictionary>().eq(StoreDictionary::getDictId, businessSection).eq(StoreDictionary::getTypeName, "business_section"));
+                //查询经营种类
+                List<String> businessTypeNames = new ArrayList<>();
+                List<String> businessTypes = storeInfodto.getBusinessTypes();
+                if (!CollectionUtils.isEmpty(businessTypes)) {
                     //获取经营种类名称
                     for (String businessType : businessTypes) {
                         StoreDictionary storeDictionary =
@@ -1541,55 +1538,53 @@ public class StoreInfoServiceImpl extends ServiceImpl<StoreInfoMapper, StoreInfo
                                                         .eq(StoreDictionary::getDictId, businessType).eq(StoreDictionary::getParentId, businessSectionName.getId()));
                         businessTypeNames.add(storeDictionary.getDictDetail());
                     }
+                }
 
-                    StoreInfo storeInfo = new StoreInfo();
-                    BeanUtils.copyProperties(storeInfodto, storeInfo);
+                StoreInfo storeInfo = new StoreInfo();
+                BeanUtils.copyProperties(storeInfodto, storeInfo);
 //
-                    //存入门店状态
-                    storeInfo.setStoreStatus(storeInfodto.getStoreStatus());
-                    //存入经纬度
-                    storeInfo.setStorePosition(storeInfodto.getStorePositionLongitude() + "," + storeInfodto.getStorePositionLatitude());
-
-                    //板块及类型
-                    storeInfo.setBusinessSection(businessSection);
-                    storeInfo.setBusinessSectionName(businessSectionName.getDictDetail());
+                //存入门店状态
+                storeInfo.setStoreStatus(storeInfodto.getStoreStatus());
+                //存入经纬度
+                storeInfo.setStorePosition(storeInfodto.getStorePositionLongitude() + "," + storeInfodto.getStorePositionLatitude());
+
+                //板块及类型
+                storeInfo.setBusinessSection(businessSection);
+                storeInfo.setBusinessSectionName(businessSectionName.getDictDetail());
+                if (!CollectionUtils.isEmpty(businessTypes) && !CollectionUtils.isEmpty(businessTypeNames)) {
                     storeInfo.setBusinessTypes(String.join(",", businessTypes));
                     storeInfo.setBusinessTypesName(String.join(",", businessTypeNames));
-                    //处理一下行政区域信息
-                    EssentialCityCode essentialCityCode1 =
-                            essentialCityCodeMapper.selectOne(new LambdaQueryWrapper<EssentialCityCode>().eq(EssentialCityCode::getAreaCode, storeInfo.getAdministrativeRegionProvinceAdcode()));
-                    storeInfo.setAdministrativeRegionProvinceName(essentialCityCode1.getAreaName());
-                    EssentialCityCode essentialCityCode2 =
-                            essentialCityCodeMapper.selectOne(new LambdaQueryWrapper<EssentialCityCode>().eq(EssentialCityCode::getAreaCode, storeInfo.getAdministrativeRegionCityAdcode()));
-                    storeInfo.setAdministrativeRegionCityName(essentialCityCode2.getAreaName());
-                    EssentialCityCode essentialCityCode3 =
-                            essentialCityCodeMapper.selectOne(new LambdaQueryWrapper<EssentialCityCode>().eq(EssentialCityCode::getAreaCode, storeInfo.getAdministrativeRegionDistrictAdcode()));
-                    storeInfo.setAdministrativeRegionDistrictName(essentialCityCode3.getAreaName());
-                    storeInfoMapper.updateById(storeInfo);
-                    nearMeService.inGeolocation(new Point(Double.parseDouble(storeInfodto.getStorePositionLongitude()),
-                            Double.parseDouble(storeInfodto.getStorePositionLatitude())), storeInfo.getId().toString(), Boolean.TRUE);
-
-                    int num = storeInfoMapper.updateById(storeInfoOne);
-                    if (num > 0) {
-                        flag = true;
-                    } else {
-                        throw new RuntimeException("修改失败");
-                    }
-
+                }
+                //处理一下行政区域信息
+                EssentialCityCode essentialCityCode1 =
+                        essentialCityCodeMapper.selectOne(new LambdaQueryWrapper<EssentialCityCode>().eq(EssentialCityCode::getAreaCode, storeInfo.getAdministrativeRegionProvinceAdcode()));
+                storeInfo.setAdministrativeRegionProvinceName(essentialCityCode1.getAreaName());
+                EssentialCityCode essentialCityCode2 =
+                        essentialCityCodeMapper.selectOne(new LambdaQueryWrapper<EssentialCityCode>().eq(EssentialCityCode::getAreaCode, storeInfo.getAdministrativeRegionCityAdcode()));
+                storeInfo.setAdministrativeRegionCityName(essentialCityCode2.getAreaName());
+                EssentialCityCode essentialCityCode3 =
+                        essentialCityCodeMapper.selectOne(new LambdaQueryWrapper<EssentialCityCode>().eq(EssentialCityCode::getAreaCode, storeInfo.getAdministrativeRegionDistrictAdcode()));
+                storeInfo.setAdministrativeRegionDistrictName(essentialCityCode3.getAreaName());
+                storeInfoMapper.updateById(storeInfo);
+                nearMeService.inGeolocation(new Point(Double.parseDouble(storeInfodto.getStorePositionLongitude()),
+                        Double.parseDouble(storeInfodto.getStorePositionLatitude())), storeInfo.getId().toString(), Boolean.TRUE);
+
+                int num = storeInfoMapper.updateById(storeInfoOne);
+                if(num>0){
+                    return num;
+                }else{
+                    return num;
+                }
             } else {
                 StoreInfo storeInfoOne = new StoreInfo();
                 BeanUtils.copyProperties(storeInfodto, storeInfoOne);
                 int num = storeInfoMapper.insert(storeInfoOne);
-                if (num > 0) {
-                    flag = true;
-                } else {
-                    throw new RuntimeException("新增失败");
+                if(num>0){
+                    return num;
+                }else{
+                    return num;
                 }
             }
-            return null;
-        } catch (Exception e) {
-            return R.fail(e.getMessage());
-        }
     }
 
     @Override
@@ -1598,29 +1593,29 @@ public class StoreInfoServiceImpl extends ServiceImpl<StoreInfoMapper, StoreInfo
         LambdaQueryWrapper<StoreInfo> queryWrapper = new LambdaQueryWrapper<>();
         queryWrapper.eq(StoreInfo::getId, id);
         StoreInfo storeInfo = storeInfoMapper.selectOne(queryWrapper);
-        if(storeInfo!=null){
+        if (storeInfo != null) {
             //判断店铺存在未体现金额 0：未通过 1：通过
             //钱包功能暂未完成此效验默认状态都是1通过
-            StoreUser storeUser = storeUserMapper.selectOne(new LambdaQueryWrapper<StoreUser>().eq(StoreUser::getStoreId,id));
-            if(storeUser.getMoney() != null && storeUser.getMoney() > 0){
-                storeInfoMap.put("storetMoneyStatus","1");
-            }else{
-                storeInfoMap.put("storetMoneyStatus","1");
+            StoreUser storeUser = storeUserMapper.selectOne(new LambdaQueryWrapper<StoreUser>().eq(StoreUser::getStoreId, id));
+            if (storeUser.getMoney() != null && storeUser.getMoney() > 0) {
+                storeInfoMap.put("storetMoneyStatus", "1");
+            } else {
+                storeInfoMap.put("storetMoneyStatus", "1");
             }
             //判断店铺存在未完成订单 0：未通过 1：通过
             List<LifeUserOrder> lifeUserOrders = lifeUserOrderMapper.selectList(new LambdaQueryWrapper<LifeUserOrder>().in(LifeUserOrder::getStatus, 0, 3).eq(LifeUserOrder::getStoreId, id).eq(LifeUserOrder::getDeleteFlag, 0));
-            if(!CollectionUtils.isEmpty(lifeUserOrders)){
-                storeInfoMap.put("storeOrderStatus","0");
-            }else{
-                storeInfoMap.put("storeOrderStatus","1");
+            if (!CollectionUtils.isEmpty(lifeUserOrders)) {
+                storeInfoMap.put("storeOrderStatus", "0");
+            } else {
+                storeInfoMap.put("storeOrderStatus", "1");
             }
             //判断店铺存在正在售卖的商品 0：未通过 1：通过
             List<LifeCoupon> lifeCoupons = lifeCouponMapper.selectList(new LambdaQueryWrapper<LifeCoupon>().in(LifeCoupon::getStatus, 0, 1)
                     .and(qw -> qw.gt(LifeCoupon::getStockQty, 0).or().gt(LifeCoupon::getSingleQty, 0)).eq(LifeCoupon::getStoreId, id).eq(LifeCoupon::getDeleteFlag, 0));
-            if(!CollectionUtils.isEmpty(lifeCoupons)){
-                storeInfoMap.put("storeGoodsStatus","0");
-            }else{
-                storeInfoMap.put("storeGoodsStatus","1");
+            if (!CollectionUtils.isEmpty(lifeCoupons)) {
+                storeInfoMap.put("storeGoodsStatus", "0");
+            } else {
+                storeInfoMap.put("storeGoodsStatus", "1");
             }
         }
         return storeInfoMap;
@@ -1631,11 +1626,11 @@ public class StoreInfoServiceImpl extends ServiceImpl<StoreInfoMapper, StoreInfo
         LambdaQueryWrapper<StoreInfo> queryWrapper = new LambdaQueryWrapper<>();
         queryWrapper.eq(StoreInfo::getId, id);
         StoreInfo storeInfo = storeInfoMapper.selectOne(queryWrapper);
-        if(storeInfo!=null && storeInfo.getBusinessStatus() == -1){
-           int num = storeInfoMapper.deleteById(id);
-           if(num<=0){
-               throw new RuntimeException("删除失败");
-           }
+        if (storeInfo != null && storeInfo.getBusinessStatus() == -1) {
+            int num = storeInfoMapper.deleteById(id);
+            if (num <= 0) {
+                throw new RuntimeException("删除失败");
+            }
         }
     }
 
@@ -1652,7 +1647,7 @@ public class StoreInfoServiceImpl extends ServiceImpl<StoreInfoMapper, StoreInfo
             storeImg.setCreatedUserId(renewContract.getCreatedUserId());
             num = storeImgMapper.insert(storeImg);
         }
-        if(num>0){
+        if (num > 0) {
             Optional<Integer> storeId = storeImgList.stream().map(StoreImg::getStoreId).findFirst();
             int value = storeId.orElse(0);
             StoreInfo storeInfo = new StoreInfo();
@@ -1660,30 +1655,30 @@ public class StoreInfoServiceImpl extends ServiceImpl<StoreInfoMapper, StoreInfo
             storeInfo.setId(value);
             storeInfoMapper.updateById(storeInfo);
         }
-            return num;
+        return num;
     }
 
     @Override
     public Map<String, Object> getStoreContractStatus(int id) {
         Map<String, Object> map = new HashMap<>();
-        StoreInfo storeInfo = storeInfoMapper.selectOne(new LambdaQueryWrapper<StoreInfo>().eq(StoreInfo::getId,id));
+        StoreInfo storeInfo = storeInfoMapper.selectOne(new LambdaQueryWrapper<StoreInfo>().eq(StoreInfo::getId, id));
         //审核通过给前台反显未提交
-        if(storeInfo.getRenewContractStatus() == 1){
-            map.put("renewContractStatus",0);
-        }else{
-            map.put("renewContractStatus",storeInfo.getRenewContractStatus());
+        if (storeInfo.getRenewContractStatus() == 1) {
+            map.put("renewContractStatus", 0);
+        } else {
+            map.put("renewContractStatus", storeInfo.getRenewContractStatus());
         }
         //续签合同照片列表
         List<StoreImg> storeImgList = storeImgMapper.selectList(new LambdaQueryWrapper<StoreImg>().eq(StoreImg::getImgType, 22).eq(StoreImg::getStoreId, id));
-        if(!CollectionUtils.isEmpty(storeImgList)){
-            map.put("contractImgList",storeImgList);
-        }else{
-            map.put("contractImgList","");
+        if (!CollectionUtils.isEmpty(storeImgList)) {
+            map.put("contractImgList", storeImgList);
+        } else {
+            map.put("contractImgList", "");
         }
-        if(storeInfo.getContractReason()!=null){
-            map.put("contractReason",storeInfo.getContractReason());
-        }else{
-            map.put("contractReason","");
+        if (storeInfo.getContractReason() != null) {
+            map.put("contractReason", storeInfo.getContractReason());
+        } else {
+            map.put("contractReason", "");
         }
         return map;
     }
@@ -1692,21 +1687,21 @@ public class StoreInfoServiceImpl extends ServiceImpl<StoreInfoMapper, StoreInfo
     public int conversionContract(int id) {
         //删除原合同照片
         LambdaQueryWrapper<StoreImg> lambdaQueryWrapper = new LambdaQueryWrapper<>();
-        lambdaQueryWrapper.eq(StoreImg::getStoreId,id);
-        lambdaQueryWrapper.eq(StoreImg::getImgType,15);
+        lambdaQueryWrapper.eq(StoreImg::getStoreId, id);
+        lambdaQueryWrapper.eq(StoreImg::getImgType, 15);
         storeImgMapper.delete(lambdaQueryWrapper);
         //修改续签合同类型为合同类型
-        List<StoreImg> storeImgList = storeImgMapper.selectList(new LambdaQueryWrapper<StoreImg>().eq(StoreImg::getStoreId,id).eq(StoreImg::getImgType,22));
+        List<StoreImg> storeImgList = storeImgMapper.selectList(new LambdaQueryWrapper<StoreImg>().eq(StoreImg::getStoreId, id).eq(StoreImg::getImgType, 22));
         List<Integer> imgList = storeImgList.stream().map(StoreImg::getId).collect(Collectors.toList());
         LambdaUpdateWrapper<StoreImg> lambdaUpdateWrapper = new LambdaUpdateWrapper();
-        lambdaUpdateWrapper.in(StoreImg::getId,imgList).set(StoreImg::getImgType,15);
-        int num = storeImgMapper.update(null,lambdaUpdateWrapper);
+        lambdaUpdateWrapper.in(StoreImg::getId, imgList).set(StoreImg::getImgType, 15);
+        int num = storeImgMapper.update(null, lambdaUpdateWrapper);
         return num;
     }
 
     void verificationStoreInfoStatus(StoreInfoDto storeInfo) {
         //营业状态 0:正常营业, 1:暂停营业, 2:筹建中, 99:永久关门
-         if (storeInfo.getBusinessStatus() == 2 || storeInfo.getBusinessStatus() == 99) {
+        if (storeInfo.getBusinessStatus() == 2 || storeInfo.getBusinessStatus() == 99) {
             //判断店铺有未完成的订单
             List<LifeUserOrder> lifeUserOrders = lifeUserOrderMapper.selectList(new LambdaQueryWrapper<LifeUserOrder>().in(LifeUserOrder::getStatus, 0, 3).eq(LifeUserOrder::getStoreId, storeInfo.getId()).eq(LifeUserOrder::getDeleteFlag, 0));
             if (!CollectionUtils.isEmpty(lifeUserOrders)) {
@@ -1723,7 +1718,7 @@ public class StoreInfoServiceImpl extends ServiceImpl<StoreInfoMapper, StoreInfo
 
     public int updateStoreImgModeInfo(StoreImgInfoVo storeImgInfoVo) {
         int result = 0;
-        if (storeImgInfoVo !=null) {
+        if (storeImgInfoVo != null) {
             // 校验必要参数是否为null
             if (storeImgInfoVo.getStoreId() == null || storeImgInfoVo.getImgMode() == null) {
                 return result;
@@ -1733,7 +1728,7 @@ public class StoreInfoServiceImpl extends ServiceImpl<StoreInfoMapper, StoreInfo
                 LambdaUpdateWrapper<StoreInfo> wrapper = new LambdaUpdateWrapper<>();
                 wrapper.eq(StoreInfo::getId, storeImgInfoVo.getStoreId());
                 wrapper.set(StoreInfo::getImgMode, storeImgInfoVo.getImgMode());
-                result =  storeInfoMapper.update(null, wrapper);
+                result = storeInfoMapper.update(null, wrapper);
             }
         }
         return result;