修复代码

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/msgDistributor/controller/MsgDistributorController.java

@@ -39,7 +39,7 @@ import org.jeecg.common.aspect.annotation.AutoLog;
  /**
  * @Description: 分销商入驻
  * @Author: jeecg-boot
- * @Date:   2024-06-18
+ * @Date:   2024-11-18
  * @Version: V1.0
  */
 @Api(tags="分销商入驻")

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/msgDistributor/entity/MsgDistributor.java

@@ -20,7 +20,7 @@ import lombok.experimental.Accessors;
 /**
  * @Description: 分销商入驻
  * @Author: jeecg-boot
- * @Date:   2024-06-18
+ * @Date:   2024-11-18
  * @Version: V1.0
  */
 @Data
@@ -54,9 +54,9 @@ public class MsgDistributor implements Serializable {
 	/**所属部门*/
     @ApiModelProperty(value = "所属部门")
     private java.lang.String sysOrgCode;
-	/**照片*/
-	@Excel(name = "照片", width = 15)
-    @ApiModelProperty(value = "照片")
+	/**营业执照*/
+	@Excel(name = "营业执照", width = 15)
+    @ApiModelProperty(value = "营业执照")
     private java.lang.String image;
 	/**联系电话*/
 	@Excel(name = "联系电话", width = 15)
@@ -83,4 +83,9 @@ public class MsgDistributor implements Serializable {
 	@Dict(dictTable = "han_hai_member", dicText = "nick_name", dicCode = "id")
     @ApiModelProperty(value = "关联用户")
     private java.lang.String userId;
+	/**审核状态*/
+	@Excel(name = "审核状态", width = 15, dicCode = "open_state")
+	@Dict(dicCode = "open_state")
+    @ApiModelProperty(value = "审核状态")
+    private java.lang.Integer state;
 }

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/msgDistributor/mapper/MsgDistributorMapper.java

@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 /**
  * @Description: 分销商入驻
  * @Author: jeecg-boot
- * @Date:   2024-06-18
+ * @Date:   2024-11-18
  * @Version: V1.0
  */
 public interface MsgDistributorMapper extends BaseMapper<MsgDistributor> {

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/msgDistributor/service/IMsgDistributorService.java

@@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
 /**
  * @Description: 分销商入驻
  * @Author: jeecg-boot
- * @Date:   2024-06-18
+ * @Date:   2024-11-18
  * @Version: V1.0
  */
 public interface IMsgDistributorService extends IService<MsgDistributor> {

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/msgDistributor/service/impl/MsgDistributorServiceImpl.java

@@ -10,7 +10,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 /**
  * @Description: 分销商入驻
  * @Author: jeecg-boot
- * @Date:   2024-06-18
+ * @Date:   2024-11-18
  * @Version: V1.0
  */
 @Service

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/msgDistributor/vue/MsgDistributorList.vue

@@ -123,7 +123,7 @@
             }
           },
           {
-            title:'照片',
+            title:'营业执照',
             align:"center",
             dataIndex: 'image'
           },
@@ -157,6 +157,11 @@
             align:"center",
             dataIndex: 'userId_dictText'
           },
+          {
+            title:'审核状态',
+            align:"center",
+            dataIndex: 'state_dictText'
+          },
           {
             title: '操作',
             dataIndex: 'action',
@@ -191,13 +196,14 @@
       },
       getSuperFieldList(){
         let fieldList=[];
-        fieldList.push({type:'Text',value:'image',text:'照片',dictCode:''})
+        fieldList.push({type:'Text',value:'image',text:'营业执照',dictCode:''})
         fieldList.push({type:'string',value:'phone',text:'联系电话',dictCode:''})
         fieldList.push({type:'string',value:'city',text:'意向城市',dictCode:''})
         fieldList.push({type:'string',value:'sex',text:'性别',dictCode:''})
         fieldList.push({type:'string',value:'name',text:'姓名',dictCode:''})
         fieldList.push({type:'string',value:'age',text:'年龄',dictCode:''})
         fieldList.push({type:'sel_search',value:'userId',text:'关联用户',dictTable:"han_hai_member", dictText:'nick_name', dictCode:'id'})
+        fieldList.push({type:'int',value:'state',text:'审核状态',dictCode:'open_state'})
         this.superFieldList = fieldList
       }
     }

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/msgDistributor/vue/modules/MsgDistributorForm.vue

@@ -4,8 +4,8 @@
       <a-form-model ref="form" :model="model" :rules="validatorRules" slot="detail">
         <a-row>
           <a-col :span="24">
-            <a-form-model-item label="照片" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="image">
-              <a-textarea v-model="model.image" rows="4" placeholder="请输入照片" />
+            <a-form-model-item label="营业执照" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="image">
+              <a-textarea v-model="model.image" rows="4" placeholder="请输入营业执照" />
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
@@ -38,6 +38,11 @@
               <j-search-select-tag v-model="model.userId" dict="han_hai_member,nick_name,id"  />
             </a-form-model-item>
           </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="审核状态" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="state">
+              <j-dict-select-tag type="list" v-model="model.state" dictCode="open_state" placeholder="请选择审核状态" />
+            </a-form-model-item>
+          </a-col>
         </a-row>
       </a-form-model>
     </j-form-container>

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/msgDistributor/vue3/MsgDistributor.data.ts

@@ -5,7 +5,7 @@ import { render } from '/@/utils/common/renderUtils';
 //列表数据
 export const columns: BasicColumn[] = [
     {
-    title: '照片',
+    title: '营业执照',
     align:"center",
     dataIndex: 'image'
    },
@@ -39,6 +39,11 @@ export const columns: BasicColumn[] = [
     align:"center",
     dataIndex: 'userId_dictText'
    },
+   {
+    title: '审核状态',
+    align:"center",
+    dataIndex: 'state_dictText'
+   },
 ];
 //查询数据
 export const searchFormSchema: FormSchema[] = [
@@ -46,7 +51,7 @@ export const searchFormSchema: FormSchema[] = [
 //表单数据
 export const formSchema: FormSchema[] = [
   {
-    label: '照片',
+    label: '营业执照',
     field: 'image',
     component: 'InputTextArea',//TODO 注意string转换问题
   },
@@ -83,4 +88,12 @@ export const formSchema: FormSchema[] = [
        dict:"han_hai_member,nick_name,id"
     },
   },
+  {
+    label: '审核状态',
+    field: 'state',
+    component: 'JDictSelectTag',
+    componentProps:{
+        dictCode:"open_state"
+     },
+  },
 ];

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/msgTechnician/controller/MsgTechnicianController.java

@@ -39,7 +39,7 @@ import org.jeecg.common.aspect.annotation.AutoLog;
  /**
  * @Description: 技师表
  * @Author: jeecg-boot
- * @Date:   2024-08-10
+ * @Date:   2024-11-18
  * @Version: V1.0
  */
 @Api(tags="技师表")

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/msgTechnician/entity/MsgTechnician.java

@@ -20,7 +20,7 @@ import lombok.experimental.Accessors;
 /**
  * @Description: 技师表
  * @Author: jeecg-boot
- * @Date:   2024-08-10
+ * @Date:   2024-11-18
  * @Version: V1.0
  */
 @Data
@@ -107,6 +107,10 @@ public class MsgTechnician implements Serializable {
 	@Excel(name = "实名", width = 15)
     @ApiModelProperty(value = "实名")
     private java.lang.String realOk;
+	/**性别*/
+	@Excel(name = "性别", width = 15)
+    @ApiModelProperty(value = "性别")
+    private java.lang.String sex;
 	/**经验*/
 	@Excel(name = "经验", width = 15)
     @ApiModelProperty(value = "经验")
@@ -139,6 +143,10 @@ public class MsgTechnician implements Serializable {
 	@Excel(name = "经度", width = 15)
     @ApiModelProperty(value = "经度")
     private java.lang.String longitude;
+	/**多少公里内免费*/
+	@Excel(name = "多少公里内免费", width = 15)
+    @ApiModelProperty(value = "多少公里内免费")
+    private java.lang.Integer isKm;
 	/**纬度*/
 	@Excel(name = "纬度", width = 15)
     @ApiModelProperty(value = "纬度")
@@ -151,10 +159,6 @@ public class MsgTechnician implements Serializable {
 	@Excel(name = "免费出行", width = 15)
     @ApiModelProperty(value = "免费出行")
     private java.lang.String isCx;
-	/**多少公里内免费*/
-	@Excel(name = "多少公里内免费", width = 15)
-    @ApiModelProperty(value = "多少公里内免费")
-    private java.lang.Integer isKm;
 	/**显示距离*/
 	@Excel(name = "显示距离", width = 15)
     @ApiModelProperty(value = "显示距离")

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/msgTechnician/mapper/MsgTechnicianMapper.java

@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 /**
  * @Description: 技师表
  * @Author: jeecg-boot
- * @Date:   2024-08-10
+ * @Date:   2024-11-18
  * @Version: V1.0
  */
 public interface MsgTechnicianMapper extends BaseMapper<MsgTechnician> {

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/msgTechnician/service/IMsgTechnicianService.java

@@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
 /**
  * @Description: 技师表
  * @Author: jeecg-boot
- * @Date:   2024-08-10
+ * @Date:   2024-11-18
  * @Version: V1.0
  */
 public interface IMsgTechnicianService extends IService<MsgTechnician> {

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/msgTechnician/service/impl/MsgTechnicianServiceImpl.java

@@ -10,7 +10,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 /**
  * @Description: 技师表
  * @Author: jeecg-boot
- * @Date:   2024-08-10
+ * @Date:   2024-11-18
  * @Version: V1.0
  */
 @Service

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/msgTechnician/vue/MsgTechnicianList.vue

@@ -215,6 +215,11 @@
             dataIndex: 'realOk',
             customRender: (text) => (text ? filterMultiDictText(this.dictOptions['realOk'], text) : ''),
           },
+          {
+            title:'性别',
+            align:"center",
+            dataIndex: 'sex'
+          },
           {
             title:'经验',
             align:"center",
@@ -256,6 +261,11 @@
             align:"center",
             dataIndex: 'longitude'
           },
+          {
+            title:'多少公里内免费',
+            align:"center",
+            dataIndex: 'isKm'
+          },
           {
             title:'纬度',
             align:"center",
@@ -272,11 +282,6 @@
             dataIndex: 'isCx',
             customRender: (text) => (text ? filterMultiDictText(this.dictOptions['isCx'], text) : ''),
           },
-          {
-            title:'多少公里内免费',
-            align:"center",
-            dataIndex: 'isKm'
-          },
           {
             title:'显示距离',
             align:"center",
@@ -354,6 +359,7 @@
         fieldList.push({type:'string',value:'city',text:'城市',dictCode:''})
         fieldList.push({type:'string',value:'county',text:'区县',dictCode:''})
         fieldList.push({type:'switch',value:'realOk',text:'实名'})
+        fieldList.push({type:'string',value:'sex',text:'性别',dictCode:''})
         fieldList.push({type:'string',value:'experience',text:'经验',dictCode:''})
         fieldList.push({type:'int',value:'isSb',text:'识别度',dictCode:''})
         fieldList.push({type:'int',value:'isFw',text:'服务次数',dictCode:''})
@@ -362,10 +368,10 @@
         fieldList.push({type:'int',value:'pinNum',text:'评价条数',dictCode:''})
         fieldList.push({type:'string',value:'useTime',text:'最早可预约时间',dictCode:''})
         fieldList.push({type:'string',value:'longitude',text:'经度',dictCode:''})
+        fieldList.push({type:'int',value:'isKm',text:'多少公里内免费',dictCode:''})
         fieldList.push({type:'string',value:'latitude',text:'纬度',dictCode:''})
         fieldList.push({type:'string',value:'bookable',text:'是否可预约',dictCode:''})
         fieldList.push({type:'switch',value:'isCx',text:'免费出行'})
-        fieldList.push({type:'int',value:'isKm',text:'多少公里内免费',dictCode:''})
         fieldList.push({type:'int',value:'setKm',text:'显示距离',dictCode:''})
         fieldList.push({type:'int',value:'isTest',text:'运营号',dictCode:''})
         fieldList.push({type:'string',value:'setKmOpen',text:'距离显示开启',dictCode:''})

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/msgTechnician/vue/modules/MsgTechnicianForm.vue

@@ -73,6 +73,11 @@
               <j-switch v-model="model.realOk"  ></j-switch>
             </a-form-model-item>
           </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="性别" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="sex">
+              <a-input v-model="model.sex" placeholder="请输入性别"  ></a-input>
+            </a-form-model-item>
+          </a-col>
           <a-col :span="24">
             <a-form-model-item label="经验" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="experience">
               <a-input v-model="model.experience" placeholder="请输入经验"  ></a-input>
@@ -113,6 +118,11 @@
               <a-input v-model="model.longitude" placeholder="请输入经度"  ></a-input>
             </a-form-model-item>
           </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="多少公里内免费" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="isKm">
+              <a-input-number v-model="model.isKm" placeholder="请输入多少公里内免费" style="width: 100%" />
+            </a-form-model-item>
+          </a-col>
           <a-col :span="24">
             <a-form-model-item label="纬度" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="latitude">
               <a-input v-model="model.latitude" placeholder="请输入纬度"  ></a-input>
@@ -128,11 +138,6 @@
               <j-switch v-model="model.isCx"  ></j-switch>
             </a-form-model-item>
           </a-col>
-          <a-col :span="24">
-            <a-form-model-item label="多少公里内免费" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="isKm">
-              <a-input-number v-model="model.isKm" placeholder="请输入多少公里内免费" style="width: 100%" />
-            </a-form-model-item>
-          </a-col>
           <a-col :span="24">
             <a-form-model-item label="显示距离" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="setKm">
               <a-input-number v-model="model.setKm" placeholder="请输入显示距离" style="width: 100%" />

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/msgTechnician/vue3/MsgTechnician.data.ts

@@ -79,6 +79,11 @@ export const columns: BasicColumn[] = [
        return  render.renderSwitch(text, [{text:'是',value:'Y'},{text:'否',value:'N'}])
      },
    },
+   {
+    title: '性别',
+    align:"center",
+    dataIndex: 'sex'
+   },
    {
     title: '经验',
     align:"center",
@@ -120,6 +125,11 @@ export const columns: BasicColumn[] = [
     align:"center",
     dataIndex: 'longitude'
    },
+   {
+    title: '多少公里内免费',
+    align:"center",
+    dataIndex: 'isKm'
+   },
    {
     title: '纬度',
     align:"center",
@@ -138,11 +148,6 @@ export const columns: BasicColumn[] = [
        return  render.renderSwitch(text, [{text:'是',value:'Y'},{text:'否',value:'N'}])
      },
    },
-   {
-    title: '多少公里内免费',
-    align:"center",
-    dataIndex: 'isKm'
-   },
    {
     title: '显示距离',
     align:"center",
@@ -270,6 +275,11 @@ export const formSchema: FormSchema[] = [
      componentProps:{
      },
   },
+  {
+    label: '性别',
+    field: 'sex',
+    component: 'Input',
+  },
   {
     label: '经验',
     field: 'experience',
@@ -312,6 +322,11 @@ export const formSchema: FormSchema[] = [
     field: 'longitude',
     component: 'Input',
   },
+  {
+    label: '多少公里内免费',
+    field: 'isKm',
+    component: 'InputNumber',
+  },
   {
     label: '纬度',
     field: 'latitude',
@@ -329,11 +344,6 @@ export const formSchema: FormSchema[] = [
      componentProps:{
      },
   },
-  {
-    label: '多少公里内免费',
-    field: 'isKm',
-    component: 'InputNumber',
-  },
   {
     label: '显示距离',
     field: 'setKm',

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/msgTer/controller/MsgTerController.java

@@ -12,6 +12,8 @@ import javax.servlet.http.HttpServletResponse;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.common.util.oConvertUtils;
+import org.jeecg.modules.msgTechnician.entity.MsgTechnician;
+import org.jeecg.modules.msgTechnician.service.IMsgTechnicianService;
 import org.jeecg.modules.msgTer.entity.MsgTer;
 import org.jeecg.modules.msgTer.service.IMsgTerService;
 
@@ -39,7 +41,7 @@ import org.jeecg.common.aspect.annotation.AutoLog;
  /**
  * @Description: 技师入驻表
  * @Author: jeecg-boot
- * @Date:   2024-08-10
+ * @Date:   2024-11-18
  * @Version: V1.0
  */
 @Api(tags="技师入驻表")
@@ -49,7 +51,9 @@ import org.jeecg.common.aspect.annotation.AutoLog;
 public class MsgTerController extends JeecgController<MsgTer, IMsgTerService> {
 	@Autowired
 	private IMsgTerService msgTerService;
-	
+	@Autowired
+	private IMsgTechnicianService msgTechnicianService;
+
 	/**
 	 * 分页列表查询
 	 *
@@ -96,6 +100,66 @@ public class MsgTerController extends JeecgController<MsgTer, IMsgTerService> {
 	@ApiOperation(value="技师入驻表-编辑", notes="技师入驻表-编辑")
 	@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
 	public Result<String> edit(@RequestBody MsgTer msgTer) {
+		//用户标识不能为空
+		if(oConvertUtils.isEmpty(msgTer.getUserId())){
+			return Result.error("用户标识不能为空");
+		}
+		//查询该用户是否存在技师数据
+		MsgTechnician msgTechnician = msgTechnicianService
+				.lambdaQuery()
+				.eq(MsgTechnician::getUserId,msgTer.getUserId())
+				.one();
+		if(msgTechnician!=null){
+			return Result.error("当前用户已绑定技师账号，请更换账号重新申请");
+		}
+
+		//如果状态为审核通过
+		if(msgTer.getState()==1){
+			//查询该用户是否已经入驻
+			MsgTer one = msgTerService.lambdaQuery()
+					.eq(MsgTer::getUserId, msgTer.getUserId())
+					.eq(MsgTer::getState, 1)
+					.one();
+			if(one!=null){
+				return Result.error("当前用户已入驻，请勿重复入驻");
+			}
+
+			//把MsgTer的数据写入技师表
+			MsgTechnician msgTechnician1 = new MsgTechnician();
+			msgTechnician1.setImage(msgTer.getImage());
+			msgTechnician1.setTitle(msgTer.getName());
+			msgTechnician1.setIcon("https://dianpin-img.xzaiyp.top/upload/WechatIMG1666_1719811927700.jpg");
+			msgTechnician1.setUserId(msgTer.getUserId());
+			msgTechnician1.setLevel(0);
+			msgTechnician1.setScore(0);
+			msgTechnician1.setNotes("新人多关照");
+			msgTechnician1.setIsVip("官方认证");
+			msgTechnician1.setKg("-");
+			msgTechnician1.setCm("-");
+			msgTechnician1.setArea("-");
+			msgTechnician1.setCity("-");
+			msgTechnician1.setCounty("-");
+			msgTechnician1.setRealOk("Y");
+			msgTechnician1.setSex(msgTer.getSex());
+			msgTechnician1.setExperience("99");
+			msgTechnician1.setIsSb(100);
+			msgTechnician1.setIsFw(10);
+			msgTechnician1.setCollectNum(0);
+			msgTechnician1.setImages(msgTer.getIdImage()+","+msgTer.getIdImage2());
+			msgTechnician1.setPinNum(0);
+			msgTechnician1.setUseTime("-");
+			msgTechnician1.setLongitude("113.544");
+			msgTechnician1.setIsKm(0);
+			msgTechnician1.setLatitude("34.763");
+			msgTechnician1.setBookable("Y");
+			msgTechnician1.setIsCx("Y");
+			msgTechnician1.setSetKm(0);
+			msgTechnician1.setIsTest(0);
+			msgTechnician1.setSetKmOpen("N");
+			msgTechnician1.setHealthCertificate("-");
+			msgTechnician1.setBusinessLicense("-");
+			msgTechnicianService.save(msgTechnician1);
+		}
 		msgTerService.updateById(msgTer);
 		return Result.OK("编辑成功!");
 	}

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/msgTer/entity/MsgTer.java

@@ -20,7 +20,7 @@ import lombok.experimental.Accessors;
 /**
  * @Description: 技师入驻表
  * @Author: jeecg-boot
- * @Date:   2024-08-10
+ * @Date:   2024-11-18
  * @Version: V1.0
  */
 @Data
@@ -92,7 +92,8 @@ public class MsgTer implements Serializable {
     @ApiModelProperty(value = "反面图")
     private java.lang.String idImg2;
 	/**状态*/
-	@Excel(name = "状态", width = 15)
+	@Excel(name = "状态", width = 15, dicCode = "open_state")
+	@Dict(dicCode = "open_state")
     @ApiModelProperty(value = "状态")
     private java.lang.Integer state;
 	/**开户行*/

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/msgTer/mapper/MsgTerMapper.java

@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 /**
  * @Description: 技师入驻表
  * @Author: jeecg-boot
- * @Date:   2024-08-10
+ * @Date:   2024-11-18
  * @Version: V1.0
  */
 public interface MsgTerMapper extends BaseMapper<MsgTer> {

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/msgTer/vue/MsgTerList.vue → jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/msgTer/msgTer/MsgTerList.vue

@@ -178,7 +178,7 @@
           {
             title:'状态',
             align:"center",
-            dataIndex: 'state'
+            dataIndex: 'state_dictText'
           },
           {
             title:'开户行',
@@ -246,7 +246,7 @@
         fieldList.push({type:'string',value:'idCard',text:'证件号码',dictCode:''})
         fieldList.push({type:'string',value:'idImg',text:'正面图',dictCode:''})
         fieldList.push({type:'string',value:'idImg2',text:'反面图',dictCode:''})
-        fieldList.push({type:'int',value:'state',text:'状态',dictCode:''})
+        fieldList.push({type:'int',value:'state',text:'状态',dictCode:'open_state'})
         fieldList.push({type:'string',value:'bank',text:'开户行',dictCode:''})
         fieldList.push({type:'string',value:'card',text:'账号',dictCode:''})
         fieldList.push({type:'string',value:'idImage',text:'健康证',dictCode:''})

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/msgTer/vue/modules/MsgTerForm.vue → jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/msgTer/msgTer/modules/MsgTerForm.vue

@@ -55,7 +55,7 @@
           </a-col>
           <a-col :span="24">
             <a-form-model-item label="状态" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="state">
-              <a-input-number v-model="model.state" placeholder="请输入状态" style="width: 100%" />
+              <j-dict-select-tag type="list" v-model="model.state" dictCode="open_state" placeholder="请选择状态" />
             </a-form-model-item>
           </a-col>
           <a-col :span="24">

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/msgTer/service/IMsgTerService.java

@@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
 /**
  * @Description: 技师入驻表
  * @Author: jeecg-boot
- * @Date:   2024-08-10
+ * @Date:   2024-11-18
  * @Version: V1.0
  */
 public interface IMsgTerService extends IService<MsgTer> {

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/msgTer/service/impl/MsgTerServiceImpl.java

@@ -10,7 +10,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 /**
  * @Description: 技师入驻表
  * @Author: jeecg-boot
- * @Date:   2024-08-10
+ * @Date:   2024-11-18
  * @Version: V1.0
  */
 @Service

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/msgTer/vue3/MsgTer.data.ts

@@ -60,7 +60,7 @@ export const columns: BasicColumn[] = [
    {
     title: '状态',
     align:"center",
-    dataIndex: 'state'
+    dataIndex: 'state_dictText'
    },
    {
     title: '开户行',
@@ -152,7 +152,10 @@ export const formSchema: FormSchema[] = [
   {
     label: '状态',
     field: 'state',
-    component: 'InputNumber',
+    component: 'JDictSelectTag',
+    componentProps:{
+        dictCode:"open_state"
+     },
   },
   {
     label: '开户行',

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/service/impl/ApiLoginServiceImpl.java

@@ -19,6 +19,10 @@ import org.jeecg.modules.hanHaiMember.service.IHanHaiMemberService;
 import org.jeecg.modules.msgBanner.service.IMsgBannerService;
 import org.jeecg.modules.msgBelece.entity.MsgBelece;
 import org.jeecg.modules.msgBelece.service.IMsgBeleceService;
+import org.jeecg.modules.msgConfig.entity.MsgConfig;
+import org.jeecg.modules.msgConfig.service.IMsgConfigService;
+import org.jeecg.modules.msgCoupon.entity.MsgCoupon;
+import org.jeecg.modules.msgCoupon.service.IMsgCouponService;
 import org.jeecg.modules.service.ApiLoginService;
 import org.springframework.stereotype.Service;
 
@@ -40,6 +44,14 @@ public class ApiLoginServiceImpl implements ApiLoginService {
     //钱包表
     @Resource
     private IMsgBeleceService baseBeleceService;
+    //优惠券
+    @Resource
+    private IMsgCouponService baseCouponService;
+
+    //配置表
+    @Resource
+    private IMsgConfigService baseConfigService;
+
     //公共缓存类
     @Resource
     private RedisUtil redisUtil;
@@ -157,6 +169,36 @@ public class ApiLoginServiceImpl implements ApiLoginService {
         belece.setUserId(save.getId());
         belece.setMoney(BigDecimal.ZERO);
         baseBeleceService.save(belece);
+
+
+        //从配置列表里面拿到满多少钱 //满多少可用
+        String give_money = baseConfigService
+                .lambdaQuery()
+                .eq(MsgConfig::getKeyValue,"give_money")
+                .one()
+                .getContent();
+
+        //可用金额
+        String set_money = baseConfigService
+                .lambdaQuery()
+                .eq(MsgConfig::getKeyValue,"set_money")
+                .one()
+                .getContent();
+
+        //创建优惠券
+        MsgCoupon coupon = new MsgCoupon();
+        coupon.setUserId(save.getId());
+        coupon.setType("新用户满减券");
+        coupon.setState(0);
+        coupon.setMoney(new BigDecimal(set_money));
+        coupon.setUseMoney(new BigDecimal(give_money));
+        coupon.setCreateTime(new Date());
+
+        baseCouponService.save(coupon);
+
+
+
+
         redisUtil.set(CommonConstant.PREFIX_USER_TOKEN + token, token);
         // 设置超时时间
         redisUtil.expire(CommonConstant.PREFIX_USER_TOKEN + token, JwtUtil.EXPIRE_TIME / 100);

jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/controller/PostVipController.java

@@ -14,6 +14,7 @@ import org.jeecg.modules.bean.RechargeReq;
 import org.jeecg.modules.hanHaiMember.entity.HanHaiMember;
 import org.jeecg.modules.hanHaiMember.service.IHanHaiMemberService;
 import org.jeecg.modules.msgAddress.entity.MsgAddress;
+import org.jeecg.modules.msgDistributor.entity.MsgDistributor;
 import org.jeecg.modules.msgShop.entity.MsgShop;
 import org.jeecg.modules.msgTechnician.entity.MsgTechnician;
 import org.jeecg.modules.msgTer.entity.MsgTer;
@@ -82,9 +83,9 @@ public class PostVipController {
     @PostMapping(value = "/addOrUpdateShop")
     public Result<?> addOrUpdateShop(
             @RequestHeader("X-Access-Token") String token,
-            MsgShop msgShop
+            MsgDistributor bean
     ) {
-        return postApiService.addOrUpdateShop(msgShop,token);
+        return postApiService.addOrUpdateShop(bean,token);
     }
 
     //我的 - 修改用户信息

jeecg-boot-module-system/src/main/java/org/jeecg/modules/service/UserVipApiService.java

@@ -6,6 +6,7 @@ import org.jeecg.common.api.vo.Result;
 import org.jeecg.modules.bean.*;
 import org.jeecg.modules.hanHaiMember.entity.HanHaiMember;
 import org.jeecg.modules.msgAddress.entity.MsgAddress;
+import org.jeecg.modules.msgDistributor.entity.MsgDistributor;
 import org.jeecg.modules.msgShop.entity.MsgShop;
 import org.jeecg.modules.msgTechnician.entity.MsgTechnician;
 import org.jeecg.modules.msgTer.entity.MsgTer;
@@ -66,7 +67,7 @@ public interface UserVipApiService {
     Result<?> addOrUpdateMsgTer(MsgTer msgTechnician, String token);
 
     //我的 - 增加或修改分销商入驻信息
-    Result<?> addOrUpdateShop(MsgShop msgShop,String token);
+    Result<?> addOrUpdateShop(MsgDistributor bean, String token);
 
     //我的 - 修改用户信息
     Result<?> updateUser(HanHaiMember member,String token);

jeecg-boot-module-system/src/main/java/org/jeecg/modules/service/impl/OrderCreateVipServiceImpl.java

@@ -9,6 +9,7 @@ import org.apache.commons.lang.StringUtils;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.constant.CommonConstant;
 import org.jeecg.common.system.util.JwtUtil;
+import org.jeecg.common.util.DateUtils;
 import org.jeecg.common.util.RedisUtil;
 import org.jeecg.config.shiro.ShiroRealm;
 import org.jeecg.modules.bean.OrderPageBean;
@@ -1383,30 +1384,50 @@ public class OrderCreateVipServiceImpl implements OrderCreateVipService {
     @Override
     public Result<?> getTenOrderStatistics(String token){
         HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiAccount(token);
+        //查询该用户关联的技师信息
+        MsgTechnician technician = msgTechnicianService.lambdaQuery().eq(MsgTechnician::getUserId, hanHaiMember.getId())
+                .one();
+        //查询该技师的全部订单
+        List<MsgOrder> technicianListAll = msgOrderService.lambdaQuery().eq(MsgOrder::getTechnicianId, technician.getId())
+                .list();
         List list = new ArrayList<>();
         StatisBean statisBean = new StatisBean();
         statisBean.setStatus(0);
         statisBean.setName("全部订单");
-        statisBean.setSize(100);
+        statisBean.setSize(technicianListAll.size());
         list.add(statisBean);
 
+        //查询该技师未完成订单
+        List<MsgOrder> technicianListNoFinish = msgOrderService.lambdaQuery().eq(MsgOrder::getTechnicianId, technician.getId())
+                .eq(MsgOrder::getState,0)
+                .list();
+
 
         StatisBean statisBean1 = new StatisBean();
         statisBean1.setStatus(1);
-        statisBean1.setName("全部订单");
-        statisBean1.setSize(99);
+        statisBean1.setName("未完成");
+        statisBean1.setSize(technicianListNoFinish.size());
         list.add(statisBean1);
 
+        List<MsgOrder> technicianListFinish = msgOrderService.lambdaQuery().eq(MsgOrder::getTechnicianId, technician.getId())
+                .eq(MsgOrder::getState,1)
+                .list();
+
         StatisBean statisBean2 = new StatisBean();
         statisBean2.setStatus(2);
-        statisBean2.setName("全部订单");
-        statisBean2.setSize(88);
+        statisBean2.setName("已完成");
+        statisBean2.setSize(technicianListFinish.size());
         list.add(statisBean2);
 
+
+        List<MsgOrder> technicianListAll1 = msgOrderService.lambdaQuery().eq(MsgOrder::getTechnicianId, technician.getId())
+                .eq(MsgOrder::getState,2)
+                .list();
+
         StatisBean statisBean3 = new StatisBean();
         statisBean3.setStatus(3);
-        statisBean3.setName("全部订单");
-        statisBean3.setSize(77);
+        statisBean3.setName("已评价");
+        statisBean3.setSize(technicianListAll1.size());
         list.add(statisBean3);
 
 

jeecg-boot-module-system/src/main/java/org/jeecg/modules/service/impl/TerServiceImpl.java

@@ -285,6 +285,21 @@ public class TerServiceImpl implements TerService {
             hanHaiMember.setSex(sex);
         }
         boolean b = hanHaiMemberService.updateById(hanHaiMember);
+
+
+
+        //查询该用户是否绑定技师
+        MsgTechnician technician = msgTechnicianService.lambdaQuery()
+                .eq(MsgTechnician::getUserId, hanHaiMember.getId())
+                .one();
+        //如果绑定了修改技师的性别
+        if (technician!=null){
+            technician.setSex(sex);
+            msgTechnicianService.updateById(technician);
+        }
+
+
+
         return Result.OK("修改成功");
     }
 

jeecg-boot-module-system/src/main/java/org/jeecg/modules/service/impl/UserVipApiServiceImpl.java

@@ -32,6 +32,8 @@ import org.jeecg.modules.msgCollect.service.IMsgCollectService;
 import org.jeecg.modules.msgConfig.service.IMsgConfigService;
 import org.jeecg.modules.msgCoupon.entity.MsgCoupon;
 import org.jeecg.modules.msgCoupon.service.IMsgCouponService;
+import org.jeecg.modules.msgDistributor.entity.MsgDistributor;
+import org.jeecg.modules.msgDistributor.service.IMsgDistributorService;
 import org.jeecg.modules.msgEvaluate.entity.MsgEvaluate;
 import org.jeecg.modules.msgEvaluate.service.IMsgEvaluateService;
 import org.jeecg.modules.msgOrder.entity.MsgOrder;
@@ -130,6 +132,9 @@ public class UserVipApiServiceImpl implements UserVipApiService {
     //收藏接口
     @Resource
     private IMsgCollectService msgCollectService;
+    //商户入驻
+    @Resource
+    private IMsgDistributorService msgDistributorService;
 
 
     //微信公众号授权登录
@@ -454,15 +459,15 @@ public class UserVipApiServiceImpl implements UserVipApiService {
 
     //我的-增加分销商入驻信息
     @Override
-    public Result<?> addOrUpdateShop(MsgShop msgShop,String token) {
+    public Result<?> addOrUpdateShop(MsgDistributor bean, String token) {
         HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiAccount(token);
         if(hanHaiMember == null){
             return Result.error("用户信息失效");
         }
-        if(StringUtils.isBlank(msgShop.getId())){
-            msgShopService.save(msgShop);
+        if(StringUtils.isBlank(bean.getId())){
+            msgDistributorService.save(bean);
         }else{
-            msgShopService.updateById(msgShop);
+            msgDistributorService.updateById(bean);
         }
         return Result.ok();
     }

shop/.env

@@ -1,5 +1,5 @@
 NODE_ENV=production
-VUE_APP_PLATFORM_NAME=宜轩到家后台管理系统
+VUE_APP_PLATFORM_NAME=宜轩到家
 # 开启单点登录
 VUE_APP_SSO=false
 # 开启微应用模式

shop/.env.development

@@ -1,5 +1,5 @@
 NODE_ENV=development
-VUE_APP_API_BASE_URL=https://admin.yixuandaojia.com/massage-api-three/
+VUE_APP_API_BASE_URL=http://localhost:8000/massage-api-three/
 VUE_APP_CAS_BASE_URL=http://cas.example.org:8443/cas
 VUE_APP_ONLINE_BASE_URL=http://fileview.jeecg.com/onlinePreview
 

shop/src/components/tools/Logo.vue

@@ -21,7 +21,7 @@
     props: {
       title: {
         type: String,
-        default: '宜轩到家后台管理系统',
+        default: '宜轩到家',
         required: false
       },
       showTitle: {

shop/src/views/msgTer/MsgTerList.vue

@@ -0,0 +1,261 @@
+<template>
+  <a-card :bordered="false">
+    <!-- 查询区域 -->
+    <div class="table-page-search-wrapper">
+      <a-form layout="inline" @keyup.enter.native="searchQuery">
+        <a-row :gutter="24">
+        </a-row>
+      </a-form>
+    </div>
+    <!-- 查询区域-END -->
+
+    <!-- 操作按钮区域 -->
+    <div class="table-operator">
+<!--      <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>-->
+<!--      <a-button type="primary" icon="download" @click="handleExportXls('技师入驻表')">导出</a-button>-->
+<!--      <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">-->
+<!--        <a-button type="primary" icon="import">导入</a-button>-->
+<!--      </a-upload>-->
+      <!-- 高级查询区域 -->
+<!--      <j-super-query :fieldList="superFieldList" ref="superQueryModal" @handleSuperQuery="handleSuperQuery"></j-super-query>-->
+      <a-dropdown v-if="selectedRowKeys.length > 0">
+        <a-menu slot="overlay">
+          <a-menu-item key="1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>
+        </a-menu>
+        <a-button style="margin-left: 8px"> 批量操作 <a-icon type="down" /></a-button>
+      </a-dropdown>
+    </div>
+
+    <!-- table区域-begin -->
+    <div>
+      <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
+        <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a style="font-weight: 600">{{ selectedRowKeys.length }}</a>项
+        <a style="margin-left: 24px" @click="onClearSelected">清空</a>
+      </div>
+
+      <a-table
+        ref="table"
+        size="middle"
+        :scroll="{x:true}"
+        bordered
+        rowKey="id"
+        :columns="columns"
+        :dataSource="dataSource"
+        :pagination="ipagination"
+        :loading="loading"
+        :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
+        class="j-table-force-nowrap"
+        @change="handleTableChange">
+
+        <template slot="htmlSlot" slot-scope="text">
+          <div v-html="text"></div>
+        </template>
+        <template slot="imgSlot" slot-scope="text,record">
+          <span v-if="!text" style="font-size: 12px;font-style: italic;">无图片</span>
+          <img v-else :src="getImgView(text)" :preview="record.id" height="25px" alt="" style="max-width:80px;font-size: 12px;font-style: italic;"/>
+        </template>
+        <template slot="fileSlot" slot-scope="text">
+          <span v-if="!text" style="font-size: 12px;font-style: italic;">无文件</span>
+          <a-button
+            v-else
+            :ghost="true"
+            type="primary"
+            icon="download"
+            size="small"
+            @click="downloadFile(text)">
+            下载
+          </a-button>
+        </template>
+
+        <span slot="action" slot-scope="text, record">
+          <a @click="handleEdit(record)">编辑</a>
+
+          <a-divider type="vertical" />
+          <a-dropdown>
+            <a class="ant-dropdown-link">更多 <a-icon type="down" /></a>
+            <a-menu slot="overlay">
+              <a-menu-item>
+                <a @click="handleDetail(record)">详情</a>
+              </a-menu-item>
+              <a-menu-item>
+                <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
+                  <a>删除</a>
+                </a-popconfirm>
+              </a-menu-item>
+            </a-menu>
+          </a-dropdown>
+        </span>
+
+      </a-table>
+    </div>
+
+    <msg-ter-modal ref="modalForm" @ok="modalFormOk"></msg-ter-modal>
+  </a-card>
+</template>
+
+<script>
+
+  import '@/assets/less/TableExpand.less'
+  import { mixinDevice } from '@/utils/mixin'
+  import { JeecgListMixin } from '@/mixins/JeecgListMixin'
+  import MsgTerModal from './modules/MsgTerModal'
+  import {filterMultiDictText} from '@/components/dict/JDictSelectUtil'
+
+  export default {
+    name: 'MsgTerList',
+    mixins:[JeecgListMixin, mixinDevice],
+    components: {
+      MsgTerModal
+    },
+    data () {
+      return {
+        description: '技师入驻表管理页面',
+        // 表头
+        columns: [
+          {
+            title: '#',
+            dataIndex: '',
+            key:'rowIndex',
+            width:60,
+            align:"center",
+            customRender:function (t,r,index) {
+              return parseInt(index)+1;
+            }
+          },
+          {
+            title:'技师名称',
+            align:"center",
+            dataIndex: 'name'
+          },
+          {
+            title:'技师性别',
+            align:"center",
+            dataIndex: 'sex'
+          },
+          {
+            title:'联系电话',
+            align:"center",
+            dataIndex: 'phone'
+          },
+          {
+            title:'技师年龄',
+            align:"center",
+            dataIndex: 'age'
+          },
+          {
+            title:'意向城市',
+            align:"center",
+            dataIndex: 'city'
+          },
+          {
+            title:'照片',
+            align:"center",
+            dataIndex: 'image',
+            scopedSlots: {customRender: 'imgSlot'}
+          },
+          {
+            title:'关联用户',
+            align:"center",
+            dataIndex: 'userId_dictText'
+          },
+          {
+            title:'证件号码',
+            align:"center",
+            dataIndex: 'idCard'
+          },
+          {
+            title:'正面图',
+            align:"center",
+            dataIndex: 'idImg',
+            scopedSlots: {customRender: 'imgSlot'}
+          },
+          {
+            title:'反面图',
+            align:"center",
+            dataIndex: 'idImg2',
+            scopedSlots: {customRender: 'imgSlot'}
+          },
+          {
+            title:'状态',
+            align:"center",
+            dataIndex: 'state_dictText'
+          },
+          {
+            title:'开户行',
+            align:"center",
+            dataIndex: 'bank'
+          },
+          {
+            title:'账号',
+            align:"center",
+            dataIndex: 'card'
+          },
+          {
+            title:'健康证',
+            align:"center",
+            dataIndex: 'idImage',
+            scopedSlots: {customRender: 'imgSlot'}
+          },
+          {
+            title:'营业证',
+            align:"center",
+            dataIndex: 'idImage2',
+            scopedSlots: {customRender: 'imgSlot'}
+          },
+          {
+            title: '操作',
+            dataIndex: 'action',
+            align:"center",
+            fixed:"right",
+            width:147,
+            scopedSlots: { customRender: 'action' }
+          }
+        ],
+        url: {
+          list: "/msgTer/msgTer/list",
+          delete: "/msgTer/msgTer/delete",
+          deleteBatch: "/msgTer/msgTer/deleteBatch",
+          exportXlsUrl: "/msgTer/msgTer/exportXls",
+          importExcelUrl: "msgTer/msgTer/importExcel",
+          
+        },
+        dictOptions:{},
+        superFieldList:[],
+      }
+    },
+    created() {
+    this.getSuperFieldList();
+    },
+    computed: {
+      importExcelUrl: function(){
+        return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
+      },
+    },
+    methods: {
+      initDictConfig(){
+      },
+      getSuperFieldList(){
+        let fieldList=[];
+        fieldList.push({type:'string',value:'name',text:'技师名称',dictCode:''})
+        fieldList.push({type:'string',value:'sex',text:'技师性别',dictCode:''})
+        fieldList.push({type:'string',value:'phone',text:'联系电话',dictCode:''})
+        fieldList.push({type:'string',value:'age',text:'技师年龄',dictCode:''})
+        fieldList.push({type:'string',value:'city',text:'意向城市',dictCode:''})
+        fieldList.push({type:'Text',value:'image',text:'照片',dictCode:''})
+        fieldList.push({type:'sel_search',value:'userId',text:'关联用户',dictTable:"han_hai_member", dictText:'nick_name', dictCode:'id'})
+        fieldList.push({type:'string',value:'idCard',text:'证件号码',dictCode:''})
+        fieldList.push({type:'string',value:'idImg',text:'正面图',dictCode:''})
+        fieldList.push({type:'string',value:'idImg2',text:'反面图',dictCode:''})
+        fieldList.push({type:'int',value:'state',text:'状态',dictCode:'open_state'})
+        fieldList.push({type:'string',value:'bank',text:'开户行',dictCode:''})
+        fieldList.push({type:'string',value:'card',text:'账号',dictCode:''})
+        fieldList.push({type:'string',value:'idImage',text:'健康证',dictCode:''})
+        fieldList.push({type:'string',value:'idImage2',text:'营业证',dictCode:''})
+        this.superFieldList = fieldList
+      }
+    }
+  }
+</script>
+<style scoped>
+  @import '~@assets/less/common.less';
+</style>

shop/src/views/msgTer/modules/MsgTerForm.vue

@@ -0,0 +1,174 @@
+<template>
+  <a-spin :spinning="confirmLoading">
+    <j-form-container :disabled="formDisabled">
+      <a-form-model ref="form" :model="model" :rules="validatorRules" slot="detail">
+        <a-row>
+          <a-col :span="24">
+            <a-form-model-item label="技师名称" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="name">
+              <a-input v-model="model.name" placeholder="请输入技师名称"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="技师性别" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="sex">
+              <a-input v-model="model.sex" placeholder="请输入技师性别"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="联系电话" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="phone">
+              <a-input v-model="model.phone" placeholder="请输入联系电话"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="技师年龄" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="age">
+              <a-input v-model="model.age" placeholder="请输入技师年龄"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="意向城市" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="city">
+              <a-input v-model="model.city" placeholder="请输入意向城市"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="照片" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="image">
+              <j-image-upload isMultiple  v-model="model.image" ></j-image-upload>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="关联用户" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="userId">
+              <j-search-select-tag v-model="model.userId" dict="han_hai_member,nick_name,id"  />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="证件号码" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="idCard">
+              <a-input v-model="model.idCard" placeholder="请输入证件号码"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="正面图" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="idImg">
+              <j-image-upload isMultiple  v-model="model.idImg" ></j-image-upload>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="反面图" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="idImg2">
+              <j-image-upload isMultiple  v-model="model.idImg2" ></j-image-upload>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="状态" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="state">
+              <j-dict-select-tag type="list" v-model="model.state" dictCode="open_state" placeholder="请选择状态" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="开户行" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="bank">
+              <a-input v-model="model.bank" placeholder="请输入开户行"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="账号" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="card">
+              <a-input v-model="model.card" placeholder="请输入账号"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="健康证" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="idImage">
+              <j-image-upload isMultiple  v-model="model.idImage" ></j-image-upload>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="营业证" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="idImage2">
+              <j-image-upload isMultiple  v-model="model.idImage2" ></j-image-upload>
+            </a-form-model-item>
+          </a-col>
+        </a-row>
+      </a-form-model>
+    </j-form-container>
+  </a-spin>
+</template>
+
+<script>
+
+  import { httpAction, getAction } from '@/api/manage'
+  import { validateDuplicateValue } from '@/utils/util'
+
+  export default {
+    name: 'MsgTerForm',
+    components: {
+    },
+    props: {
+      //表单禁用
+      disabled: {
+        type: Boolean,
+        default: false,
+        required: false
+      }
+    },
+    data () {
+      return {
+        model:{
+         },
+        labelCol: {
+          xs: { span: 24 },
+          sm: { span: 5 },
+        },
+        wrapperCol: {
+          xs: { span: 24 },
+          sm: { span: 16 },
+        },
+        confirmLoading: false,
+        validatorRules: {
+        },
+        url: {
+          add: "/msgTer/msgTer/add",
+          edit: "/msgTer/msgTer/edit",
+          queryById: "/msgTer/msgTer/queryById"
+        }
+      }
+    },
+    computed: {
+      formDisabled(){
+        return this.disabled
+      },
+    },
+    created () {
+       //备份model原始值
+      this.modelDefault = JSON.parse(JSON.stringify(this.model));
+    },
+    methods: {
+      add () {
+        this.edit(this.modelDefault);
+      },
+      edit (record) {
+        this.model = Object.assign({}, record);
+        this.visible = true;
+      },
+      submitForm () {
+        const that = this;
+        // 触发表单验证
+        this.$refs.form.validate(valid => {
+          if (valid) {
+            that.confirmLoading = true;
+            let httpurl = '';
+            let method = '';
+            if(!this.model.id){
+              httpurl+=this.url.add;
+              method = 'post';
+            }else{
+              httpurl+=this.url.edit;
+               method = 'put';
+            }
+            httpAction(httpurl,this.model,method).then((res)=>{
+              if(res.success){
+                that.$message.success(res.message);
+                that.$emit('ok');
+              }else{
+                that.$message.warning(res.message);
+              }
+            }).finally(() => {
+              that.confirmLoading = false;
+            })
+          }
+         
+        })
+      },
+    }
+  }
+</script>

shop/src/views/msgTer/modules/MsgTerModal.Style#Drawer.vue

@@ -0,0 +1,84 @@
+<template>
+  <a-drawer
+    :title="title"
+    :width="width"
+    placement="right"
+    :closable="false"
+    @close="close"
+    destroyOnClose
+    :visible="visible">
+    <msg-ter-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit" normal></msg-ter-form>
+    <div class="drawer-footer">
+      <a-button @click="handleCancel" style="margin-bottom: 0;">关闭</a-button>
+      <a-button v-if="!disableSubmit"  @click="handleOk" type="primary" style="margin-bottom: 0;">提交</a-button>
+    </div>
+  </a-drawer>
+</template>
+
+<script>
+
+  import MsgTerForm from './MsgTerForm'
+
+  export default {
+    name: 'MsgTerModal',
+    components: {
+      MsgTerForm
+    },
+    data () {
+      return {
+        title:"操作",
+        width:800,
+        visible: false,
+        disableSubmit: false
+      }
+    },
+    methods: {
+      add () {
+        this.visible=true
+        this.$nextTick(()=>{
+          this.$refs.realForm.add();
+        })
+      },
+      edit (record) {
+        this.visible=true
+        this.$nextTick(()=>{
+          this.$refs.realForm.edit(record);
+        });
+      },
+      close () {
+        this.$emit('close');
+        this.visible = false;
+      },
+      submitCallback(){
+        this.$emit('ok');
+        this.visible = false;
+      },
+      handleOk () {
+        this.$refs.realForm.submitForm();
+      },
+      handleCancel () {
+        this.close()
+      }
+    }
+  }
+</script>
+
+<style lang="less" scoped>
+/** Button按钮间距 */
+  .ant-btn {
+    margin-left: 30px;
+    margin-bottom: 30px;
+    float: right;
+  }
+  .drawer-footer{
+    position: absolute;
+    bottom: -8px;
+    width: 100%;
+    border-top: 1px solid #e8e8e8;
+    padding: 10px 16px;
+    text-align: right;
+    left: 0;
+    background: #fff;
+    border-radius: 0 0 2px 2px;
+  }
+</style>

shop/src/views/msgTer/modules/MsgTerModal.vue

@@ -0,0 +1,60 @@
+<template>
+  <j-modal
+    :title="title"
+    :width="width"
+    :visible="visible"
+    switchFullscreen
+    @ok="handleOk"
+    :okButtonProps="{ class:{'jee-hidden': disableSubmit} }"
+    @cancel="handleCancel"
+    cancelText="关闭">
+    <msg-ter-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit"></msg-ter-form>
+  </j-modal>
+</template>
+
+<script>
+
+  import MsgTerForm from './MsgTerForm'
+  export default {
+    name: 'MsgTerModal',
+    components: {
+      MsgTerForm
+    },
+    data () {
+      return {
+        title:'',
+        width:800,
+        visible: false,
+        disableSubmit: false
+      }
+    },
+    methods: {
+      add () {
+        this.visible=true
+        this.$nextTick(()=>{
+          this.$refs.realForm.add();
+        })
+      },
+      edit (record) {
+        this.visible=true
+        this.$nextTick(()=>{
+          this.$refs.realForm.edit(record);
+        })
+      },
+      close () {
+        this.$emit('close');
+        this.visible = false;
+      },
+      handleOk () {
+        this.$refs.realForm.submitForm();
+      },
+      submitCallback(){
+        this.$emit('ok');
+        this.visible = false;
+      },
+      handleCancel () {
+        this.close()
+      }
+    }
+  }
+</script>