轮播图提交到本地先！

leromro-core/src/main/java/com/leromro/core/controller/LSlideshowController.java

@@ -83,13 +83,13 @@ public class LSlideshowController extends BaseController
     /**
      * 新增主页轮播图或后续其他广告图片
      */
-    @ApiOperation("web新增主页轮播图图片，传入图片 前端分割")
+    @ApiOperation("web新增主页轮播图图文")
     /*@PreAuthorize("@ss.hasPermi('core:slideshow:add')")*/
     @Log(title = "主页轮播图或后续其他广告图片", businessType = BusinessType.INSERT)
     @PutMapping
-    public AjaxResult add(@RequestBody Slideshow slideshow)
+    public R add(@RequestBody Slideshow slideshow)
     {
-        return toAjax(lSlideshowService.save(slideshow));
+        return lSlideshowService.createSlideshow(slideshow);
     }
 
     /**
@@ -116,4 +116,16 @@ public class LSlideshowController extends BaseController
     {
         return R.ok(lSlideshowService.deleteLSlideshowBySlideshowIds(slideshowIds));
     }
+
+    /**
+     * 删除主页轮播图或后续其他广告图片
+     */
+    @ApiOperation("启用禁用轮播图文 传入要启用的对象")
+ //   @PreAuthorize("@ss.hasPermi('core:slideshow:remove')")
+    @Log(title = "启用禁用轮播图文", businessType = BusinessType.UPDATE)
+	@PostMapping("/startUsingSlideshow")
+    public R<Integer> StartUsingSlideshow(@RequestBody Slideshow slideshow)
+    {
+        return lSlideshowService.StartUsingSlideshow(slideshow);
+    }
 }

leromro-core/src/main/java/com/leromro/core/domain/Slideshow.java

@@ -42,7 +42,11 @@ public class Slideshow extends BaseEntity
     /** 图片字符串拼接起来 */
     @TableField("area_id")
     @ApiModelProperty("所属区域id")
-    private String areaId;
+    private Long areaId;
+    /** 状态，0 禁用  1 启用 */
+    @TableField("status")
+    @ApiModelProperty("状态，0 禁用  1 启用")
+    private String status;
 
     /** 图片字符串拼接起来 */
     @TableField("slideshow_type")

leromro-core/src/main/java/com/leromro/core/domain/dto/VolunteerInfoDTO.java

@@ -40,11 +40,11 @@ public class VolunteerInfoDTO  {
     @ApiModelProperty(value = "身份证号")
     private String idCard;
 
-    @NotNull(message = "志愿者姓名不能为空")
+    @NotNull(message = "身份证人像面照片不能为空")
     @ApiModelProperty(value = "身份证人像面照片")
     private String idCardPictureFront;
 
-    @NotNull(message = "志愿者姓名不能为空")
+    @NotNull(message = "身份证国徽面照片不能为空")
     @ApiModelProperty(value = "身份证国徽面照片")
     private String idCardPictureBack;
 
@@ -54,16 +54,13 @@ public class VolunteerInfoDTO  {
     @ApiModelProperty(value = "大类别")
     private Long serviceCategory;
 
-
     @ApiModelProperty(value = "技能描述")
     private String skillDescribe;
 
-
-    @NotNull(message = "志愿者姓名不能为空")
+    @NotNull(message = "志愿者联系电话不能为空")
     @ApiModelProperty(value = "联系电话")
     private String phonenumber;
 
-
     @NotNull(message = "志愿者性别不能为空")
     @ApiModelProperty(value = "性别 0女 1男")
     private Integer sex;
@@ -114,10 +111,12 @@ public class VolunteerInfoDTO  {
     @JsonSerialize(using = BigDecimalSerializer.class)
     private BigDecimal businessPrice;
 
+    @NotNull(message = "志愿者设置的预计服务时长不能为空")
     @ApiModelProperty("业务时长(整数分钟)")
     private Integer businessDuration;
 
     @TableField("min_quantity")
+    @NotNull(message = "服务的最少购买数量不能为空")
     @ApiModelProperty("最少购买数量")
     private Long minQuantity;
 

leromro-core/src/main/java/com/leromro/core/service/ILSlideshowService.java

@@ -2,6 +2,7 @@ package com.leromro.core.service;
 
 import java.util.List;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.leromro.common.core.domain.R;
 import com.leromro.core.domain.Slideshow;
 
 /**
@@ -59,4 +60,8 @@ public interface ILSlideshowService extends IService<Slideshow>
      * @return 结果
      */
     public int deleteLSlideshowBySlideshowId(Long slideshowId);
+
+    R createSlideshow(Slideshow slideshow);
+
+    R StartUsingSlideshow(Slideshow slideshow);
 }

leromro-core/src/main/java/com/leromro/core/service/impl/LSlideshowServiceImpl.java

@@ -1,11 +1,18 @@
 package com.leromro.core.service.impl;
 
 import java.util.List;
+import java.util.Objects;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.leromro.common.constant.CommonConstants;
 import com.leromro.common.core.domain.ListPermission;
+import com.leromro.common.core.domain.R;
 import com.leromro.common.core.domain.entity.SysUser;
+import com.leromro.common.utils.SecurityUtils;
 import com.leromro.core.mapper.LSlideshowMapper;
+import com.leromro.system.service.impl.SysUserServiceImpl;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.leromro.core.domain.Slideshow;
@@ -22,6 +29,9 @@ public class LSlideshowServiceImpl extends ServiceImpl<LSlideshowMapper, Slidesh
 {
     @Autowired
     private LSlideshowMapper lSlideshowMapper;
+    @Autowired
+    private SysUserServiceImpl sysUserService;
+
 
     /**
      * 查询主页轮播图或后续其他广告图片
@@ -100,4 +110,48 @@ public class LSlideshowServiceImpl extends ServiceImpl<LSlideshowMapper, Slidesh
     {
         return lSlideshowMapper.deleteLSlideshowBySlideshowId(slideshowId);
     }
+
+    /**
+     * @param slideshow
+     * @return
+     */
+    @Override
+    public R createSlideshow(Slideshow slideshow) {
+        //传入的数据，默认都是不启用。
+        slideshow.setStatus("0");
+        //根据登录账号的区域公司的id 获取到区域公司的位置，把这个区域公司的代码填入轮播图文的地区代码。
+
+        if (!Objects.equals(SecurityUtils.getAreaType(), "0")){
+            SysUser sysUser = sysUserService.getOne(new LambdaQueryWrapper<SysUser>().eq(SysUser::getUserId, SecurityUtils.getUserId()));
+            slideshow.setProvinceName(sysUser.getProvinceName());
+            slideshow.setProvinceCode(sysUser.getProvinceCode());
+            slideshow.setCityName(sysUser.getCityName());
+            slideshow.setCityCode(sysUser.getCityCode());
+            slideshow.setDistrictName(sysUser.getDistrictName());
+            slideshow.setDistrictCode(sysUser.getDistrictCode());
+            slideshow.setAreaId(sysUser.getDeptId());
+        }
+        return R.ok(this.save(slideshow));
+    }
+
+    /**
+     * @param slideshow
+     * @return
+     */
+    @Override
+    public R StartUsingSlideshow(Slideshow slideshow) {
+        if (Objects.equals(slideshow.getStatus(), "0")){
+            this.updateById(slideshow);
+            return R.ok("");
+        }else if (Objects.equals(slideshow.getStatus(), "1")){
+            //如果启用，就把所有所属的地区的状态都修改为0，然后把这个单独修改为1
+            lSlideshowMapper.update(  null, new LambdaUpdateWrapper<Slideshow>().eq(Slideshow::getDistrictCode,slideshow.getDistrictCode())
+                    .eq(Slideshow::getSlideshowType,slideshow.getSlideshowType()).set(Slideshow::getStatus,"0"));
+            this.updateById(slideshow);
+            return R.ok("启用成功");
+        }else {
+            return R.fail("操作失败,请关系总部管理员");
+        }
+    }
+
 }

leromro-core/src/main/java/com/leromro/core/service/impl/MainOrderServiceImpl.java

@@ -107,9 +107,9 @@ public class MainOrderServiceImpl extends ServiceImpl<MainOrdersMapper, MainOrde
     @Override
     @Transactional(rollbackFor = Exception.class)
     public R<OrderPaymentVO> createOrders(OrderRequestDTO orderRequest) throws Exception {
-        if (1==1) {
+      /*  if (1==1) {
             return R.fail("当前地区志愿者批量认证中,暂时关闭预约功能,请谅解");
-        }
+        }*/
         //响应数据
         OrderPaymentVO vo = new OrderPaymentVO();
         //订单信息
@@ -261,7 +261,7 @@ public class MainOrderServiceImpl extends ServiceImpl<MainOrdersMapper, MainOrde
                                 && sysDept.getAreaType().equals("3")
                 )
                 .findFirst()
-                .orElseThrow(() -> new RuntimeException("此区域公司没有收货地址区域公司"));
+                .orElseThrow(() -> new RuntimeException("此收货地址没有区域公司"));
         //在订单中设置区域公司的信息
         secondOrder.setAreaDistributionRatio(areaDept.getDistributionRatio());
         secondOrder.setAreaDistributionId(areaDept.getDeptId());