diff --git a/src/main/java/com/sczx/store/controller/StorePubController.java b/src/main/java/com/sczx/store/controller/PubController.java
similarity index 50%
rename from src/main/java/com/sczx/store/controller/StorePubController.java
rename to src/main/java/com/sczx/store/controller/PubController.java
index 2650d7c..f42c039 100644
--- a/src/main/java/com/sczx/store/controller/StorePubController.java
+++ b/src/main/java/com/sczx/store/controller/PubController.java
@@ -2,13 +2,17 @@ package com.sczx.store.controller;
import com.sczx.store.common.Result;
+import com.sczx.store.dto.CompanyDTO;
import com.sczx.store.dto.CompanyStoreDTO;
-import com.sczx.store.dto.req.StoreChangeReq;
+import com.sczx.store.service.CompanyService;
import com.sczx.store.service.StoreService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
/**
*
@@ -18,18 +22,26 @@ import org.springframework.web.bind.annotation.*;
* @author zhangli
* @since 2025-07-08 21:16:36
*/
-@Api(value = "门店公共接口", tags = "公共接口")
+@Api(value = "公共接口", tags = "公共接口")
@RestController
@RequestMapping("/pub")
-public class StorePubController {
+public class PubController {
@Autowired
private StoreService storeService;
+ @Autowired
+ private CompanyService companyService;
+
@ApiOperation(value = "根据门店id查询门店信息")
@GetMapping("/getStoreById")
public Result getStoreById(@RequestParam(name = "storeId") Integer storeId){
return Result.ok(storeService.getStoreById(storeId));
}
+ @ApiOperation(value = "根据门店id查询门店信息")
+ @GetMapping("/getCompanyById")
+ public Result getCompanyById(@RequestParam(name = "companyId") Integer companyId){
+ return Result.ok(companyService.getCompanyById(companyId));
+ }
}
diff --git a/src/main/java/com/sczx/store/convert/CompanyConvert.java b/src/main/java/com/sczx/store/convert/CompanyConvert.java
new file mode 100644
index 0000000..f4241c7
--- /dev/null
+++ b/src/main/java/com/sczx/store/convert/CompanyConvert.java
@@ -0,0 +1,13 @@
+package com.sczx.store.convert;
+
+import com.sczx.store.dto.CompanyDTO;
+import com.sczx.store.po.CompanyPO;
+import org.mapstruct.Mapper;
+import org.mapstruct.factory.Mappers;
+
+@Mapper
+public interface CompanyConvert {
+ CompanyConvert INSTANCE = Mappers.getMapper(CompanyConvert.class);
+ CompanyPO dtoToPO(CompanyDTO dto);
+ CompanyDTO poToDTO(CompanyPO po);
+}
diff --git a/src/main/java/com/sczx/store/dto/CompanyDTO.java b/src/main/java/com/sczx/store/dto/CompanyDTO.java
new file mode 100644
index 0000000..774bf2e
--- /dev/null
+++ b/src/main/java/com/sczx/store/dto/CompanyDTO.java
@@ -0,0 +1,165 @@
+package com.sczx.store.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+
+/**
+ *
+ * 运营商表
+ *
+ *
+ * @author zhangli
+ * @since 2025-08-23 23:21:15
+ */
+
+
+@ApiModel(value = "CompanyPO对象", description = "运营商表")
+@Data
+public class CompanyDTO{
+
+
+ @ApiModelProperty("公司ID")
+ private Integer id;
+
+ @ApiModelProperty("公司名称")
+ private String companyName;
+
+ @ApiModelProperty("联系人姓名")
+ private String contactName;
+
+ @ApiModelProperty("联系电话")
+ private String phone;
+
+ @ApiModelProperty("公司地址")
+ private String address;
+
+ @ApiModelProperty("账户余额")
+ private BigDecimal balance;
+
+ @ApiModelProperty("押金/保证金金额")
+ private BigDecimal deposit;
+
+ @ApiModelProperty("公司类型(用数字表示的分类)")
+ private Integer type;
+
+ @ApiModelProperty("是否已删除")
+ private Boolean isDelete;
+
+ @ApiModelProperty("是否允许拆分账单")
+ private Boolean allowSplitBill;
+
+ @ApiModelProperty("最大百分比")
+ private BigDecimal maxPercentage;
+
+ @ApiModelProperty("是否可新增套餐")
+ private String isAddRules;
+
+ @ApiModelProperty("租车平台分成比例")
+ private Integer sharingRatio;
+
+ @ApiModelProperty("微信支付模式")
+ private String wechatPayModel;
+
+ @ApiModelProperty("微信收款商户号")
+ private String wechatReceivingAccount;
+
+ @ApiModelProperty("微信收款密钥")
+ private String wechatKey;
+
+ @ApiModelProperty("计费模式")
+ private Integer chargeMode;
+
+ @ApiModelProperty("计费参数")
+ private BigDecimal chargeParam;
+
+ @ApiModelProperty("是否允许修改")
+ private Boolean allowChange;
+
+ @ApiModelProperty("渠道/通路ID")
+ private Integer channelId;
+
+ @ApiModelProperty("运营商管理城市")
+ private String citys;
+
+ @ApiModelProperty("运营商管理城市")
+ private String cityName;
+
+ @ApiModelProperty("支付宝支付模式")
+ private Integer aliPayModel;
+
+ @ApiModelProperty("支付宝收款商户号")
+ private String aliReceivingAccount;
+
+ @ApiModelProperty("支付宝收款密钥")
+ private String aliKey;
+
+ @ApiModelProperty("服务费收费订单类型")
+ private String serviceOrderType;
+
+ @ApiModelProperty("分账订单类型")
+ private String splitOrderType;
+
+ @ApiModelProperty("微信公共平台余额")
+ private BigDecimal wechatBalance;
+
+ @ApiModelProperty("支付宝公共平台余额")
+ private BigDecimal alipayBalance;
+
+ @ApiModelProperty("邀请奖励模式")
+ private Integer inviteRewardMode;
+
+ @ApiModelProperty("邀请奖励参数")
+ private BigDecimal inviteRewardParam;
+
+ @ApiModelProperty("奖励方式")
+ private Integer rewardType;
+
+ @ApiModelProperty("奖励参数")
+ private BigDecimal rewardParam;
+
+ @ApiModelProperty("是否预约")
+ private Boolean isReservation;
+
+ @ApiModelProperty("预约时长")
+ private Integer reservationDuration;
+
+ @ApiModelProperty("预约次数")
+ private Integer reservationNumber;
+
+ @ApiModelProperty("部门状态(0正常 1停用)")
+ private String status;
+
+ @ApiModelProperty("删除标志(0代表存在 2代表删除)")
+ private String delFlag;
+
+ @ApiModelProperty("创建者")
+ private String createBy;
+
+ @ApiModelProperty("创建时间")
+ private LocalDateTime createTime;
+
+ @ApiModelProperty("更新者")
+ private String updateBy;
+
+ @ApiModelProperty("更新时间")
+ private LocalDateTime updateTime;
+
+ private String extend1;
+
+ private String extend2;
+
+ private String extend3;
+
+ private String extend4;
+
+ private String extend5;
+
+ @ApiModelProperty("充电平台运营商ID")
+ private Long bOpId;
+
+
+}
diff --git a/src/main/java/com/sczx/store/mapper/CompanyMapper.java b/src/main/java/com/sczx/store/mapper/CompanyMapper.java
new file mode 100644
index 0000000..db01c54
--- /dev/null
+++ b/src/main/java/com/sczx/store/mapper/CompanyMapper.java
@@ -0,0 +1,16 @@
+package com.sczx.store.mapper;
+
+import com.sczx.store.po.CompanyPO;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ *
+ * 运营商表 Mapper 接口
+ *
+ *
+ * @author zhangli
+ * @since 2025-08-23 23:21:15
+ */
+public interface CompanyMapper extends BaseMapper {
+
+}
diff --git a/src/main/java/com/sczx/store/po/CompanyPO.java b/src/main/java/com/sczx/store/po/CompanyPO.java
new file mode 100644
index 0000000..6b029fc
--- /dev/null
+++ b/src/main/java/com/sczx/store/po/CompanyPO.java
@@ -0,0 +1,171 @@
+package com.sczx.store.po;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ *
+ * 运营商表
+ *
+ *
+ * @author zhangli
+ * @since 2025-08-23 23:21:15
+ */
+@Getter
+@Setter
+@TableName("zc_company")
+@ApiModel(value = "CompanyPO对象", description = "运营商表")
+public class CompanyPO implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ @ApiModelProperty("公司ID")
+ @TableId(value = "id", type = IdType.AUTO)
+ private Integer id;
+
+ @ApiModelProperty("公司名称")
+ private String companyName;
+
+ @ApiModelProperty("联系人姓名")
+ private String contactName;
+
+ @ApiModelProperty("联系电话")
+ private String phone;
+
+ @ApiModelProperty("公司地址")
+ private String address;
+
+ @ApiModelProperty("账户余额")
+ private BigDecimal balance;
+
+ @ApiModelProperty("押金/保证金金额")
+ private BigDecimal deposit;
+
+ @ApiModelProperty("公司类型(用数字表示的分类)")
+ private Integer type;
+
+ @ApiModelProperty("是否已删除")
+ private Boolean isDelete;
+
+ @ApiModelProperty("是否允许拆分账单")
+ private Boolean allowSplitBill;
+
+ @ApiModelProperty("最大百分比")
+ private BigDecimal maxPercentage;
+
+ @ApiModelProperty("是否可新增套餐")
+ private String isAddRules;
+
+ @ApiModelProperty("租车平台分成比例")
+ private Integer sharingRatio;
+
+ @ApiModelProperty("微信支付模式")
+ private String wechatPayModel;
+
+ @ApiModelProperty("微信收款商户号")
+ private String wechatReceivingAccount;
+
+ @ApiModelProperty("微信收款密钥")
+ private String wechatKey;
+
+ @ApiModelProperty("计费模式")
+ private Integer chargeMode;
+
+ @ApiModelProperty("计费参数")
+ private BigDecimal chargeParam;
+
+ @ApiModelProperty("是否允许修改")
+ private Boolean allowChange;
+
+ @ApiModelProperty("渠道/通路ID")
+ private Integer channelId;
+
+ @ApiModelProperty("运营商管理城市")
+ private String citys;
+
+ @ApiModelProperty("运营商管理城市")
+ private String cityName;
+
+ @ApiModelProperty("支付宝支付模式")
+ private Integer aliPayModel;
+
+ @ApiModelProperty("支付宝收款商户号")
+ private String aliReceivingAccount;
+
+ @ApiModelProperty("支付宝收款密钥")
+ private String aliKey;
+
+ @ApiModelProperty("服务费收费订单类型")
+ private String serviceOrderType;
+
+ @ApiModelProperty("分账订单类型")
+ private String splitOrderType;
+
+ @ApiModelProperty("微信公共平台余额")
+ private BigDecimal wechatBalance;
+
+ @ApiModelProperty("支付宝公共平台余额")
+ private BigDecimal alipayBalance;
+
+ @ApiModelProperty("邀请奖励模式")
+ private Integer inviteRewardMode;
+
+ @ApiModelProperty("邀请奖励参数")
+ private BigDecimal inviteRewardParam;
+
+ @ApiModelProperty("奖励方式")
+ private Integer rewardType;
+
+ @ApiModelProperty("奖励参数")
+ private BigDecimal rewardParam;
+
+ @ApiModelProperty("是否预约")
+ private Boolean isReservation;
+
+ @ApiModelProperty("预约时长")
+ private Integer reservationDuration;
+
+ @ApiModelProperty("预约次数")
+ private Integer reservationNumber;
+
+ @ApiModelProperty("部门状态(0正常 1停用)")
+ private String status;
+
+ @ApiModelProperty("删除标志(0代表存在 2代表删除)")
+ private String delFlag;
+
+ @ApiModelProperty("创建者")
+ private String createBy;
+
+ @ApiModelProperty("创建时间")
+ private LocalDateTime createTime;
+
+ @ApiModelProperty("更新者")
+ private String updateBy;
+
+ @ApiModelProperty("更新时间")
+ private LocalDateTime updateTime;
+
+ private String extend1;
+
+ private String extend2;
+
+ private String extend3;
+
+ private String extend4;
+
+ private String extend5;
+
+ @ApiModelProperty("充电平台运营商ID")
+ private Long bOpId;
+
+
+}
diff --git a/src/main/java/com/sczx/store/repository/CompanyRepo.java b/src/main/java/com/sczx/store/repository/CompanyRepo.java
new file mode 100644
index 0000000..12467a6
--- /dev/null
+++ b/src/main/java/com/sczx/store/repository/CompanyRepo.java
@@ -0,0 +1,16 @@
+package com.sczx.store.repository;
+
+import com.sczx.store.po.CompanyPO;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ *
+ * 运营商表 服务类
+ *
+ *
+ * @author zhangli
+ * @since 2025-08-23 23:21:15
+ */
+public interface CompanyRepo extends IService {
+
+}
diff --git a/src/main/java/com/sczx/store/repository/impl/CompanyRepoImpl.java b/src/main/java/com/sczx/store/repository/impl/CompanyRepoImpl.java
new file mode 100644
index 0000000..95799cd
--- /dev/null
+++ b/src/main/java/com/sczx/store/repository/impl/CompanyRepoImpl.java
@@ -0,0 +1,20 @@
+package com.sczx.store.repository.impl;
+
+import com.sczx.store.po.CompanyPO;
+import com.sczx.store.mapper.CompanyMapper;
+import com.sczx.store.repository.CompanyRepo;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ *
+ * 运营商表 服务实现类
+ *
+ *
+ * @author zhangli
+ * @since 2025-08-23 23:21:15
+ */
+@Service
+public class CompanyRepoImpl extends ServiceImpl implements CompanyRepo {
+
+}
diff --git a/src/main/java/com/sczx/store/service/CompanyService.java b/src/main/java/com/sczx/store/service/CompanyService.java
new file mode 100644
index 0000000..73347a5
--- /dev/null
+++ b/src/main/java/com/sczx/store/service/CompanyService.java
@@ -0,0 +1,7 @@
+package com.sczx.store.service;
+
+import com.sczx.store.dto.CompanyDTO;
+
+public interface CompanyService {
+ CompanyDTO getCompanyById(Integer id);
+}
diff --git a/src/main/java/com/sczx/store/service/impl/CompanyServiceImpl.java b/src/main/java/com/sczx/store/service/impl/CompanyServiceImpl.java
new file mode 100644
index 0000000..7d26185
--- /dev/null
+++ b/src/main/java/com/sczx/store/service/impl/CompanyServiceImpl.java
@@ -0,0 +1,24 @@
+package com.sczx.store.service.impl;
+
+import com.sczx.store.convert.CompanyConvert;
+import com.sczx.store.dto.CompanyDTO;
+import com.sczx.store.po.CompanyPO;
+import com.sczx.store.repository.CompanyRepo;
+import com.sczx.store.service.CompanyService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+@Slf4j
+@Service
+public class CompanyServiceImpl implements CompanyService {
+
+ @Autowired
+ private CompanyRepo companyRepo;
+
+ @Override
+ public CompanyDTO getCompanyById(Integer id) {
+ CompanyPO companyPO = companyRepo.getById(id);
+ return CompanyConvert.INSTANCE.poToDTO(companyPO);
+ }
+}
diff --git a/src/main/resources/mapper/CompanyMapper.xml b/src/main/resources/mapper/CompanyMapper.xml
new file mode 100644
index 0000000..39e7927
--- /dev/null
+++ b/src/main/resources/mapper/CompanyMapper.xml
@@ -0,0 +1,5 @@
+
+
+
+
+