fix:招商代理调整

nightFragrance-admin/src/main/java/com/ylx/web/controller/massage/BusinessDevelopmentController.java

@@ -1,9 +1,11 @@
 package com.ylx.web.controller.massage;
 
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ylx.common.core.controller.BaseController;
+import com.ylx.common.core.domain.model.WxLoginUser;
 import com.ylx.massage.domain.BusinessDevelopment;
 import com.ylx.massage.service.BusinessDevelopmentService;
 import io.swagger.annotations.Api;
@@ -65,6 +67,15 @@ public class BusinessDevelopmentController extends BaseController {
     @PostMapping("add")
     @ApiOperation("新增数据")
     public R insert(@RequestBody BusinessDevelopment businessDevelopment) {
+
+        WxLoginUser wxLoginUser = this.getWxLoginUser();
+
+        LambdaQueryWrapper<BusinessDevelopment> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.eq(BusinessDevelopment::getOpenId, wxLoginUser.getCOpenid());
+        List<BusinessDevelopment> list = businessDevelopmentService.list(queryWrapper);
+        if (!list.isEmpty()) {
+            return R.fail("已提交过申请");
+        }
         return R.ok(this.businessDevelopmentService.save(businessDevelopment));
     }
 

nightFragrance-massage/src/main/java/com/ylx/massage/domain/BusinessDevelopment.java

@@ -1,8 +1,10 @@
 package com.ylx.massage.domain;
 
 
+import com.baomidou.mybatisplus.annotation.TableLogic;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
 import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
 
 import java.io.Serializable;
 import java.util.Date;
@@ -14,6 +16,7 @@ import java.util.Date;
  * @since 2024-07-29 16:42:48
  */
 @SuppressWarnings("serial")
+@Data
 public class BusinessDevelopment extends Model<BusinessDevelopment> {
     //id
     @ApiModelProperty("id")
@@ -33,6 +36,9 @@ public class BusinessDevelopment extends Model<BusinessDevelopment> {
     //公司名称
     @ApiModelProperty("公司名称")
     private String company;
+
+    @ApiModelProperty("openId")
+    private String openId;
     //是否从事过按摩行业(0否 ,1是)
     @ApiModelProperty("是否从事过按摩行业(0否 ,1是)")
     private Integer isMassage;
@@ -53,113 +59,12 @@ public class BusinessDevelopment extends Model<BusinessDevelopment> {
     @ApiModelProperty("系统修改时间")
     private Date updateTime;
     //是否删除0否1是
+    @TableLogic
     @ApiModelProperty("是否删除0否1是")
     private Integer isDelete;
 
 
-    public String getId() {
-        return id;
-    }
-
-    public void setId(String id) {
-        this.id = id;
-    }
-
-    public String getCity() {
-        return city;
-    }
-
-    public void setCity(String city) {
-        this.city = city;
-    }
-
-    public String getResource() {
-        return resource;
-    }
-
-    public void setResource(String resource) {
-        this.resource = resource;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public String getPhoneNum() {
-        return phoneNum;
-    }
-
-    public void setPhoneNum(String phoneNum) {
-        this.phoneNum = phoneNum;
-    }
-
-    public String getCompany() {
-        return company;
-    }
-
-    public void setCompany(String company) {
-        this.company = company;
-    }
-
-    public Integer getIsMassage() {
-        return isMassage;
-    }
 
-    public void setIsMassage(Integer isMassage) {
-        this.isMassage = isMassage;
-    }
-
-    public String getYears() {
-        return years;
-    }
-
-    public void setYears(String years) {
-        this.years = years;
-    }
-
-    public Integer getIsEntity() {
-        return isEntity;
-    }
-
-    public void setIsEntity(Integer isEntity) {
-        this.isEntity = isEntity;
-    }
-
-    public String getRemark() {
-        return remark;
-    }
-
-    public void setRemark(String remark) {
-        this.remark = remark;
-    }
-
-    public Date getCreateTime() {
-        return createTime;
-    }
-
-    public void setCreateTime(Date createTime) {
-        this.createTime = createTime;
-    }
-
-    public Date getUpdateTime() {
-        return updateTime;
-    }
-
-    public void setUpdateTime(Date updateTime) {
-        this.updateTime = updateTime;
-    }
-
-    public Integer getIsDelete() {
-        return isDelete;
-    }
-
-    public void setIsDelete(Integer isDelete) {
-        this.isDelete = isDelete;
-    }
 
     /**
      * 获取主键值

nightFragrance-massage/src/main/resources/mapper/massage/BusinessDevelopmentMapper.xml

@@ -13,6 +13,7 @@
         <result property="years" column="years" jdbcType="VARCHAR"/>
         <result property="isEntity" column="is_entity" jdbcType="INTEGER"/>
         <result property="remark" column="remark" jdbcType="VARCHAR"/>
+        <result property="openId" column="open_id" jdbcType="VARCHAR"/>
         <result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
         <result property="updateTime" column="update_time" jdbcType="TIMESTAMP"/>
         <result property="isDelete" column="is_delete" jdbcType="INTEGER"/>