修改客户

blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/BasicdataClientEntity.java

@@ -16,12 +16,15 @@
  */
 package com.logpm.basicdata.entity;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import java.util.Date;
+import java.util.List;
+
 import lombok.EqualsAndHashCode;
 import org.springblade.core.tenant.mp.TenantEntity;
 
@@ -68,10 +71,40 @@ public class BasicdataClientEntity extends TenantEntity {
 	@ApiModelProperty(value = "客户名称")
 	private String clientName;
 	/**
-	 * 客户类型
+	 * 客户类型 1 工厂  2 商场 3装饰 4个人
 	 */
-	@ApiModelProperty(value = "客户类型")
+	@ApiModelProperty(value = "客户类型 ")
 	private String clientType;
+	/**
+	 * 详细地址
+	 */
+	@ApiModelProperty(value = "详细地址 ")
+	private String detailedly;
+
+	/**
+	 * 费用类型
+	 */
+	@ApiModelProperty(value = "费用类型 ")
+	@TableField(exist = false)
+	private String businessType;
+	/**
+	 * 三方商城
+	 */
+	@ApiModelProperty(value = "三方商城")
+	@TableField(exist = false)
+	private String tripartiteMall;
+	/**
+	 * 开票信息
+	 */
+	@ApiModelProperty(value = "开票信息")
+	private String billingInformation;
+
+	/**
+	 * 服务类型
+	 */
+	@ApiModelProperty(value = "服务类型 ")
+	@TableField(exist = false)
+	private List<String> typeServiceList;
 	/**
 	 * 联系人
 	 */
@@ -112,6 +145,11 @@ public class BasicdataClientEntity extends TenantEntity {
 	 */
 	@ApiModelProperty(value = "文件名称")
 	private String fileName;
+	/**
+	 * 父ID
+	 */
+	@ApiModelProperty(value = "父ID")
+	private String pid;
 	/**
 	 * 是否控货
 	 */

blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/BasicdataShopEntity.java

@@ -25,6 +25,7 @@ import lombok.EqualsAndHashCode;
 import org.springblade.core.tenant.mp.TenantEntity;
 
 import java.util.Date;
+import java.util.List;
 
 /**
  * 基础门店表 实体类
@@ -97,12 +98,12 @@ public class BasicdataShopEntity extends TenantEntity {
 	 * 业务类型
 	 */
 	@ApiModelProperty(value = "业务类型")
-	private String business_type;
+	private String businessType;
 	/**
 	 * 服务类型
 	 */
 	@ApiModelProperty(value = "服务类型")
-	private String type_service;
+	private List<String> typeService;
 	/**
 	 * 配送方式
 	 */

blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/BasicdataStoreBusinessEntity.java

@@ -65,16 +65,16 @@ public class BasicdataStoreBusinessEntity extends TenantEntity {
 	 * 服务类型;1 提  2干  3仓  4配 5装
 	 */
 	@ApiModelProperty(value = "服务类型;1 提  2干  3仓  4配 5装")
-	private Integer typeService;
+	private String typeService;
 	/**
-	 * 门店ID
+	 * 客户ID
 	 */
-	@ApiModelProperty(value = "门店ID")
+	@ApiModelProperty(value = "客户ID")
-	private String shopId;
+	private String clientId;
 	/**
 	 * 服务类型—类型
 	 */
 	@ApiModelProperty(value = "服务类型—类型")
-	private Integer mold;
+	private String mold;
 
 }

blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/BasicdataTripartiteMallEntity.java

@@ -0,0 +1,80 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package com.logpm.basicdata.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.util.Date;
+import lombok.EqualsAndHashCode;
+import org.springblade.core.tenant.mp.TenantEntity;
+
+/**
+ * 客户三方商城 实体类
+ *
+ * @author cyz
+ * @since 2023-06-21
+ */
+@Data
+@TableName("logpm_basicdata_tripartite_mall")
+@ApiModel(value = "BasicdataTripartiteMall对象", description = "客户三方商城")
+@EqualsAndHashCode(callSuper = true)
+public class BasicdataTripartiteMallEntity extends TenantEntity {
+
+	/**
+	 * 预留1
+	 */
+	@ApiModelProperty(value = "预留1")
+	private String reserve1;
+	/**
+	 * 预留2
+	 */
+	@ApiModelProperty(value = "预留2")
+	private String reserve2;
+	/**
+	 * 预留3
+	 */
+	@ApiModelProperty(value = "预留3")
+	private String reserve3;
+	/**
+	 * 预留4
+	 */
+	@ApiModelProperty(value = "预留4")
+	private String reserve4;
+	/**
+	 * 预留5
+	 */
+	@ApiModelProperty(value = "预留5")
+	private String reserve5;
+	/**
+	 * 客户ID
+	 */
+	@ApiModelProperty(value = "客户ID")
+	private String client;
+	/**
+	 * 三方商城
+	 */
+	@ApiModelProperty(value = "三方商城")
+	private String tripartiteMall;
+	/**
+	 * 三方编码
+	 */
+	@ApiModelProperty(value = "三方编码")
+	private String tripartiteCoding;
+
+}

blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/feign/IBasicdataStoreBusinessClient.java

@@ -34,7 +34,7 @@ import org.springframework.web.bind.annotation.RequestParam;
 public interface IBasicdataStoreBusinessClient {
 
     String API_PREFIX = "/client";
-    String TOP = API_PREFIX + "/top";
+    String TOP = API_PREFIX + "/t11op";
 
     /**
      * 获取门店业务记录列表

blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/feign/IBasicdataTripartiteMallClient.java

@@ -0,0 +1,49 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package com.logpm.basicdata.feign;
+
+import org.springblade.core.mp.support.BladePage;
+import com.logpm.basicdata.entity.BasicdataTripartiteMallEntity;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+
+/**
+ * 客户三方商城 Feign接口类
+ *
+ * @author cyz
+ * @since 2023-06-21
+ */
+@FeignClient(
+    value = "blade-basicdataTripartiteMall"
+)
+public interface IBasicdataTripartiteMallClient {
+
+    String API_PREFIX = "/client";
+    String TOP = API_PREFIX + "/1top";
+
+    /**
+     * 获取客户三方商城列表
+     *
+     * @param current   页号
+     * @param size      页数
+     * @return BladePage
+     */
+    @GetMapping(TOP)
+    BladePage<BasicdataTripartiteMallEntity> top(@RequestParam("current") Integer current, @RequestParam("size") Integer size);
+
+}

blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/vo/BasicdataTripartiteMallVO.java

@@ -0,0 +1,35 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package com.logpm.basicdata.vo;
+
+import com.logpm.basicdata.entity.BasicdataTripartiteMallEntity;
+import org.springblade.core.tool.node.INode;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 客户三方商城 视图实体类
+ *
+ * @author cyz
+ * @since 2023-06-21
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class BasicdataTripartiteMallVO extends BasicdataTripartiteMallEntity {
+	private static final long serialVersionUID = 1L;
+
+}

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataCategoryController.java

@@ -26,6 +26,7 @@ import javax.validation.Valid;
 import org.springblade.core.secure.BladeUser;
 import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
+import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.Func;
 import org.springframework.web.bind.annotation.*;
@@ -98,6 +99,7 @@ public class BasicdataCategoryController extends BladeController {
 	@ApiOperationSupport(order = 5)
 	@ApiOperation(value = "懒加载树形结构", notes = "树形结构")
 	public R<List<BasicdataCategoryEntity>> lazyTree(String tenantId, Long parentId, BladeUser bladeUser) {
+		AuthUtil.getTenantId();
 		List<BasicdataCategoryEntity> tree = basicdataCategoryService.lazyTree(Func.toStrWithEmpty(tenantId, bladeUser.getTenantId()),parentId);
 		return R.data(tree);
 	}

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataClientController.java

@@ -16,6 +16,7 @@
  */
 package com.logpm.basicdata.controller;
 
+import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
@@ -78,6 +79,7 @@ public class BasicdataClientController extends BladeController {
 	public R<IPage<BasicdataClientEntity>> list(@ApiIgnore @RequestParam Map<String, Object> basicdataClient, Query query) {
 		Object o = basicdataClient.get("contractStartTime");
 		Object o1 = basicdataClient.get("contractEntTime");
+		Object o2 = basicdataClient.get("pid");
 		basicdataClient.put("contractStartTime",null);
 		basicdataClient.put("contractEntTime",null);
 		QueryWrapper<BasicdataClientEntity> queryWrapper = Condition.getQueryWrapper(basicdataClient, BasicdataClientEntity.class);
@@ -85,6 +87,11 @@ public class BasicdataClientController extends BladeController {
 				"date_format (contract_start_time,'%Y-%m-%d') >= date_format ({0},'%Y-%m-%d')", o)
 			.apply(o1 != null,
 				"date_format (contract_ent_time,'%Y-%m-%d') <= date_format ({0},'%Y-%m-%d')", o1);
+		if(ObjectUtils.isNotNull(o2)){
+			queryWrapper.eq("pid",o2);
+		}else{
+			queryWrapper.eq("pid","0");
+		}
 		IPage<BasicdataClientEntity> pages = basicdataClientService.page(Condition.getPage(query),queryWrapper);
 		return R.data(pages);
 	}

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataTripartiteMallController.java

@@ -0,0 +1,150 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package com.logpm.basicdata.controller;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
+import lombok.AllArgsConstructor;
+import javax.validation.Valid;
+
+import org.springblade.core.secure.BladeUser;
+import org.springblade.core.mp.support.Condition;
+import org.springblade.core.mp.support.Query;
+import org.springblade.core.tool.api.R;
+import org.springblade.core.tool.utils.Func;
+import org.springframework.web.bind.annotation.*;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.logpm.basicdata.entity.BasicdataTripartiteMallEntity;
+import com.logpm.basicdata.vo.BasicdataTripartiteMallVO;
+import com.logpm.basicdata.excel.BasicdataTripartiteMallExcel;
+import com.logpm.basicdata.service.IBasicdataTripartiteMallService;
+import org.springblade.core.boot.ctrl.BladeController;
+import org.springblade.core.tool.utils.DateUtil;
+import org.springblade.core.excel.util.ExcelUtil;
+import org.springblade.core.tool.constant.BladeConstant;
+import springfox.documentation.annotations.ApiIgnore;
+import java.util.Map;
+import java.util.List;
+import javax.servlet.http.HttpServletResponse;
+
+/**
+ * 客户三方商城 控制器
+ *
+ * @author cyz
+ * @since 2023-06-21
+ */
+@RestController
+@AllArgsConstructor
+@RequestMapping("/basicdataTripartiteMall")
+@Api(value = "客户三方商城", tags = "客户三方商城接口")
+public class BasicdataTripartiteMallController extends BladeController {
+
+	private final IBasicdataTripartiteMallService basicdataTripartiteMallService;
+
+	/**
+	 * 客户三方商城 详情
+	 */
+	@GetMapping("/detail")
+	@ApiOperationSupport(order = 1)
+	@ApiOperation(value = "详情", notes = "传入basicdataTripartiteMall")
+	public R<BasicdataTripartiteMallEntity> detail(BasicdataTripartiteMallEntity basicdataTripartiteMall) {
+		BasicdataTripartiteMallEntity detail = basicdataTripartiteMallService.getOne(Condition.getQueryWrapper(basicdataTripartiteMall));
+		return R.data(detail);
+	}
+	/**
+	 * 客户三方商城 分页
+	 */
+	@GetMapping("/list")
+	@ApiOperationSupport(order = 2)
+	@ApiOperation(value = "分页", notes = "传入basicdataTripartiteMall")
+	public R<IPage<BasicdataTripartiteMallEntity>> list(@ApiIgnore @RequestParam Map<String, Object> basicdataTripartiteMall, Query query) {
+		IPage<BasicdataTripartiteMallEntity> pages = basicdataTripartiteMallService.page(Condition.getPage(query), Condition.getQueryWrapper(basicdataTripartiteMall, BasicdataTripartiteMallEntity.class));
+		return R.data(pages);
+	}
+
+	/**
+	 * 客户三方商城 自定义分页
+	 */
+	@GetMapping("/page")
+	@ApiOperationSupport(order = 3)
+	@ApiOperation(value = "分页", notes = "传入basicdataTripartiteMall")
+	public R<IPage<BasicdataTripartiteMallVO>> page(BasicdataTripartiteMallVO basicdataTripartiteMall, Query query) {
+		IPage<BasicdataTripartiteMallVO> pages = basicdataTripartiteMallService.selectBasicdataTripartiteMallPage(Condition.getPage(query), basicdataTripartiteMall);
+		return R.data(pages);
+	}
+
+	/**
+	 * 客户三方商城 新增
+	 */
+	@PostMapping("/save")
+	@ApiOperationSupport(order = 4)
+	@ApiOperation(value = "新增", notes = "传入basicdataTripartiteMall")
+	public R save(@Valid @RequestBody BasicdataTripartiteMallEntity basicdataTripartiteMall) {
+		return R.status(basicdataTripartiteMallService.save(basicdataTripartiteMall));
+	}
+
+	/**
+	 * 客户三方商城 修改
+	 */
+	@PostMapping("/update")
+	@ApiOperationSupport(order = 5)
+	@ApiOperation(value = "修改", notes = "传入basicdataTripartiteMall")
+	public R update(@Valid @RequestBody BasicdataTripartiteMallEntity basicdataTripartiteMall) {
+		return R.status(basicdataTripartiteMallService.updateById(basicdataTripartiteMall));
+	}
+
+	/**
+	 * 客户三方商城 新增或修改
+	 */
+	@PostMapping("/submit")
+	@ApiOperationSupport(order = 6)
+	@ApiOperation(value = "新增或修改", notes = "传入basicdataTripartiteMall")
+	public R submit(@Valid @RequestBody BasicdataTripartiteMallEntity basicdataTripartiteMall) {
+		return R.status(basicdataTripartiteMallService.saveOrUpdate(basicdataTripartiteMall));
+	}
+
+	/**
+	 * 客户三方商城 删除
+	 */
+	@PostMapping("/remove")
+	@ApiOperationSupport(order = 7)
+	@ApiOperation(value = "逻辑删除", notes = "传入ids")
+	public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
+		return R.status(basicdataTripartiteMallService.deleteLogic(Func.toLongList(ids)));
+	}
+
+
+	/**
+	 * 导出数据
+	 */
+	@GetMapping("/export-basicdataTripartiteMall")
+	@ApiOperationSupport(order = 9)
+	@ApiOperation(value = "导出数据", notes = "传入basicdataTripartiteMall")
+	public void exportBasicdataTripartiteMall(@ApiIgnore @RequestParam Map<String, Object> basicdataTripartiteMall, BladeUser bladeUser, HttpServletResponse response) {
+		QueryWrapper<BasicdataTripartiteMallEntity> queryWrapper = Condition.getQueryWrapper(basicdataTripartiteMall, BasicdataTripartiteMallEntity.class);
+		//if (!AuthUtil.isAdministrator()) {
+		//	queryWrapper.lambda().eq(BasicdataTripartiteMall::getTenantId, bladeUser.getTenantId());
+		//}
+		queryWrapper.lambda().eq(BasicdataTripartiteMallEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED);
+		List<BasicdataTripartiteMallExcel> list = basicdataTripartiteMallService.exportBasicdataTripartiteMall(queryWrapper);
+		ExcelUtil.export(response, "客户三方商城数据" + DateUtil.time(), "客户三方商城数据表", list, BasicdataTripartiteMallExcel.class);
+	}
+
+}

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/dto/BasicdataTripartiteMallDTO.java

@@ -0,0 +1,34 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package com.logpm.basicdata.dto;
+
+import com.logpm.basicdata.entity.BasicdataTripartiteMallEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 客户三方商城 数据传输对象实体类
+ *
+ * @author cyz
+ * @since 2023-06-21
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class BasicdataTripartiteMallDTO extends BasicdataTripartiteMallEntity {
+	private static final long serialVersionUID = 1L;
+
+}

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/excel/BasicdataTripartiteMallExcel.java

@@ -0,0 +1,105 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package com.logpm.basicdata.excel;
+
+
+import lombok.Data;
+
+import java.util.Date;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import java.io.Serializable;
+
+
+/**
+ * 客户三方商城 Excel实体类
+ *
+ * @author cyz
+ * @since 2023-06-21
+ */
+@Data
+@ColumnWidth(25)
+@HeadRowHeight(20)
+@ContentRowHeight(18)
+public class BasicdataTripartiteMallExcel implements Serializable {
+
+	private static final long serialVersionUID = 1L;
+
+	/**
+	 * 租户号
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("租户号")
+	private String tenantId;
+	/**
+	 * 是否已删除
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("是否已删除")
+	private Integer isDeleted;
+	/**
+	 * 预留1
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("预留1")
+	private String reserve1;
+	/**
+	 * 预留2
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("预留2")
+	private String reserve2;
+	/**
+	 * 预留3
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("预留3")
+	private String reserve3;
+	/**
+	 * 预留4
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("预留4")
+	private String reserve4;
+	/**
+	 * 预留5
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("预留5")
+	private String reserve5;
+	/**
+	 * 客户ID
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("客户ID")
+	private String client;
+	/**
+	 * 三方商城
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("三方商城")
+	private String tripartiteMall;
+	/**
+	 * 三方编码
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("三方编码")
+	private String tripartiteCoding;
+
+}

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/feign/BasicdataTripartiteMallClient.java

@@ -0,0 +1,53 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package com.logpm.basicdata.feign;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import lombok.AllArgsConstructor;
+import org.springblade.core.mp.support.BladePage;
+import org.springblade.core.mp.support.Condition;
+import org.springblade.core.mp.support.Query;
+import com.logpm.basicdata.entity.BasicdataTripartiteMallEntity;
+import com.logpm.basicdata.service.IBasicdataTripartiteMallService;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RestController;
+import springfox.documentation.annotations.ApiIgnore;
+
+/**
+ * 客户三方商城 Feign实现类
+ *
+ * @author cyz
+ * @since 2023-06-21
+ */
+@ApiIgnore()
+@RestController
+@AllArgsConstructor
+public class BasicdataTripartiteMallClient implements IBasicdataTripartiteMallClient {
+
+    private final IBasicdataTripartiteMallService basicdataTripartiteMallService;
+
+    @Override
+    @GetMapping(TOP)
+    public BladePage<BasicdataTripartiteMallEntity> top(Integer current, Integer size) {
+        Query query = new Query();
+        query.setCurrent(current);
+        query.setSize(size);
+        IPage<BasicdataTripartiteMallEntity> page = basicdataTripartiteMallService.page(Condition.getPage(query));
+        return BladePage.of(page);
+    }
+
+}

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataTripartiteMallMapper.java

@@ -0,0 +1,54 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package com.logpm.basicdata.mapper;
+
+import com.logpm.basicdata.entity.BasicdataTripartiteMallEntity;
+import com.logpm.basicdata.vo.BasicdataTripartiteMallVO;
+import com.logpm.basicdata.excel.BasicdataTripartiteMallExcel;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.apache.ibatis.annotations.Param;
+import java.util.List;
+
+/**
+ * 客户三方商城 Mapper 接口
+ *
+ * @author cyz
+ * @since 2023-06-21
+ */
+public interface BasicdataTripartiteMallMapper extends BaseMapper<BasicdataTripartiteMallEntity> {
+
+	/**
+	 * 自定义分页
+	 *
+	 * @param page
+	 * @param basicdataTripartiteMall
+	 * @return
+	 */
+	List<BasicdataTripartiteMallVO> selectBasicdataTripartiteMallPage(IPage page, BasicdataTripartiteMallVO basicdataTripartiteMall);
+
+
+	/**
+	 * 获取导出数据
+	 *
+	 * @param queryWrapper
+	 * @return
+	 */
+	List<BasicdataTripartiteMallExcel> exportBasicdataTripartiteMall(@Param("ew") Wrapper<BasicdataTripartiteMallEntity> queryWrapper);
+
+}

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataTripartiteMallMapper.xml

@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.logpm.basicdata.mapper.BasicdataTripartiteMallMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="basicdataTripartiteMallResultMap" type="com.logpm.basicdata.entity.BasicdataTripartiteMallEntity">
+        <result column="tenant_id" property="tenantId"/>
+        <result column="create_user" property="createUser"/>
+        <result column="create_time" property="createTime"/>
+        <result column="update_user" property="updateUser"/>
+        <result column="update_time" property="updateTime"/>
+        <result column="status" property="status"/>
+        <result column="is_deleted" property="isDeleted"/>
+        <result column="create_dept" property="createDept"/>
+        <result column="id" property="id"/>
+        <result column="reserve1" property="reserve1"/>
+        <result column="reserve2" property="reserve2"/>
+        <result column="reserve3" property="reserve3"/>
+        <result column="reserve4" property="reserve4"/>
+        <result column="reserve5" property="reserve5"/>
+        <result column="client" property="client"/>
+        <result column="tripartite_mall" property="tripartiteMall"/>
+        <result column="tripartite_coding" property="tripartiteCoding"/>
+    </resultMap>
+
+
+    <select id="selectBasicdataTripartiteMallPage" resultMap="basicdataTripartiteMallResultMap">
+        select * from logpm_basicdata_tripartite_mall where is_deleted = 0
+    </select>
+
+
+    <select id="exportBasicdataTripartiteMall" resultType="com.logpm.basicdata.excel.BasicdataTripartiteMallExcel">
+        SELECT * FROM logpm_basicdata_tripartite_mall ${ew.customSqlSegment}
+    </select>
+
+</mapper>

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/IBasicdataTripartiteMallService.java

@@ -0,0 +1,52 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package com.logpm.basicdata.service;
+
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.logpm.basicdata.entity.BasicdataTripartiteMallEntity;
+import com.logpm.basicdata.vo.BasicdataTripartiteMallVO;
+import com.logpm.basicdata.excel.BasicdataTripartiteMallExcel;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.springblade.core.mp.base.BaseService;
+import java.util.List;
+
+/**
+ * 客户三方商城 服务类
+ *
+ * @author cyz
+ * @since 2023-06-21
+ */
+public interface IBasicdataTripartiteMallService extends BaseService<BasicdataTripartiteMallEntity> {
+	/**
+	 * 自定义分页
+	 *
+	 * @param page
+	 * @param basicdataTripartiteMall
+	 * @return
+	 */
+	IPage<BasicdataTripartiteMallVO> selectBasicdataTripartiteMallPage(IPage<BasicdataTripartiteMallVO> page, BasicdataTripartiteMallVO basicdataTripartiteMall);
+
+
+	/**
+	 * 导出数据
+	 *
+	 * @param queryWrapper
+	 * @return
+	 */
+	List<BasicdataTripartiteMallExcel> exportBasicdataTripartiteMall(Wrapper<BasicdataTripartiteMallEntity> queryWrapper);
+
+}

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataClientServiceImpl.java

@@ -19,16 +19,12 @@ package com.logpm.basicdata.service.impl;
 import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.logpm.basicdata.entity.BasicdataClientEntity;
+import com.logpm.basicdata.entity.*;
-import com.logpm.basicdata.entity.BasicdataHistoricalContractEntity;
-import com.logpm.basicdata.entity.BasicdataStoreContactEntity;
 import com.logpm.basicdata.mapper.BasicdataHistoricalContractMapper;
-import com.logpm.basicdata.service.IBasicdataHistoricalContractService;
+import com.logpm.basicdata.service.*;
-import com.logpm.basicdata.service.IBasicdataStoreContactService;
 import com.logpm.basicdata.vo.BasicdataClientVO;
 import com.logpm.basicdata.excel.BasicdataClientExcel;
 import com.logpm.basicdata.mapper.BasicdataClientMapper;
-import com.logpm.basicdata.service.IBasicdataClientService;
 import com.logpm.basicdata.vo.BasicdataHistoricalContractVO;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -54,6 +50,8 @@ public class BasicdataClientServiceImpl extends BaseServiceImpl<BasicdataClientM
 
 	private final IBasicdataHistoricalContractService basicdataHistoricalContractService;
 	private final IBasicdataStoreContactService basicdataStoreContactService;
+	private final IBasicdataStoreBusinessService basicdataStoreBusinessService;
+	private final IBasicdataTripartiteMallService basicdataTripartiteMallService;
 
 	@Override
 	public IPage<BasicdataClientVO> selectBasicdataClientPage(IPage<BasicdataClientVO> page, BasicdataClientVO basicdataClient) {
@@ -83,6 +81,9 @@ public class BasicdataClientServiceImpl extends BaseServiceImpl<BasicdataClientM
 			basicdataClient.setLinkman(null);
 			basicdataClient.setPhone(null);
 			basicdataClient.setCargoControl(false);
+			if(StringUtils.isBlank(basicdataClient.getPid())){
+				basicdataClient.setPid("0");
+			}
 			//添加
 			this.save(basicdataClient);
 			//添加联系人
@@ -92,11 +93,36 @@ public class BasicdataClientServiceImpl extends BaseServiceImpl<BasicdataClientM
 			basicdataStoreContactEntity.setPartitionType(2);
 			basicdataStoreContactEntity.setShopId(basicdataClient.getId());
 			basicdataStoreContactService.save(basicdataStoreContactEntity);
+			//添加客户类型
+			if(basicdataClient.getTypeServiceList().size() > 0){
+				for (String s : basicdataClient.getTypeServiceList()) {
+					//添加服务类型
+					BasicdataStoreBusinessEntity basicdataStoreBusinessEntity = new BasicdataStoreBusinessEntity();
+					basicdataStoreBusinessEntity.setTypeService(s);
+					basicdataStoreBusinessEntity.setClientId(basicdataClient.getId().toString());
+					if(s.equals("3")){
+						basicdataStoreBusinessEntity.setMold(basicdataClient.getBusinessType());
+					}
+					basicdataStoreBusinessService.save(basicdataStoreBusinessEntity);
+				}
+			}else{
+				log.info("服务类型没有！！！");
+				return false;
+			}
+			//添加三方商城
+			if(StringUtils.isNotBlank(basicdataClient.getTripartiteMall())){
+				BasicdataTripartiteMallEntity basicdataTripartiteMall = new BasicdataTripartiteMallEntity();
+				basicdataTripartiteMall.setTripartiteMall(basicdataClient.getTripartiteMall());
+				basicdataTripartiteMall.setClient(basicdataClient.getId().toString());
+				basicdataTripartiteMallService.save(basicdataTripartiteMall);
+			}
 		}
 		if(ObjectUtils.isNull(basicdataClient.getId())){
 			log.info("没有必要的ID了！！！");
 			return false;
 		}
+
+		//添加历史合同
 		BasicdataHistoricalContractEntity basicdataHistoricalContract = new BasicdataHistoricalContractEntity();
 		basicdataHistoricalContract.setClientId(basicdataClient.getId().toString());
 		basicdataHistoricalContract.setContractEntTime(basicdataClient.getContractEntTime());

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataShopServiceImpl.java

@@ -21,15 +21,21 @@ import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.logpm.basicdata.dto.BasicdataShopDTO;
 import com.logpm.basicdata.entity.BasicdataShopEntity;
+import com.logpm.basicdata.entity.BasicdataStoreBusinessEntity;
+import com.logpm.basicdata.service.IBasicdataStoreBusinessService;
 import com.logpm.basicdata.vo.BasicdataShopVO;
 import com.logpm.basicdata.excel.BasicdataShopExcel;
 import com.logpm.basicdata.mapper.BasicdataShopMapper;
 import com.logpm.basicdata.service.IBasicdataShopService;
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.springblade.core.mp.base.BaseServiceImpl;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.transaction.interceptor.TransactionAspectSupport;
 
 import java.text.SimpleDateFormat;
 import java.util.List;
@@ -42,8 +48,12 @@ import java.util.Map;
  * @since 2023-05-16
  */
 @Service
+@AllArgsConstructor
+@Slf4j
 public class BasicdataShopServiceImpl extends BaseServiceImpl<BasicdataShopMapper, BasicdataShopEntity> implements IBasicdataShopService {
 
+//	private final IBasicdataStoreBusinessService basicdataStoreBusinessService;
+
 	@Override
 	public IPage<BasicdataShopVO> selectBasicdataShopPage(IPage<BasicdataShopVO> page, BasicdataShopVO basicdataShop) {
 		return page.setRecords(baseMapper.selectBasicdataShopPage(page, basicdataShop));
@@ -66,7 +76,12 @@ public class BasicdataShopServiceImpl extends BaseServiceImpl<BasicdataShopMappe
 	}
 
 	@Override
+	@Transactional(rollbackFor = Exception.class)
 	public Boolean saveSubmit(BasicdataShopEntity basicdataShop) {
+
+		List<String> typeService = basicdataShop.getTypeService();
+		String businessType = basicdataShop.getBusinessType();
+
 		List<BasicdataShopEntity> basicdataShopEntities = baseMapper.selectList(Wrappers.<BasicdataShopEntity>query().lambda()
 			.eq(BasicdataShopEntity::getClientId, basicdataShop.getClientId())
 			.eq(BasicdataShopEntity::getStoreCode, basicdataShop.getStoreCode())
@@ -75,7 +90,32 @@ public class BasicdataShopServiceImpl extends BaseServiceImpl<BasicdataShopMappe
 		if(basicdataShopEntities.size() > 0 ){
 			throw new RuntimeException("客户已绑定此门店！");
 		}
-		return this.saveOrUpdate(basicdataShop);
+		basicdataShop.setTypeService(null);
+		basicdataShop.setBusinessType(null);
+		//添加客户信息
+		this.save(basicdataShop);
+
+		try{
+//			if(typeService.size() > 0){
+//				for (String s : typeService) {
+//					//添加服务类型
+//					BasicdataStoreBusinessEntity basicdataStoreBusinessEntity = new BasicdataStoreBusinessEntity();
+//					basicdataStoreBusinessEntity.setTypeService(s);
+//					basicdataStoreBusinessEntity.setShopId(basicdataShop.getCustomerStoreId());
+//					if(s.equals("3")){
+//						basicdataStoreBusinessEntity.setMold(businessType);
+//					}
+//					basicdataStoreBusinessService.save(basicdataStoreBusinessEntity);
+//				}
+//				return true;
+//			}
+				return false;
+		}catch (Exception e){
+			log.info("报错信息",e.getMessage());
+			TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+			return false;
+		}
+
 	}
 
 }

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataTripartiteMallServiceImpl.java

@@ -0,0 +1,54 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package com.logpm.basicdata.service.impl;
+
+import com.logpm.basicdata.entity.BasicdataTripartiteMallEntity;
+import com.logpm.basicdata.vo.BasicdataTripartiteMallVO;
+import com.logpm.basicdata.excel.BasicdataTripartiteMallExcel;
+import com.logpm.basicdata.mapper.BasicdataTripartiteMallMapper;
+import com.logpm.basicdata.service.IBasicdataTripartiteMallService;
+import org.springframework.stereotype.Service;
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.springblade.core.mp.base.BaseServiceImpl;
+import java.util.List;
+
+/**
+ * 客户三方商城 服务实现类
+ *
+ * @author cyz
+ * @since 2023-06-21
+ */
+@Service
+public class BasicdataTripartiteMallServiceImpl extends BaseServiceImpl<BasicdataTripartiteMallMapper, BasicdataTripartiteMallEntity> implements IBasicdataTripartiteMallService {
+
+	@Override
+	public IPage<BasicdataTripartiteMallVO> selectBasicdataTripartiteMallPage(IPage<BasicdataTripartiteMallVO> page, BasicdataTripartiteMallVO basicdataTripartiteMall) {
+		return page.setRecords(baseMapper.selectBasicdataTripartiteMallPage(page, basicdataTripartiteMall));
+	}
+
+
+	@Override
+	public List<BasicdataTripartiteMallExcel> exportBasicdataTripartiteMall(Wrapper<BasicdataTripartiteMallEntity> queryWrapper) {
+		List<BasicdataTripartiteMallExcel> basicdataTripartiteMallList = baseMapper.exportBasicdataTripartiteMall(queryWrapper);
+		//basicdataTripartiteMallList.forEach(basicdataTripartiteMall -> {
+		//	basicdataTripartiteMall.setTypeName(DictCache.getValue(DictEnum.YES_NO, BasicdataTripartiteMall.getType()));
+		//});
+		return basicdataTripartiteMallList;
+	}
+
+}

doc/dpm/物流租户系统.pdma.json

@@ -4,7 +4,7 @@
   "avatar": "",
   "version": "4.5.1",
   "createdTime": "2023-3-27 13:32:56",
-  "updatedTime": "2023-6-19 15:16:48",
+  "updatedTime": "2023-6-21 15:20:31",
   "dbConns": [],
   "profile": {
     "default": {
@@ -24071,8 +24071,8 @@
           "defKey": "create_dept",
           "defName": "创建部门",
           "comment": "",
-          "type": "",
+          "type": "VARCHAR",
-          "len": "",
+          "len": 20,
           "scale": "",
           "primaryKey": false,
           "notNull": false,
@@ -24081,10 +24081,27 @@
           "hideInGraph": false,
           "refDict": null,
           "extProps": {},
-          "domain": "6BC8F04B-6CFA-4995-98D3-318F5CDD774E",
+          "domain": "",
           "id": "44A60BE3-F1F2-4B66-8C87-4207CFBDC673",
           "uiHint": null
         },
+        {
+          "defKey": "pid",
+          "defName": "父id",
+          "comment": "",
+          "type": "VARCHAR",
+          "len": 20,
+          "scale": "",
+          "primaryKey": false,
+          "notNull": false,
+          "autoIncrement": false,
+          "defaultValue": "",
+          "hideInGraph": false,
+          "refDict": "",
+          "extProps": {},
+          "domain": "",
+          "id": "DA41B24B-31CC-4D6E-9686-AB6D93DF4D57"
+        },
         {
           "defKey": "id",
           "defName": "主键",
@@ -24215,8 +24232,8 @@
           "defKey": "type_service",
           "defName": "客户类型",
           "comment": "1 C端  2 B端",
-          "type": "",
+          "type": "VARCHAR",
-          "len": "",
+          "len": 1,
           "scale": "",
           "primaryKey": false,
           "notNull": false,
@@ -24225,7 +24242,7 @@
           "hideInGraph": false,
           "refDict": null,
           "extProps": {},
-          "domain": "6BC8F04B-6CFA-4995-98D3-318F5CDD774E",
+          "domain": "",
           "id": "91D28E58-99BE-4949-B0F8-B4F23EEE1366",
           "uiHint": null
         },
@@ -24336,6 +24353,23 @@
           "domain": "7CFFA0D3-6A93-4DDC-BC10-DF21211064DC",
           "id": "6F07DDC1-CD80-440D-9169-64D3DFFC6AA8",
           "uiHint": null
+        },
+        {
+          "defKey": "client_type",
+          "defName": "客户类型",
+          "comment": "1 工厂  2 商场 3装饰 4个人",
+          "type": "VARCHAR",
+          "len": 1,
+          "scale": "",
+          "primaryKey": false,
+          "notNull": false,
+          "autoIncrement": false,
+          "defaultValue": "",
+          "hideInGraph": false,
+          "refDict": "",
+          "extProps": {},
+          "domain": "",
+          "id": "C6ED09EE-8941-4810-ACD6-632EDEC631F5"
         }
       ],
       "correlations": [],
@@ -48615,7 +48649,7 @@
         }
       },
       "defKey": "logpm_basicdata_store_business",
-      "defName": "门店业务记录",
+      "defName": "客户业务类型记录",
       "comment": "",
       "properties": {
         "partitioned by": "(date string)",
@@ -48996,8 +49030,8 @@
           "defKey": "type_service",
           "defName": "服务类型",
           "comment": "1 提  2干  3仓  4配 5装",
-          "type": "",
+          "type": "VARCHAR",
-          "len": "",
+          "len": 1,
           "scale": "",
           "primaryKey": false,
           "notNull": false,
@@ -49006,12 +49040,12 @@
           "hideInGraph": false,
           "refDict": "",
           "extProps": {},
-          "domain": "6BC8F04B-6CFA-4995-98D3-318F5CDD774E",
+          "domain": "",
           "id": "28C73092-7B20-4C92-BD21-24D83AB25B3E"
         },
         {
-          "defKey": "shop_id",
+          "defKey": "client_id",
-          "defName": "门店ID",
+          "defName": "客户类型",
           "comment": "",
           "type": "VARCHAR",
           "len": 20,
@@ -49046,6 +49080,447 @@
       ],
       "correlations": [],
       "indexes": []
+    },
+    {
+      "id": "0781B8B3-6956-45F3-A2CA-8CF2180577BD",
+      "env": {
+        "base": {
+          "nameSpace": "",
+          "codeRoot": ""
+        }
+      },
+      "defKey": "logpm_basicdata_tripartite_mall",
+      "defName": "客户三方商城",
+      "comment": "",
+      "properties": {
+        "partitioned by": "(date string)",
+        "row format delimited": "",
+        "fields terminated by ','": "",
+        "collection items terminated by '-'": "",
+        "map keys terminated by ':'": "",
+        "store as textfile;": ""
+      },
+      "nameTemplate": "{defKey}[{defName}]",
+      "notes": {},
+      "headers": [
+        {
+          "refKey": "hideInGraph",
+          "hideInGraph": true
+        },
+        {
+          "refKey": "defKey",
+          "freeze": false,
+          "hideInGraph": false
+        },
+        {
+          "refKey": "defName",
+          "freeze": false,
+          "hideInGraph": false
+        },
+        {
+          "refKey": "primaryKey",
+          "freeze": false,
+          "hideInGraph": false
+        },
+        {
+          "refKey": "notNull",
+          "freeze": false,
+          "hideInGraph": true
+        },
+        {
+          "refKey": "autoIncrement",
+          "freeze": false,
+          "hideInGraph": true
+        },
+        {
+          "refKey": "domain",
+          "freeze": false,
+          "hideInGraph": true
+        },
+        {
+          "refKey": "type",
+          "freeze": false,
+          "hideInGraph": false
+        },
+        {
+          "refKey": "len",
+          "freeze": false,
+          "hideInGraph": false
+        },
+        {
+          "refKey": "scale",
+          "freeze": false,
+          "hideInGraph": false
+        },
+        {
+          "refKey": "comment",
+          "freeze": false,
+          "hideInGraph": true
+        },
+        {
+          "refKey": "refDict",
+          "freeze": false,
+          "hideInGraph": true
+        },
+        {
+          "refKey": "defaultValue",
+          "freeze": false,
+          "hideInGraph": true
+        },
+        {
+          "refKey": "isStandard",
+          "freeze": false,
+          "hideInGraph": false
+        },
+        {
+          "refKey": "uiHint",
+          "freeze": false,
+          "hideInGraph": true
+        },
+        {
+          "refKey": "extProps",
+          "freeze": false,
+          "hideInGraph": true
+        },
+        {
+          "refKey": "attr1",
+          "freeze": false,
+          "hideInGraph": true
+        },
+        {
+          "refKey": "attr2",
+          "freeze": false,
+          "hideInGraph": true
+        },
+        {
+          "refKey": "attr3",
+          "freeze": false,
+          "hideInGraph": true
+        },
+        {
+          "refKey": "attr4",
+          "freeze": false,
+          "hideInGraph": true
+        },
+        {
+          "refKey": "attr5",
+          "freeze": false,
+          "hideInGraph": true
+        },
+        {
+          "refKey": "attr6",
+          "freeze": false,
+          "hideInGraph": true
+        },
+        {
+          "refKey": "attr7",
+          "freeze": false,
+          "hideInGraph": true
+        },
+        {
+          "refKey": "attr8",
+          "freeze": false,
+          "hideInGraph": true
+        },
+        {
+          "refKey": "attr9",
+          "freeze": false,
+          "hideInGraph": true
+        }
+      ],
+      "fields": [
+        {
+          "defKey": "tenant_id",
+          "defName": "租户号",
+          "comment": "",
+          "type": "",
+          "len": 32,
+          "scale": "",
+          "primaryKey": false,
+          "notNull": false,
+          "autoIncrement": false,
+          "defaultValue": "",
+          "hideInGraph": true,
+          "domain": "16120F75-6AA7-4483-868D-F07F511BB081",
+          "refDict": "",
+          "uiHint": "",
+          "id": "3496EF62-6B3D-46CA-AA12-3D4FD7B799CB"
+        },
+        {
+          "defKey": "create_user",
+          "defName": "创建人",
+          "comment": "",
+          "domain": "16120F75-6AA7-4483-868D-F07F511BB081",
+          "type": "",
+          "len": 32,
+          "scale": "",
+          "primaryKey": false,
+          "notNull": false,
+          "autoIncrement": false,
+          "defaultValue": "",
+          "hideInGraph": true,
+          "refDict": "",
+          "uiHint": "",
+          "id": "06869D26-E9C6-45F3-A6E2-86942F9A63F0"
+        },
+        {
+          "defKey": "create_time",
+          "defName": "创建时间",
+          "comment": "",
+          "domain": "7CFFA0D3-6A93-4DDC-BC10-DF21211064DC",
+          "type": "",
+          "len": "",
+          "scale": "",
+          "primaryKey": false,
+          "notNull": false,
+          "autoIncrement": false,
+          "defaultValue": "",
+          "hideInGraph": true,
+          "refDict": "",
+          "uiHint": "",
+          "id": "DD43FFCC-192F-487B-B657-610EC75CDD41"
+        },
+        {
+          "defKey": "update_user",
+          "defName": "更新人",
+          "comment": "",
+          "domain": "16120F75-6AA7-4483-868D-F07F511BB081",
+          "type": "",
+          "len": 32,
+          "scale": "",
+          "primaryKey": false,
+          "notNull": false,
+          "autoIncrement": false,
+          "defaultValue": "",
+          "hideInGraph": true,
+          "refDict": "",
+          "uiHint": "",
+          "id": "FD924B56-8042-47F0-83DF-1C438C24D4B0"
+        },
+        {
+          "defKey": "update_time",
+          "defName": "更新时间",
+          "comment": "",
+          "domain": "7CFFA0D3-6A93-4DDC-BC10-DF21211064DC",
+          "type": "",
+          "len": "",
+          "scale": "",
+          "primaryKey": false,
+          "notNull": false,
+          "autoIncrement": false,
+          "defaultValue": "",
+          "hideInGraph": true,
+          "refDict": "",
+          "uiHint": "",
+          "id": "7B9C8E59-157B-4737-AEB4-85C6C2E1A5E8"
+        },
+        {
+          "defKey": "status",
+          "defName": "状态",
+          "comment": "",
+          "type": "INT",
+          "len": 2,
+          "scale": "",
+          "primaryKey": false,
+          "notNull": false,
+          "autoIncrement": false,
+          "defaultValue": "",
+          "hideInGraph": false,
+          "refDict": "",
+          "extProps": {},
+          "domain": "",
+          "id": "8C22F71D-3495-46AC-A2B1-DB8AFEFF0023"
+        },
+        {
+          "defKey": "is_deleted",
+          "defName": "是否已删除",
+          "comment": "",
+          "type": "INT",
+          "len": 2,
+          "scale": "",
+          "primaryKey": false,
+          "notNull": false,
+          "autoIncrement": false,
+          "defaultValue": "",
+          "hideInGraph": false,
+          "refDict": "",
+          "extProps": {},
+          "domain": "",
+          "id": "1DC02C6F-B577-4CD5-9387-57F884C7D0C6"
+        },
+        {
+          "defKey": "create_dept",
+          "defName": "创建部门",
+          "comment": "",
+          "type": "",
+          "len": "",
+          "scale": "",
+          "primaryKey": false,
+          "notNull": false,
+          "autoIncrement": false,
+          "defaultValue": "",
+          "hideInGraph": false,
+          "refDict": "",
+          "extProps": {},
+          "domain": "6BC8F04B-6CFA-4995-98D3-318F5CDD774E",
+          "id": "3FDE7DB5-A53D-440B-A06C-F55B35C6E987"
+        },
+        {
+          "defKey": "id",
+          "defName": "主键",
+          "comment": "",
+          "type": "INT",
+          "len": 20,
+          "scale": "",
+          "primaryKey": true,
+          "notNull": true,
+          "autoIncrement": false,
+          "defaultValue": "",
+          "hideInGraph": false,
+          "refDict": "",
+          "extProps": {},
+          "domain": "",
+          "id": "C0FCE8D7-633E-4F2B-88EF-0A549A851356"
+        },
+        {
+          "defKey": "reserve1",
+          "defName": "预留1",
+          "comment": "",
+          "type": "",
+          "len": "",
+          "scale": "",
+          "primaryKey": false,
+          "notNull": false,
+          "autoIncrement": false,
+          "defaultValue": "",
+          "hideInGraph": false,
+          "refDict": "",
+          "extProps": {},
+          "domain": "9092C4E0-1A54-4859-ABBB-5B62DBC27573",
+          "id": "DB5B1289-A6F2-4C41-9803-485CD1669ABA"
+        },
+        {
+          "defKey": "reserve2",
+          "defName": "预留2",
+          "comment": "",
+          "type": "",
+          "len": "",
+          "scale": "",
+          "primaryKey": false,
+          "notNull": false,
+          "autoIncrement": false,
+          "defaultValue": "",
+          "hideInGraph": false,
+          "refDict": "",
+          "extProps": {},
+          "domain": "9092C4E0-1A54-4859-ABBB-5B62DBC27573",
+          "id": "F018FCF9-993F-4778-8194-BB54364AC9F3"
+        },
+        {
+          "defKey": "reserve3",
+          "defName": "预留3",
+          "comment": "",
+          "type": "",
+          "len": "",
+          "scale": "",
+          "primaryKey": false,
+          "notNull": false,
+          "autoIncrement": false,
+          "defaultValue": "",
+          "hideInGraph": false,
+          "refDict": "",
+          "extProps": {},
+          "domain": "9092C4E0-1A54-4859-ABBB-5B62DBC27573",
+          "id": "DE3A9664-369B-4F9A-A12F-E735455DADE0"
+        },
+        {
+          "defKey": "reserve4",
+          "defName": "预留4",
+          "comment": "",
+          "type": "",
+          "len": "",
+          "scale": "",
+          "primaryKey": false,
+          "notNull": false,
+          "autoIncrement": false,
+          "defaultValue": "",
+          "hideInGraph": false,
+          "refDict": "",
+          "extProps": {},
+          "domain": "9092C4E0-1A54-4859-ABBB-5B62DBC27573",
+          "id": "781B1F51-F891-4F6B-A2FA-BE14C89C3428"
+        },
+        {
+          "defKey": "reserve5",
+          "defName": "预留5",
+          "comment": "",
+          "type": "",
+          "len": "",
+          "scale": "",
+          "primaryKey": false,
+          "notNull": false,
+          "autoIncrement": false,
+          "defaultValue": "",
+          "hideInGraph": false,
+          "refDict": "",
+          "extProps": {},
+          "domain": "9092C4E0-1A54-4859-ABBB-5B62DBC27573",
+          "id": "02EF13CE-BEA7-4370-8557-733F801B36CB"
+        },
+        {
+          "defKey": "client",
+          "defName": "客户ID",
+          "comment": "",
+          "type": "",
+          "len": "",
+          "scale": "",
+          "primaryKey": false,
+          "notNull": false,
+          "autoIncrement": false,
+          "defaultValue": "",
+          "hideInGraph": false,
+          "refDict": "",
+          "extProps": {},
+          "domain": "9092C4E0-1A54-4859-ABBB-5B62DBC27573",
+          "id": "8A3579EB-9294-4EB3-B9DA-F149083C5510"
+        },
+        {
+          "defKey": "tripartite_mall",
+          "defName": "三方商城",
+          "comment": "",
+          "type": "",
+          "len": "",
+          "scale": "",
+          "primaryKey": false,
+          "notNull": false,
+          "autoIncrement": false,
+          "defaultValue": "",
+          "hideInGraph": false,
+          "refDict": "",
+          "extProps": {},
+          "domain": "9092C4E0-1A54-4859-ABBB-5B62DBC27573",
+          "id": "0A43D4D4-034E-4733-B84B-7E09650C3BED"
+        },
+        {
+          "defKey": "tripartite_coding",
+          "defName": "三方编码",
+          "comment": "",
+          "type": "",
+          "len": "",
+          "scale": "",
+          "primaryKey": false,
+          "notNull": false,
+          "autoIncrement": false,
+          "defaultValue": "",
+          "hideInGraph": false,
+          "refDict": "",
+          "extProps": {},
+          "domain": "9092C4E0-1A54-4859-ABBB-5B62DBC27573",
+          "id": "EAB3535F-E4FE-43C6-8759-F658171BA9CF"
+        }
+      ],
+      "correlations": [],
+      "indexes": []
     }
   ],
   "views": [],
@@ -49128,7 +49603,8 @@
         "B8E50F9F-033E-4F86-8443-D849F4A0F013",
         "865E2039-46B4-4BF2-948F-696FFB16E73E",
         "74441E51-EDB1-49F8-AD27-8506AF889909",
-        "02AD799B-26B6-4490-AC39-A95DC978399D"
+        "02AD799B-26B6-4490-AC39-A95DC978399D",
+        "0781B8B3-6956-45F3-A2CA-8CF2180577BD"
       ],
       "refViews": [],
       "refDiagrams": [],
@@ -49710,4 +50186,4 @@
     }
   ],
   "dbConn": []
-}
+}