门店基础信息 审核续签合同

alien-entity/src/main/java/shop/alien/entity/store/StoreImg.java

@@ -30,7 +30,7 @@ public class StoreImg extends Model<StoreImg> {
     @TableField("store_id")
     private Integer storeId;
 
-    @ApiModelProperty(value = "图片类型, 0:其他, 1:入口图, 2:相册, 3:菜品, 4:环境, 5:价目表, 6:推荐菜, 7:菜单, 8:用户评论, 9:商家申诉,10:商家头像,11:店铺轮播图,12:联名卡图片,13:动态折扣, 14:套餐图片,15：合同照片,17:打卡广场小人图片 18: 商品发布图片")
+    @ApiModelProperty(value = "图片类型, 0:其他, 1:入口图, 2:相册, 3:菜品, 4:环境, 5:价目表, 6:推荐菜, 7:菜单, 8:用户评论, 9:商家申诉,10:商家头像,11:店铺轮播图,12:联名卡图片,13:动态折扣, 14:套餐图片,15：合同照片,17:打卡广场小人图片 18: 商品发布图片 19:二手商品与用户举报图片，20头图单图模式，21头图多图模式 , 22续签合同")
     @TableField("img_type")
     private Integer imgType;
 

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

@@ -14,6 +14,7 @@ import shop.alien.entity.store.StoreInfo;
 import shop.alien.entity.store.StoreInfoDraft;
 import shop.alien.entity.store.dto.StoreInfoDto;
 import shop.alien.entity.store.vo.*;
+import shop.alien.mapper.StoreImgMapper;
 import shop.alien.store.service.StoreInfoService;
 
 import java.io.IOException;
@@ -38,6 +39,8 @@ public class StoreInfoController {
 
     private final StoreInfoService storeInfoService;
 
+    private final StoreImgMapper storeImgMapper;
+
     @ApiOperation("获取所有门店")
     @ApiOperationSupport(order = 1)
     @GetMapping("/getAll")
@@ -567,11 +570,26 @@ public class StoreInfoController {
         if (storeInfo != null) {
             if (renewContractStatus == 3) {
                 storeInfo.setContractReason(contractReason);
+                storeInfo.setRenewContractStatus(renewContractStatus);
+                storeInfo.setContractReason(contractReason);
+                boolean flag = storeInfoService.updateById(storeInfo);
+                if (flag) {
+                    return R.success("拒绝审核成功");
+                } else {
+                    return R.fail("拒绝审核失败");
+                }
             }
             storeInfo.setRenewContractStatus(renewContractStatus);
+            storeInfo.setContractReason(contractReason);
             boolean flag = storeInfoService.updateById(storeInfo);
             if (flag) {
-                return R.success("审核成功");
+                //审核通过后删除原店铺合同 续签合同类型变为合同
+                int num = storeInfoService.conversionContract(id);
+                if (num > 0) {
+                    return R.success("审核通过成功");
+                } else {
+                    return R.fail("审核通过失败");
+                }
             }
         }
         return R.fail("审核失败 店铺不存在");

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

@@ -255,4 +255,10 @@ public interface StoreInfoService extends IService<StoreInfo> {
     Map<String,Object> getStoreContractStatus(int id);
     int updateStoreImgModeInfo(StoreImgInfoVo storeImgInfoVo);
 
+
+    /**
+     * 审核通过续签合同转为正常合同删除之前合同
+     *
+     */
+    int conversionContract(int id);
 }

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

@@ -206,8 +206,10 @@ public class StoreInfoServiceImpl extends ServiceImpl<StoreInfoMapper, StoreInfo
         //存入门店地址
         storeMainInfoVo.setStoreAddress(storeInfo.getStoreAddress());
         //经营种类
-        String[] strings = storeInfo.getBusinessTypes().split(",");
-        storeMainInfoVo.setBusinessTypesList(Arrays.stream(strings).collect(Collectors.toList()));
+        if(storeInfo.getBusinessTypes()!=null){
+            String[] strings = storeInfo.getBusinessTypes().split(",");
+            storeMainInfoVo.setBusinessTypesList(Arrays.stream(strings).collect(Collectors.toList()));
+        }
         //门店标签
         storeMainInfoVo.setStoreLabel(storeLabelMapper.selectOne(new LambdaQueryWrapper<StoreLabel>().eq(StoreLabel::getStoreId, id)));
         //营业时间
@@ -1517,8 +1519,6 @@ public class StoreInfoServiceImpl extends ServiceImpl<StoreInfoMapper, StoreInfo
             if (storeInfodto.getId() != null) {
                 //效验当前店铺存在未完成的订单及正在销售的商品
                 verificationStoreInfoStatus(storeInfodto);
-                if (storeInfodto.getBusinessStatus() == 0) {
-
                     StoreInfo storeInfoOne = storeInfoMapper.selectOne(new LambdaQueryWrapper<StoreInfo>().eq(StoreInfo::getId, storeInfodto.getId()));
                     if (storeInfoOne.getBusinessStatus() == 99) {
                         throw new RuntimeException("该店铺已经永久关闭不能更改状态为正常营业");
@@ -1574,7 +1574,6 @@ public class StoreInfoServiceImpl extends ServiceImpl<StoreInfoMapper, StoreInfo
                     } else {
                         throw new RuntimeException("修改失败");
                     }
-                }
 
             } else {
                 StoreInfo storeInfoOne = new StoreInfo();
@@ -1646,19 +1645,19 @@ public class StoreInfoServiceImpl extends ServiceImpl<StoreInfoMapper, StoreInfo
             StoreImg storeImg = new StoreImg();
             storeImg.setStoreId(renewContract.getStoreId());
             storeImg.setImgType(22);
-            storeImg.setImgSort(0);
+            storeImg.setImgSort(renewContract.getImgSort());
             storeImg.setImgDescription("续签合同图片");
             storeImg.setImgUrl(renewContract.getImgUrl());
             storeImg.setCreatedUserId(renewContract.getCreatedUserId());
             num = storeImgMapper.insert(storeImg);
-            if(num>0){
-                Optional<Integer> storeId = storeImgList.stream().map(StoreImg::getStoreId).findFirst();
-                int value = storeId.orElse(0);
-                StoreInfo storeInfo = new StoreInfo();
-                storeInfo.setRenewContractStatus(2);
-                storeInfo.setId(value);
-                storeInfoMapper.updateById(storeInfo);
-            }
+        }
+        if(num>0){
+            Optional<Integer> storeId = storeImgList.stream().map(StoreImg::getStoreId).findFirst();
+            int value = storeId.orElse(0);
+            StoreInfo storeInfo = new StoreInfo();
+            storeInfo.setRenewContractStatus(2);
+            storeInfo.setId(value);
+            storeInfoMapper.updateById(storeInfo);
         }
             return num;
     }
@@ -1688,6 +1687,22 @@ public class StoreInfoServiceImpl extends ServiceImpl<StoreInfoMapper, StoreInfo
         return map;
     }
 
+    @Override
+    public int conversionContract(int id) {
+        //删除原合同照片
+        LambdaQueryWrapper<StoreImg> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+        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<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);
+        return num;
+    }
+
     void verificationStoreInfoStatus(StoreInfoDto storeInfo) {
         //营业状态 0:正常营业, 1:暂停营业, 2:筹建中, 99:永久关门
          if (storeInfo.getBusinessStatus() == 2 || storeInfo.getBusinessStatus() == 99) {