diff --git a/coolstore-partner-common/src/main/java/com/cool/store/constants/CommonConstants.java b/coolstore-partner-common/src/main/java/com/cool/store/constants/CommonConstants.java index 6beb0c343..3087f9ee0 100644 --- a/coolstore-partner-common/src/main/java/com/cool/store/constants/CommonConstants.java +++ b/coolstore-partner-common/src/main/java/com/cool/store/constants/CommonConstants.java @@ -147,4 +147,7 @@ public class CommonConstants { public static final String FOLLOW_TASK_NOTICE_KEY = "follow_task_notice:{0}:{1}"; + public static final Long LONG_ONE = 1L; + + } diff --git a/coolstore-partner-common/src/main/java/com/cool/store/enums/ErrorCodeEnum.java b/coolstore-partner-common/src/main/java/com/cool/store/enums/ErrorCodeEnum.java index 085f9e46b..c3d14081f 100644 --- a/coolstore-partner-common/src/main/java/com/cool/store/enums/ErrorCodeEnum.java +++ b/coolstore-partner-common/src/main/java/com/cool/store/enums/ErrorCodeEnum.java @@ -78,6 +78,7 @@ public enum ErrorCodeEnum { INVESTMENT_MANAGER_NOT_EXIST(500016, "当前招商经理不存在", null), PARTNER_MOBILE_EXIST_0(500017, "手机号码已存在", null), TIME_OCCUPIED(500018, "预约时间被占用", null), + LINE_PAY_IS_NOT_EXIST(500019, "意向金信息不存在！", null), INTERVIEW_ENTER_FAIL(1021101, "进入面审间失败", null), @@ -135,6 +136,8 @@ public enum ErrorCodeEnum { OPEN_AREA_IS_NOT_EXISTS(107006, "意向区域城市不存在", null), + + REGION_NOT_EXIST(108001, "区域不存在",null), ; diff --git a/coolstore-partner-common/src/main/java/com/cool/store/utils/RedisConstantUtil.java b/coolstore-partner-common/src/main/java/com/cool/store/utils/RedisConstantUtil.java index 2105a7c7b..3e0962fa4 100644 --- a/coolstore-partner-common/src/main/java/com/cool/store/utils/RedisConstantUtil.java +++ b/coolstore-partner-common/src/main/java/com/cool/store/utils/RedisConstantUtil.java @@ -19,6 +19,9 @@ public class RedisConstantUtil { @Value("${spring.profiles.active}") private String active; + @Value("${mybatis.configuration.variables.enterpriseId}") + private String eid; + /** * 获取钉钉同步区域key * @@ -87,7 +90,7 @@ public class RedisConstantUtil { return active + "_" + RedisConstant.GUIDE_INFO + eid + ":" + menuId; } - public String getRegionNameListKey(String eid, String regionId) { + public String getRegionNameListKey(String regionId) { return active + "_" + RedisConstant.REGION_ALL_NAME_CACHE + eid + ":" + regionId; } diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/dao/BankDAO.java b/coolstore-partner-dao/src/main/java/com/cool/store/dao/BankDAO.java new file mode 100644 index 000000000..dbf3ea774 --- /dev/null +++ b/coolstore-partner-dao/src/main/java/com/cool/store/dao/BankDAO.java @@ -0,0 +1,40 @@ +package com.cool.store.dao; + +import com.cool.store.entity.BankdocDO; +import com.cool.store.entity.BanktypeDO; +import com.cool.store.mapper.BankdocMapper; +import com.cool.store.mapper.BanktypeMapper; +import com.cool.store.request.BranchBankPageRequest; +import com.github.pagehelper.Page; +import com.github.pagehelper.PageHelper; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Repository; + +import javax.annotation.Resource; +import java.util.List; + +/** + * @author wxp + * @FileName: BankDAO + * @Description: + * @date 2024-03-19 10:49 + */ +@Slf4j +@Repository +public class BankDAO { + + @Resource + private BanktypeMapper banktypeMapper; + @Resource + private BankdocMapper bankdocMapper; + + public List listBank() { + List bankList = banktypeMapper.listBank(); + return bankList; + } + + public Page listBranchBank(BranchBankPageRequest request){ + PageHelper.startPage(request.getPageNum(), request.getPageSize()); + return bankdocMapper.listBranchBank(request); + } +} diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/dao/LineInfoDAO.java b/coolstore-partner-dao/src/main/java/com/cool/store/dao/LineInfoDAO.java index f25179aa3..0468fa252 100644 --- a/coolstore-partner-dao/src/main/java/com/cool/store/dao/LineInfoDAO.java +++ b/coolstore-partner-dao/src/main/java/com/cool/store/dao/LineInfoDAO.java @@ -88,4 +88,8 @@ public class LineInfoDAO { List lineInfo = lineInfoMapper.lineList(lineListRequest,userId,wantShopAreaIds); return lineInfo; } + + public void insertOrUpdate(LineInfoDO lineInfoParam){ + lineInfoMapper.insertOrUpdate(lineInfoParam); + } } diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/dao/LinePayDAO.java b/coolstore-partner-dao/src/main/java/com/cool/store/dao/LinePayDAO.java new file mode 100644 index 000000000..e1a3465cc --- /dev/null +++ b/coolstore-partner-dao/src/main/java/com/cool/store/dao/LinePayDAO.java @@ -0,0 +1,41 @@ +package com.cool.store.dao; + +import com.cool.store.entity.LinePayDO; +import com.cool.store.mapper.LinePayMapper; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Repository; + +import javax.annotation.Resource; +import java.util.Objects; + +/** + * @author wxp + * @FileName: LinePayDAO + * @Description:提交意向金 + * @date 2024-03-27 14:33 + */ +@Slf4j +@Repository +public class LinePayDAO { + + @Resource + private LinePayMapper linePayMapper; + + public LinePayDO getLinePayByLineId(Long lineId) { + LinePayDO linePayDO = linePayMapper.getLinePayByLineId(lineId); + return linePayDO; + } + + public Long addLinePay(LinePayDO linePayDO){ + linePayMapper.insertSelective(linePayDO); + return linePayDO.getId(); + } + + public Integer updateLinePay(LinePayDO linePayDO){ + if(Objects.isNull(linePayDO)){ + return 0; + } + return linePayMapper.updateByPrimaryKeySelective(linePayDO); + } + +} diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/dao/RegionAreaConfigDao.java b/coolstore-partner-dao/src/main/java/com/cool/store/dao/RegionAreaConfigDao.java new file mode 100644 index 000000000..be97e1a12 --- /dev/null +++ b/coolstore-partner-dao/src/main/java/com/cool/store/dao/RegionAreaConfigDao.java @@ -0,0 +1,51 @@ +package com.cool.store.dao; + +import com.cool.store.entity.RegionAreaConfigDO; +import com.cool.store.mapper.RegionAreaConfigMapper; +import org.apache.commons.collections4.CollectionUtils; +import org.springframework.stereotype.Repository; + +import javax.annotation.Resource; +import java.util.Collections; +import java.util.List; + +/** + * @author wxp + * @ClassName RegionAreaConfigDao + * @Description 用一句话描述什么 + */ +@Repository +public class RegionAreaConfigDao { + + @Resource + private RegionAreaConfigMapper regionAreaConfigMapper; + + public void deleteRegionAreaConfigByRegionId(Long regionId) { + if (regionId == null) { + return; + } + regionAreaConfigMapper.deleteRegionAreaConfigByRegionId(regionId); + } + + public void batchInsertOrUpdateRegionAreaConfig(List regionAreaConfigList) { + if (CollectionUtils.isEmpty(regionAreaConfigList)) { + return; + } + regionAreaConfigMapper.batchInsertOrUpdateRegionAreaConfig(regionAreaConfigList); + } + + public List listAreaByRegionId(Long regionId){ + if (regionId == null) { + return Collections.emptyList(); + } + return regionAreaConfigMapper.listAreaByRegionId(regionId); + } + + public Long getByWantShopAreaId(Long wantShopAreaId){ + if (wantShopAreaId == null) { + return 0L; + } + return regionAreaConfigMapper.getByWantShopAreaId(wantShopAreaId); + } + +} diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/dao/RegionQrcodeConfigDao.java b/coolstore-partner-dao/src/main/java/com/cool/store/dao/RegionQrcodeConfigDao.java new file mode 100644 index 000000000..6b360687b --- /dev/null +++ b/coolstore-partner-dao/src/main/java/com/cool/store/dao/RegionQrcodeConfigDao.java @@ -0,0 +1,32 @@ +package com.cool.store.dao; + +import com.cool.store.entity.RegionQrcodeConfigDO; +import com.cool.store.mapper.RegionQrcodeConfigMapper; +import org.springframework.stereotype.Repository; + +import javax.annotation.Resource; +import java.util.Objects; + +/** + * @author wxp + * @ClassName RegionDao + * @Description 用一句话描述什么 + */ +@Repository +public class RegionQrcodeConfigDao { + + @Resource + private RegionQrcodeConfigMapper regionQrcodeConfigMapper; + + public String getPayPicByRegionId(Long regionId) { + if ( Objects.isNull(regionId)) { + return ""; + } + RegionQrcodeConfigDO regionQrcodeConfigDO = regionQrcodeConfigMapper.getByRegionId(regionId); + if(regionQrcodeConfigDO != null){ + return regionQrcodeConfigDO.getPayPic(); + } + return ""; + } + +} diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/BankdocMapper.java b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/BankdocMapper.java new file mode 100644 index 000000000..e5746cd73 --- /dev/null +++ b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/BankdocMapper.java @@ -0,0 +1,26 @@ +package com.cool.store.mapper; + +import com.cool.store.dto.interview.LineInterviewPageDTO; +import com.cool.store.entity.BankdocDO; +import com.cool.store.request.BranchBankPageRequest; +import com.cool.store.request.LineInterviewPageRequest; +import com.github.pagehelper.Page; + +import java.util.List; + +/** + * @author wxp + * @date 2024-03-27 09:25 + */ +public interface BankdocMapper { + /** + * + * 默认插入方法，只会给有值的字段赋值 + * 会对传进来的字段做判空处理，如果字段为空，则使用数据库默认字段或者null + * dateTime:2024-03-27 09:25 + */ + int insertSelective(BankdocDO record); + + Page listBranchBank(BranchBankPageRequest request); + +} \ No newline at end of file diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/BanktypeMapper.java b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/BanktypeMapper.java new file mode 100644 index 000000000..06c251273 --- /dev/null +++ b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/BanktypeMapper.java @@ -0,0 +1,43 @@ +package com.cool.store.mapper; + +import com.cool.store.entity.BanktypeDO; + +import java.util.List; + +/** + * @author wxp + * @date 2024-03-27 09:25 + */ +public interface BanktypeMapper { + /** + * + * 默认插入方法，只会给有值的字段赋值 + * 会对传进来的字段做判空处理，如果字段为空，则使用数据库默认字段或者null + * dateTime:2024-03-27 09:25 + */ + int insertSelective(BanktypeDO record); + + /** + * + * 默认查询方法，通过主键获取所有字段的值 + * dateTime:2024-03-27 09:25 + */ + BanktypeDO selectByPrimaryKey(String pkBanktype); + + /** + * + * 默认更新方法，根据主键更新，不会把null值更新到数据库，避免覆盖之前有值的 + * dateTime:2024-03-27 09:25 + */ + int updateByPrimaryKeySelective(BanktypeDO record); + + /** + * + * 默认更新方法，根据主键物理删除 + * dateTime:2024-03-27 09:25 + */ + int deleteByPrimaryKey(String pkBanktype); + + List listBank(); + +} \ No newline at end of file diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/LinePayMapper.java b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/LinePayMapper.java new file mode 100644 index 000000000..15092a6e6 --- /dev/null +++ b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/LinePayMapper.java @@ -0,0 +1,42 @@ +package com.cool.store.mapper; + +import com.cool.store.entity.LinePayDO; +import org.apache.ibatis.annotations.Param; + +/** + * @author wxp + * @date 2024-03-27 09:25 + */ +public interface LinePayMapper { + /** + * + * 默认插入方法，只会给有值的字段赋值 + * 会对传进来的字段做判空处理，如果字段为空，则使用数据库默认字段或者null + * dateTime:2024-03-27 09:25 + */ + int insertSelective(LinePayDO record); + + /** + * + * 默认查询方法，通过主键获取所有字段的值 + * dateTime:2024-03-27 09:25 + */ + LinePayDO selectByPrimaryKey(Long id); + + /** + * + * 默认更新方法，根据主键更新，不会把null值更新到数据库，避免覆盖之前有值的 + * dateTime:2024-03-27 09:25 + */ + int updateByPrimaryKeySelective(LinePayDO record); + + /** + * + * 默认更新方法，根据主键物理删除 + * dateTime:2024-03-27 09:25 + */ + int deleteByPrimaryKey(Long id); + + LinePayDO getLinePayByLineId(@Param("lineId") Long lineId); + +} \ No newline at end of file diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/RegionAreaConfigMapper.java b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/RegionAreaConfigMapper.java new file mode 100644 index 000000000..9c2cee905 --- /dev/null +++ b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/RegionAreaConfigMapper.java @@ -0,0 +1,50 @@ +package com.cool.store.mapper; + +import com.cool.store.entity.RegionAreaConfigDO; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + * @author wxp + * @date 2024-03-27 09:25 + */ +public interface RegionAreaConfigMapper { + /** + * + * 默认插入方法，只会给有值的字段赋值 + * 会对传进来的字段做判空处理，如果字段为空，则使用数据库默认字段或者null + * dateTime:2024-03-27 09:25 + */ + int insertSelective(RegionAreaConfigDO record); + + /** + * + * 默认查询方法，通过主键获取所有字段的值 + * dateTime:2024-03-27 09:25 + */ + RegionAreaConfigDO selectByPrimaryKey(Long id); + + /** + * + * 默认更新方法，根据主键更新，不会把null值更新到数据库，避免覆盖之前有值的 + * dateTime:2024-03-27 09:25 + */ + int updateByPrimaryKeySelective(RegionAreaConfigDO record); + + /** + * + * 默认更新方法，根据主键物理删除 + * dateTime:2024-03-27 09:25 + */ + int deleteByPrimaryKey(Long id); + + void deleteRegionAreaConfigByRegionId(@Param("regionId") Long regionId); + + void batchInsertOrUpdateRegionAreaConfig(@Param("regionAreaConfigList") List regionAreaConfigList); + + List listAreaByRegionId(@Param("regionId") Long regionId); + + Long getByWantShopAreaId(@Param("wantShopAreaId") Long wantShopAreaId); + +} \ No newline at end of file diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/RegionQrcodeConfigMapper.java b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/RegionQrcodeConfigMapper.java new file mode 100644 index 000000000..484520863 --- /dev/null +++ b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/RegionQrcodeConfigMapper.java @@ -0,0 +1,43 @@ +package com.cool.store.mapper; + +import com.cool.store.entity.RegionQrcodeConfigDO; +import org.apache.ibatis.annotations.Param; + +/** + * @author wxp + * @date 2024-03-27 09:25 + */ +public interface RegionQrcodeConfigMapper { + /** + * + * 默认插入方法，只会给有值的字段赋值 + * 会对传进来的字段做判空处理，如果字段为空，则使用数据库默认字段或者null + * dateTime:2024-03-27 09:25 + */ + int insertSelective(RegionQrcodeConfigDO record); + + /** + * + * 默认查询方法，通过主键获取所有字段的值 + * dateTime:2024-03-27 09:25 + */ + RegionQrcodeConfigDO selectByPrimaryKey(Long id); + + /** + * + * 默认更新方法，根据主键更新，不会把null值更新到数据库，避免覆盖之前有值的 + * dateTime:2024-03-27 09:25 + */ + int updateByPrimaryKeySelective(RegionQrcodeConfigDO record); + + /** + * + * 默认更新方法，根据主键物理删除 + * dateTime:2024-03-27 09:25 + */ + int deleteByPrimaryKey(Long id); + + RegionQrcodeConfigDO getByRegionId( @Param("regionId") Long regionId); + + +} \ No newline at end of file diff --git a/coolstore-partner-dao/src/main/resources/mapper/BankdocMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/BankdocMapper.xml new file mode 100644 index 000000000..31df5c12b --- /dev/null +++ b/coolstore-partner-dao/src/main/resources/mapper/BankdocMapper.xml @@ -0,0 +1,88 @@ + + + + + + + + + + + + + insert into xfsg_bankdoc + + + code, + + + combinenum, + + + enablestate, + + + iscustbank, + + + name, + + + pk_banktype, + + + + + #{code,jdbcType=VARCHAR}, + + + #{combinenum,jdbcType=VARCHAR}, + + + #{enablestate,jdbcType=DECIMAL}, + + + #{iscustbank,jdbcType=CHAR}, + + + #{name,jdbcType=VARCHAR}, + + + #{pkBanktype,jdbcType=VARCHAR}, + + + + + + + and t.code = #{code,jdbcType=VARCHAR} + + + and t.combinenum = #{combinenum,jdbcType=VARCHAR} + + + and t.enablestate = #{enablestate,jdbcType=DECIMAL} + + + and t.iscustbank = #{iscustbank,jdbcType=CHAR} + + + and t.name = #{name,jdbcType=VARCHAR} + + + and t.pk_banktype = #{pkBanktype,jdbcType=VARCHAR} + + + + + + + \ No newline at end of file diff --git a/coolstore-partner-dao/src/main/resources/mapper/BanktypeMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/BanktypeMapper.xml new file mode 100644 index 000000000..5400eab0d --- /dev/null +++ b/coolstore-partner-dao/src/main/resources/mapper/BanktypeMapper.xml @@ -0,0 +1,92 @@ + + + + + + + + + + + pk_banktype, code, combinecode, name + + + + delete from xfsg_banktype + where pk_banktype = #{pkBanktype,jdbcType=CHAR} + + + insert into xfsg_banktype + + + pk_banktype, + + + code, + + + combinecode, + + + name, + + + + + #{pkBanktype,jdbcType=CHAR}, + + + #{code,jdbcType=VARCHAR}, + + + #{combinecode,jdbcType=VARCHAR}, + + + #{name,jdbcType=VARCHAR}, + + + + + update xfsg_banktype + + + code = #{code,jdbcType=VARCHAR}, + + + combinecode = #{combinecode,jdbcType=VARCHAR}, + + + name = #{name,jdbcType=VARCHAR}, + + + where pk_banktype = #{pkBanktype,jdbcType=CHAR} + + + + + and t.pk_banktype = #{pkBanktype,jdbcType=CHAR} + + + and t.code = #{code,jdbcType=VARCHAR} + + + and t.combinecode = #{combinecode,jdbcType=VARCHAR} + + + and t.name = #{name,jdbcType=VARCHAR} + + + + + + + \ No newline at end of file diff --git a/coolstore-partner-dao/src/main/resources/mapper/LinePayMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/LinePayMapper.xml new file mode 100644 index 000000000..0f76b33e5 --- /dev/null +++ b/coolstore-partner-dao/src/main/resources/mapper/LinePayMapper.xml @@ -0,0 +1,283 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + id, partner_id, line_id, pay_status, pay_type, pay_user_name, pay_account, bank_code, + bank_name, branch_bank_code, branch_bank_name, pay_time, pay_pic, promise_pic, create_time, + update_time, create_user_id, update_user_id, deleted + + + + delete from xfsg_line_pay + where id = #{id,jdbcType=BIGINT} + + + + SELECT LAST_INSERT_ID() + + insert into xfsg_line_pay + + + partner_id, + + + line_id, + + + pay_status, + + + pay_type, + + + pay_user_name, + + + pay_account, + + + bank_code, + + + bank_name, + + + branch_bank_code, + + + branch_bank_name, + + + pay_time, + + + pay_pic, + + + promise_pic, + + + create_time, + + + update_time, + + + create_user_id, + + + update_user_id, + + + deleted, + + + + + #{partnerId,jdbcType=VARCHAR}, + + + #{lineId,jdbcType=BIGINT}, + + + #{payStatus,jdbcType=TINYINT}, + + + #{payType,jdbcType=TINYINT}, + + + #{payUserName,jdbcType=VARCHAR}, + + + #{payAccount,jdbcType=VARCHAR}, + + + #{bankCode,jdbcType=VARCHAR}, + + + #{bankName,jdbcType=VARCHAR}, + + + #{branchBankCode,jdbcType=VARCHAR}, + + + #{branchBankName,jdbcType=VARCHAR}, + + + #{payTime,jdbcType=TIMESTAMP}, + + + #{payPic,jdbcType=VARCHAR}, + + + #{promisePic,jdbcType=VARCHAR}, + + + #{createTime,jdbcType=TIMESTAMP}, + + + #{updateTime,jdbcType=TIMESTAMP}, + + + #{createUserId,jdbcType=VARCHAR}, + + + #{updateUserId,jdbcType=VARCHAR}, + + + #{deleted,jdbcType=BIT}, + + + + + update xfsg_line_pay + + + partner_id = #{partnerId,jdbcType=VARCHAR}, + + + line_id = #{lineId,jdbcType=BIGINT}, + + + pay_status = #{payStatus,jdbcType=TINYINT}, + + + pay_type = #{payType,jdbcType=TINYINT}, + + + pay_user_name = #{payUserName,jdbcType=VARCHAR}, + + + pay_account = #{payAccount,jdbcType=VARCHAR}, + + + bank_code = #{bankCode,jdbcType=VARCHAR}, + + + bank_name = #{bankName,jdbcType=VARCHAR}, + + + branch_bank_code = #{branchBankCode,jdbcType=VARCHAR}, + + + branch_bank_name = #{branchBankName,jdbcType=VARCHAR}, + + + pay_time = #{payTime,jdbcType=TIMESTAMP}, + + + pay_pic = #{payPic,jdbcType=VARCHAR}, + + + promise_pic = #{promisePic,jdbcType=VARCHAR}, + + + create_time = #{createTime,jdbcType=TIMESTAMP}, + + + update_time = #{updateTime,jdbcType=TIMESTAMP}, + + + create_user_id = #{createUserId,jdbcType=VARCHAR}, + + + update_user_id = #{updateUserId,jdbcType=VARCHAR}, + + + deleted = #{deleted,jdbcType=BIT}, + + + where id = #{id,jdbcType=BIGINT} + + + + + and t.id = #{id,jdbcType=BIGINT} + + + and t.partner_id = #{partnerId,jdbcType=VARCHAR} + + + and t.line_id = #{lineId,jdbcType=BIGINT} + + + and t.pay_status = #{payStatus,jdbcType=TINYINT} + + + and t.pay_type = #{payType,jdbcType=TINYINT} + + + and t.pay_user_name = #{payUserName,jdbcType=VARCHAR} + + + and t.pay_account = #{payAccount,jdbcType=VARCHAR} + + + and t.bank_code = #{bankCode,jdbcType=VARCHAR} + + + and t.bank_name = #{bankName,jdbcType=VARCHAR} + + + and t.branch_bank_code = #{branchBankCode,jdbcType=VARCHAR} + + + and t.branch_bank_name = #{branchBankName,jdbcType=VARCHAR} + + + and t.pay_time = #{payTime,jdbcType=TIMESTAMP} + + + and t.pay_pic = #{payPic,jdbcType=VARCHAR} + + + and t.promise_pic = #{promisePic,jdbcType=VARCHAR} + + + and t.create_time = #{createTime,jdbcType=TIMESTAMP} + + + and t.update_time = #{updateTime,jdbcType=TIMESTAMP} + + + and t.create_user_id = #{createUserId,jdbcType=VARCHAR} + + + and t.update_user_id = #{updateUserId,jdbcType=VARCHAR} + + + and t.deleted = #{deleted,jdbcType=BIT} + + + + + + \ No newline at end of file diff --git a/coolstore-partner-dao/src/main/resources/mapper/RegionAreaConfigMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/RegionAreaConfigMapper.xml new file mode 100644 index 000000000..af198b222 --- /dev/null +++ b/coolstore-partner-dao/src/main/resources/mapper/RegionAreaConfigMapper.xml @@ -0,0 +1,179 @@ + + + + + + + + + + + + + + + id, region_id, want_shop_area_id, create_time, update_time, create_user_id, update_user_id, + deleted + + + + delete from xfsg_region_area_config + where id = #{id,jdbcType=BIGINT} + + + + SELECT LAST_INSERT_ID() + + insert into xfsg_region_area_config + + + region_id, + + + want_shop_area_id, + + + create_time, + + + update_time, + + + create_user_id, + + + update_user_id, + + + deleted, + + + + + #{regionId,jdbcType=BIGINT}, + + + #{wantShopAreaId,jdbcType=BIGINT}, + + + #{createTime,jdbcType=TIMESTAMP}, + + + #{updateTime,jdbcType=TIMESTAMP}, + + + #{createUserId,jdbcType=VARCHAR}, + + + #{updateUserId,jdbcType=VARCHAR}, + + + #{deleted,jdbcType=BIT}, + + + + + update xfsg_region_area_config + + + region_id = #{regionId,jdbcType=BIGINT}, + + + want_shop_area_id = #{wantShopAreaId,jdbcType=BIGINT}, + + + create_time = #{createTime,jdbcType=TIMESTAMP}, + + + update_time = #{updateTime,jdbcType=TIMESTAMP}, + + + create_user_id = #{createUserId,jdbcType=VARCHAR}, + + + update_user_id = #{updateUserId,jdbcType=VARCHAR}, + + + deleted = #{deleted,jdbcType=BIT}, + + + where id = #{id,jdbcType=BIGINT} + + + + + and t.id = #{id,jdbcType=BIGINT} + + + and t.region_id = #{regionId,jdbcType=BIGINT} + + + and t.want_shop_area_id = #{wantShopAreaId,jdbcType=BIGINT} + + + and t.create_time = #{createTime,jdbcType=TIMESTAMP} + + + and t.update_time = #{updateTime,jdbcType=TIMESTAMP} + + + and t.create_user_id = #{createUserId,jdbcType=VARCHAR} + + + and t.update_user_id = #{updateUserId,jdbcType=VARCHAR} + + + and t.deleted = #{deleted,jdbcType=BIT} + + + + + + + delete from xfsg_region_area_config + where region_id = #{regionId} + + + + insert into xfsg_region_area_config + ( + region_id, + want_shop_area_id, + create_time, + create_user_id, + update_time, + update_user_id + ) + values + + ( + #{entity.regionId}, + #{entity.wantShopAreaId}, + now(), + #{entity.createUserId}, + now(), + #{entity.updateUserId} + ) + + ON DUPLICATE KEY UPDATE + update_time = now() + + + + + + \ No newline at end of file diff --git a/coolstore-partner-dao/src/main/resources/mapper/RegionQrcodeConfigMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/RegionQrcodeConfigMapper.xml new file mode 100644 index 000000000..b748f6312 --- /dev/null +++ b/coolstore-partner-dao/src/main/resources/mapper/RegionQrcodeConfigMapper.xml @@ -0,0 +1,156 @@ + + + + + + + + + + + + + + + + id, region_id, region_name, pay_pic, create_time, update_time, create_user_id, update_user_id, + deleted + + + + delete from xfsg_region_qrcode_config + where id = #{id,jdbcType=BIGINT} + + + + SELECT LAST_INSERT_ID() + + insert into xfsg_region_qrcode_config + + + region_id, + + + region_name, + + + pay_pic, + + + create_time, + + + update_time, + + + create_user_id, + + + update_user_id, + + + deleted, + + + + + #{regionId,jdbcType=BIGINT}, + + + #{regionName,jdbcType=VARCHAR}, + + + #{payPic,jdbcType=VARCHAR}, + + + #{createTime,jdbcType=TIMESTAMP}, + + + #{updateTime,jdbcType=TIMESTAMP}, + + + #{createUserId,jdbcType=VARCHAR}, + + + #{updateUserId,jdbcType=VARCHAR}, + + + #{deleted,jdbcType=BIT}, + + + + + update xfsg_region_qrcode_config + + + region_id = #{regionId,jdbcType=BIGINT}, + + + region_name = #{regionName,jdbcType=VARCHAR}, + + + pay_pic = #{payPic,jdbcType=VARCHAR}, + + + create_time = #{createTime,jdbcType=TIMESTAMP}, + + + update_time = #{updateTime,jdbcType=TIMESTAMP}, + + + create_user_id = #{createUserId,jdbcType=VARCHAR}, + + + update_user_id = #{updateUserId,jdbcType=VARCHAR}, + + + deleted = #{deleted,jdbcType=BIT}, + + + where id = #{id,jdbcType=BIGINT} + + + + + and t.id = #{id,jdbcType=BIGINT} + + + and t.region_id = #{regionId,jdbcType=BIGINT} + + + and t.region_name = #{regionName,jdbcType=VARCHAR} + + + and t.pay_pic = #{payPic,jdbcType=VARCHAR} + + + and t.create_time = #{createTime,jdbcType=TIMESTAMP} + + + and t.update_time = #{updateTime,jdbcType=TIMESTAMP} + + + and t.create_user_id = #{createUserId,jdbcType=VARCHAR} + + + and t.update_user_id = #{updateUserId,jdbcType=VARCHAR} + + + and t.deleted = #{deleted,jdbcType=BIT} + + + + + + + \ No newline at end of file diff --git a/coolstore-partner-model/src/main/java/com/cool/store/entity/BankdocDO.java b/coolstore-partner-model/src/main/java/com/cool/store/entity/BankdocDO.java new file mode 100644 index 000000000..caac5a4b6 --- /dev/null +++ b/coolstore-partner-model/src/main/java/com/cool/store/entity/BankdocDO.java @@ -0,0 +1,38 @@ +package com.cool.store.entity; + +import io.swagger.annotations.ApiModelProperty; +import java.io.Serializable; +import java.math.BigDecimal; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +/** + * + * @author wxp + * @date 2024-03-27 09:25 + */ +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +public class BankdocDO implements Serializable { + @ApiModelProperty("") + private String code; + + @ApiModelProperty("") + private String combinenum; + + @ApiModelProperty("") + private BigDecimal enablestate; + + @ApiModelProperty("") + private String iscustbank; + + @ApiModelProperty("") + private String name; + + @ApiModelProperty("") + private String pkBanktype; +} \ No newline at end of file diff --git a/coolstore-partner-model/src/main/java/com/cool/store/entity/BanktypeDO.java b/coolstore-partner-model/src/main/java/com/cool/store/entity/BanktypeDO.java new file mode 100644 index 000000000..d236d5edd --- /dev/null +++ b/coolstore-partner-model/src/main/java/com/cool/store/entity/BanktypeDO.java @@ -0,0 +1,31 @@ +package com.cool.store.entity; + +import io.swagger.annotations.ApiModelProperty; +import java.io.Serializable; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +/** + * + * @author wxp + * @date 2024-03-27 09:25 + */ +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +public class BanktypeDO implements Serializable { + @ApiModelProperty("") + private String pkBanktype; + + @ApiModelProperty("") + private String code; + + @ApiModelProperty("") + private String combinecode; + + @ApiModelProperty("") + private String name; +} \ No newline at end of file diff --git a/coolstore-partner-model/src/main/java/com/cool/store/entity/LineInfoDO.java b/coolstore-partner-model/src/main/java/com/cool/store/entity/LineInfoDO.java index 37decb2df..902c09dea 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/entity/LineInfoDO.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/entity/LineInfoDO.java @@ -124,7 +124,7 @@ public class LineInfoDO { * 是否是加盟商：0.否 1.是 */ @Column(name = "join_status") - private Boolean joinStatus; + private Integer joinStatus; /** * 0.公海 1.私海 2黑名单 diff --git a/coolstore-partner-model/src/main/java/com/cool/store/entity/LinePayDO.java b/coolstore-partner-model/src/main/java/com/cool/store/entity/LinePayDO.java new file mode 100644 index 000000000..301347e2b --- /dev/null +++ b/coolstore-partner-model/src/main/java/com/cool/store/entity/LinePayDO.java @@ -0,0 +1,77 @@ +package com.cool.store.entity; + +import io.swagger.annotations.ApiModelProperty; +import java.io.Serializable; +import java.util.Date; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +/** + * + * @author wxp + * @date 2024-03-27 09:25 + */ +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +public class LinePayDO implements Serializable { + @ApiModelProperty("") + private Long id; + + @ApiModelProperty("xfsg_user_info.partner_id") + private String partnerId; + + @ApiModelProperty("line_info.id") + private Long lineId; + + @ApiModelProperty("支付状态 0:待付款 1:已付款") + private Integer payStatus; + + @ApiModelProperty("支付方式 1微信 2银行转账") + private Integer payType; + + @ApiModelProperty("付款人姓名") + private String payUserName; + + @ApiModelProperty("付款账号") + private String payAccount; + + @ApiModelProperty("开户行code") + private String bankCode; + + @ApiModelProperty("开户行名称") + private String bankName; + + @ApiModelProperty("支行code") + private String branchBankCode; + + @ApiModelProperty("支行名称") + private String branchBankName; + + @ApiModelProperty("缴纳时间") + private Date payTime; + + @ApiModelProperty("付款截图") + private String payPic; + + @ApiModelProperty("承诺书图片") + private String promisePic; + + @ApiModelProperty("创建时间") + private Date createTime; + + @ApiModelProperty("更新时间") + private Date updateTime; + + @ApiModelProperty("创建人") + private String createUserId; + + @ApiModelProperty("更新人") + private String updateUserId; + + @ApiModelProperty("是否删除：0.否 1.是") + private Boolean deleted; +} \ No newline at end of file diff --git a/coolstore-partner-model/src/main/java/com/cool/store/entity/RegionAreaConfigDO.java b/coolstore-partner-model/src/main/java/com/cool/store/entity/RegionAreaConfigDO.java new file mode 100644 index 000000000..42a714e70 --- /dev/null +++ b/coolstore-partner-model/src/main/java/com/cool/store/entity/RegionAreaConfigDO.java @@ -0,0 +1,44 @@ +package com.cool.store.entity; + +import io.swagger.annotations.ApiModelProperty; +import java.io.Serializable; +import java.util.Date; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +/** + * + * @author wxp + * @date 2024-03-27 09:25 + */ +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +public class RegionAreaConfigDO implements Serializable { + @ApiModelProperty("主键") + private Long id; + + @ApiModelProperty("区域ID 战区id") + private Long regionId; + + @ApiModelProperty("意向开店区域 省市code") + private Long wantShopAreaId; + + @ApiModelProperty("创建时间") + private Date createTime; + + @ApiModelProperty("更新时间") + private Date updateTime; + + @ApiModelProperty("创建人") + private String createUserId; + + @ApiModelProperty("更新人") + private String updateUserId; + + @ApiModelProperty("是否删除：0.否 1.是") + private Boolean deleted; +} \ No newline at end of file diff --git a/coolstore-partner-model/src/main/java/com/cool/store/entity/RegionQrcodeConfigDO.java b/coolstore-partner-model/src/main/java/com/cool/store/entity/RegionQrcodeConfigDO.java new file mode 100644 index 000000000..50164edd9 --- /dev/null +++ b/coolstore-partner-model/src/main/java/com/cool/store/entity/RegionQrcodeConfigDO.java @@ -0,0 +1,47 @@ +package com.cool.store.entity; + +import io.swagger.annotations.ApiModelProperty; +import java.io.Serializable; +import java.util.Date; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +/** + * + * @author wxp + * @date 2024-03-27 09:25 + */ +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +public class RegionQrcodeConfigDO implements Serializable { + @ApiModelProperty("主键") + private Long id; + + @ApiModelProperty("区域ID 大区id") + private Long regionId; + + @ApiModelProperty("大区名称") + private String regionName; + + @ApiModelProperty("支付二维码图片url") + private String payPic; + + @ApiModelProperty("创建时间") + private Date createTime; + + @ApiModelProperty("更新时间") + private Date updateTime; + + @ApiModelProperty("创建人") + private String createUserId; + + @ApiModelProperty("更新人") + private String updateUserId; + + @ApiModelProperty("是否删除：0.否 1.是") + private Boolean deleted; +} \ No newline at end of file diff --git a/coolstore-partner-model/src/main/java/com/cool/store/request/AddTagsRequest.java b/coolstore-partner-model/src/main/java/com/cool/store/request/AddTagsRequest.java new file mode 100644 index 000000000..662e7f72a --- /dev/null +++ b/coolstore-partner-model/src/main/java/com/cool/store/request/AddTagsRequest.java @@ -0,0 +1,22 @@ +package com.cool.store.request; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; + +/** + * @Author suzhuhong + * @Date 2023/5/31 11:19 + * @Version 1.0 + */ +@Data +@ApiModel +public class AddTagsRequest { + + @ApiModelProperty("加盟申请线索ID") + private Long lineId; + @ApiModelProperty("标签列表") + private List tags; +} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/request/BranchBankPageRequest.java b/coolstore-partner-model/src/main/java/com/cool/store/request/BranchBankPageRequest.java new file mode 100644 index 000000000..d5359d4a4 --- /dev/null +++ b/coolstore-partner-model/src/main/java/com/cool/store/request/BranchBankPageRequest.java @@ -0,0 +1,24 @@ +package com.cool.store.request; + +import com.cool.store.common.PageBasicInfo; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotNull; + +/** + * @author wxp + * @FileName: BranchBankPageRequest + * @Description:支行列表 + * @date 2024-03-28 15:51 + */ +@Data +public class BranchBankPageRequest extends PageBasicInfo { + + @ApiModelProperty("银行code") + @NotNull(message = "银行code不能为空") + private String bankCode; + + @ApiModelProperty("支行名字或code") + private String keyword; +} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/request/LinePaySubmitRequest.java b/coolstore-partner-model/src/main/java/com/cool/store/request/LinePaySubmitRequest.java new file mode 100644 index 000000000..1641dc925 --- /dev/null +++ b/coolstore-partner-model/src/main/java/com/cool/store/request/LinePaySubmitRequest.java @@ -0,0 +1,55 @@ +package com.cool.store.request; + +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotNull; +import java.util.Date; + +@Data +@ApiModel("缴纳意向金Request") +public class LinePaySubmitRequest { + + @ApiModelProperty("xfsg_user_info.partner_id") + private String partnerId; + + @ApiModelProperty("line_info.id") + @NotNull(message = "线索id不能为空") + private Long lineId; + + @ApiModelProperty("支付状态 0:待付款 1:已付款") + private Integer payStatus; + + @ApiModelProperty("支付方式 1微信 2银行转账") + private Integer payType; + + @ApiModelProperty("付款人姓名") + private String payUserName; + + @ApiModelProperty("付款账号") + private String payAccount; + + @ApiModelProperty("开户行code") + private String bankCode; + + @ApiModelProperty("开户行名称") + private String bankName; + + @ApiModelProperty("支行code") + private String branchBankCode; + + @ApiModelProperty("支行名称") + private String branchBankName; + + @ApiModelProperty("缴纳时间") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date payTime; + + @ApiModelProperty("付款截图") + private String payPic; + + @ApiModelProperty("承诺书图片") + private String promisePic; +} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/request/RegionAreaConfigAddRequest.java b/coolstore-partner-model/src/main/java/com/cool/store/request/RegionAreaConfigAddRequest.java new file mode 100644 index 000000000..343cff53a --- /dev/null +++ b/coolstore-partner-model/src/main/java/com/cool/store/request/RegionAreaConfigAddRequest.java @@ -0,0 +1,27 @@ +package com.cool.store.request; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotEmpty; +import javax.validation.constraints.NotNull; +import java.util.List; + + +/** + * @author wxp + */ +@ApiModel(value = "区域配置") +@Data +public class RegionAreaConfigAddRequest { + + @ApiModelProperty("区域id") + @NotNull(message = "区域id不能为空") + private Long regionId; + + @ApiModelProperty("省市集合") + @NotEmpty(message = "省市不能为空") + private List areaIdList; + +} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/vo/LineInfoVO.java b/coolstore-partner-model/src/main/java/com/cool/store/vo/LineInfoVO.java index dd30c2e02..ff0695d70 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/vo/LineInfoVO.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/vo/LineInfoVO.java @@ -8,6 +8,7 @@ import javax.persistence.GeneratedValue; import javax.persistence.GenerationType; import javax.persistence.Id; import java.util.Date; +import java.util.List; /** * @Author suzhuhong @@ -28,8 +29,18 @@ public class LineInfoVO { private String partnerId; @Column(name = "region_id") + @ApiModelProperty("战区Id") private Long regionId; + @ApiModelProperty("战区名称") + private String regionName; + + @ApiModelProperty("大区ID") + private Long largeRegionId; + + @ApiModelProperty("大区ID名称") + private String largeRegionName; + /** * 手机号 */ @@ -54,6 +65,8 @@ public class LineInfoVO { @Column(name = "want_shop_area_id") @ApiModelProperty("意向开店区域") private Long wantShopAreaId; + @ApiModelProperty("意向开店区域名称") + private String wantShopAreaName; /** * 居住地址 @@ -111,13 +124,21 @@ public class LineInfoVO { @ApiModelProperty("线索来源") private Integer lineSource; + @ApiModelProperty("线索来源") + private String lineSourceName; + /** * 招商经理 */ - @Column(name = "investment_manager") @ApiModelProperty("招商经理") private String investmentManager; + @ApiModelProperty("招商经理名称") + private String investmentManagerName; + + @ApiModelProperty("招商经理手机号") + private String investmentManagerMobile; + /** * 拓展经理 */ @@ -144,14 +165,14 @@ public class LineInfoVO { */ @Column(name = "user_portrait") @ApiModelProperty("用户画像") - private String userPortrait; + private List userPortraitList; /** * 是否是加盟商：0.否 1.是 */ @Column(name = "join_status") @ApiModelProperty("0-线索 1-蓄水池 2-加盟商") - private Boolean joinStatus; + private Integer joinStatus; /** * 0.公海 1.私海 2黑名单 diff --git a/coolstore-partner-model/src/main/java/com/cool/store/vo/LinePayVO.java b/coolstore-partner-model/src/main/java/com/cool/store/vo/LinePayVO.java new file mode 100644 index 000000000..e71b13e83 --- /dev/null +++ b/coolstore-partner-model/src/main/java/com/cool/store/vo/LinePayVO.java @@ -0,0 +1,70 @@ +package com.cool.store.vo; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + +/** + * @Author wxp + * @Date 2024/3/25 13:46 + * @Version 1.0 + */ +@Data +public class LinePayVO { + + @ApiModelProperty("") + private Long id; + + @ApiModelProperty("xfsg_user_info.partner_id") + private String partnerId; + + @ApiModelProperty("line_info.id") + private Long lineId; + + @ApiModelProperty("支付状态 0:待付款 1:已付款") + private Byte payStatus; + + @ApiModelProperty("支付方式 1微信 2银行转账") + private Byte payType; + + @ApiModelProperty("付款人姓名") + private String payUserName; + + @ApiModelProperty("付款账号") + private String payAccount; + + @ApiModelProperty("开户行code") + private String bankCode; + + @ApiModelProperty("开户行名称") + private String bankName; + + @ApiModelProperty("支行code") + private String branchBankCode; + + @ApiModelProperty("支行名称") + private String branchBankName; + + @ApiModelProperty("缴纳时间") + private Date payTime; + + @ApiModelProperty("付款截图") + private String payPic; + + @ApiModelProperty("承诺书图片") + private String promisePic; + + @ApiModelProperty("创建时间") + private Date createTime; + + @ApiModelProperty("更新时间") + private Date updateTime; + + @ApiModelProperty("创建人") + private String createUserId; + + @ApiModelProperty("更新人") + private String updateUserId; + +} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/vo/PartnerBaseInfoVO.java b/coolstore-partner-model/src/main/java/com/cool/store/vo/PartnerBaseInfoVO.java index 3273036c0..7a932cc40 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/vo/PartnerBaseInfoVO.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/vo/PartnerBaseInfoVO.java @@ -39,7 +39,7 @@ public class PartnerBaseInfoVO { @ApiModelProperty("教育程度 1：小学 2：初中 3：高中 4大学及以上") private Integer educationLevel; @ApiModelProperty("家庭年收入 1：10-20万 2：20-30万 3：30-50万 4：50万以上") - private String annualIncome; + private Integer annualIncome; @ApiModelProperty("是否有合伙人 1：是 0：否") private Integer hasPartner; @ApiModelProperty("资金来源 1：自有资金 2：合伙资金 3：借贷") @@ -51,9 +51,9 @@ public class PartnerBaseInfoVO { @ApiModelProperty("是否有水果行业经营的经验 1：无 2：单店经验 3：多店经验 4：多店连锁经验") private Integer fruitIndustryExperience; @ApiModelProperty("店铺情况 1:自有店铺 2：自有意向店铺 3：无意向店铺" ) - private String storeCondition; + private Integer storeCondition; @ApiModelProperty("预期回本的最长周期 1：1年半以上 2：1年半内 3：1年内 4：半年内") - private String paybackPeriod; + private Integer paybackPeriod; @ApiModelProperty("是否严格遵守管理标准 1：是 2：否") private Integer followsManagementStandard; @ApiModelProperty("是否能参加认证培训 1：是 2：否") @@ -78,14 +78,14 @@ public class PartnerBaseInfoVO { partnerBaseInfoVO.setAuditId(memberQuestionDO.getAuditId()); partnerBaseInfoVO.setCareerStatus(memberQuestionDO.getCareerStatus()); partnerBaseInfoVO.setEducationLevel(memberQuestionDO.getEducationLevel()); - partnerBaseInfoVO.setAnnualIncome(memberQuestionDO.getAnnualIncome()); + partnerBaseInfoVO.setAnnualIncome(Integer.valueOf(memberQuestionDO.getAnnualIncome())); partnerBaseInfoVO.setHasPartner(memberQuestionDO.getHasPartner()); partnerBaseInfoVO.setCapitalSource(memberQuestionDO.getCapitalSource()); partnerBaseInfoVO.setBusinessMode(memberQuestionDO.getBusinessMode()); partnerBaseInfoVO.setJoinExperience(memberQuestionDO.getJoinExperience()); partnerBaseInfoVO.setFruitIndustryExperience(memberQuestionDO.getFruitIndustryExperience()); - partnerBaseInfoVO.setStoreCondition(memberQuestionDO.getStoreCondition()); - partnerBaseInfoVO.setPaybackPeriod(memberQuestionDO.getPaybackPeriod()); + partnerBaseInfoVO.setStoreCondition(Integer.valueOf(memberQuestionDO.getStoreCondition())); + partnerBaseInfoVO.setPaybackPeriod(Integer.valueOf(memberQuestionDO.getPaybackPeriod())); partnerBaseInfoVO.setFollowsManagementStandard(memberQuestionDO.getFollowsManagementStandard()); partnerBaseInfoVO.setCanTraining(memberQuestionDO.getCanTraining()); partnerBaseInfoVO.setJoinType(memberQuestionDO.getJoinType()); diff --git a/coolstore-partner-model/src/main/java/com/cool/store/vo/PartnerUserInfoVO.java b/coolstore-partner-model/src/main/java/com/cool/store/vo/PartnerUserInfoVO.java index 90a6a7d12..585098ef4 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/vo/PartnerUserInfoVO.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/vo/PartnerUserInfoVO.java @@ -1,12 +1,8 @@ package com.cool.store.vo; -import com.cool.store.enums.LineStatusEnum; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import org.apache.commons.lang3.StringUtils; - -import java.util.Objects; /** * @Author suzhuhong @@ -29,33 +25,21 @@ public class PartnerUserInfoVO { @ApiModelProperty("申请人姓名") private String username; - @ApiModelProperty("常驻区域") - private String liveArea; + @ApiModelProperty("居住地址") + private String liveAddress; @ApiModelProperty("意向开店区域ID") - private String wantShopArea; + private Long wantShopAreaId; @ApiModelProperty("意向开店区域名称") private String wantShopAreaName; - @ApiModelProperty("0不接受调剂、1全国调剂、2省内调剂、3市内调剂") - private Integer acceptAdjustType; - - @ApiModelProperty("邀请码") - private String inviteCode; - - @ApiModelProperty("是否填写加盟需知") - private Integer isWritePartnerKnow; - @ApiModelProperty("openid") private String openid; @ApiModelProperty("unionid") private String unionId; - @ApiModelProperty("是否需要提交意向信息") - private Boolean needSubmitWantInfo; - @ApiModelProperty("线索id") private Long lineId; @@ -71,20 +55,8 @@ public class PartnerUserInfoVO { @ApiModelProperty("0.公海 1.私海 2黑名单") private Integer lineStatus; - public Boolean getNeedSubmitWantInfo() { - //如果是私海 且liveArea与acceptAdjustType是空 说明通过会销进入 返回false - if (LineStatusEnum.PRIVATE_SEAS.getCode().equals(lineStatus)&&StringUtils.isBlank(liveArea) - && Objects.isNull(acceptAdjustType)){ - return false; - } - if((StringUtils.isBlank(username) - || StringUtils.isBlank(mobile) - || StringUtils.isBlank(liveArea) - || StringUtils.isBlank(wantShopArea) - || Objects.isNull(acceptAdjustType))){ - return true; - } - return false; - } + @ApiModelProperty("线索来源") + private Integer lineSource; + } diff --git a/coolstore-partner-model/src/main/java/com/cool/store/vo/RegionPathNameVO.java b/coolstore-partner-model/src/main/java/com/cool/store/vo/RegionPathNameVO.java new file mode 100644 index 000000000..0cb48b4c1 --- /dev/null +++ b/coolstore-partner-model/src/main/java/com/cool/store/vo/RegionPathNameVO.java @@ -0,0 +1,34 @@ +package com.cool.store.vo; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.io.Serializable; +import java.util.List; + +/** + * @author byd + * @ClassName RegionDO + * @Description 区域 + */ +@ApiModel("区域全路径返回实体") +@Builder +@Data +@NoArgsConstructor +@AllArgsConstructor +public class RegionPathNameVO implements Serializable { + /** + * 区域全路径名称 + */ + @ApiModelProperty("区域全路径名称") + private String allRegionName; + + private List regionNameList; + + private static final long serialVersionUID = 1L; + +} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/vo/oss/OssUploadConfigVO.java b/coolstore-partner-model/src/main/java/com/cool/store/vo/oss/OssUploadConfigVO.java new file mode 100644 index 000000000..930409690 --- /dev/null +++ b/coolstore-partner-model/src/main/java/com/cool/store/vo/oss/OssUploadConfigVO.java @@ -0,0 +1,46 @@ +package com.cool.store.vo.oss; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author zhangchenbiao + * @FileName: OssUploadConfigVO + * @Description: oss 上传config + * @date 2023-06-01 13:46 + */ +@Data +public class OssUploadConfigVO { + + @ApiModelProperty("域名") + private String accessKeyId; + + @ApiModelProperty("策略 Base64编过") + private String policy; + + @ApiModelProperty("对Policy签名后的字符串") + private String signature; + + @ApiModelProperty("上传目录") + private String dir; + + @ApiModelProperty("域名") + private String host; + + @ApiModelProperty("上传策略Policy失效时间") + private String expire; + + @ApiModelProperty("cdn地址") + private String cdnUrl; + + public OssUploadConfigVO(String accessKeyId, String policy, String signature, String dir, String host, String expire, String cdnUrl) { + this.accessKeyId = accessKeyId; + this.policy = policy; + this.signature = signature; + this.dir = dir; + this.host = host; + this.expire = expire; + this.cdnUrl = cdnUrl; + } + +} diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/BankService.java b/coolstore-partner-service/src/main/java/com/cool/store/service/BankService.java new file mode 100644 index 000000000..89bf28d1c --- /dev/null +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/BankService.java @@ -0,0 +1,19 @@ +package com.cool.store.service; + +import com.cool.store.entity.BankdocDO; +import com.cool.store.entity.BanktypeDO; +import com.cool.store.request.BranchBankPageRequest; +import com.github.pagehelper.PageInfo; + +import java.util.List; + +/** + * @author Fun Li 2023/8/10 14:23 + * @version 1.0 + */ +public interface BankService { + List listBank(); + + PageInfo listBranchBank(BranchBankPageRequest request); + +} diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/LinePayService.java b/coolstore-partner-service/src/main/java/com/cool/store/service/LinePayService.java new file mode 100644 index 000000000..e6b1f8d44 --- /dev/null +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/LinePayService.java @@ -0,0 +1,19 @@ +package com.cool.store.service; + +import com.cool.store.request.LinePaySubmitRequest; +import com.cool.store.vo.LinePayVO; +import com.cool.store.vo.PartnerUserInfoVO; + +/** + * @Author wxp + * @Date 2024/3/25 13:45 + * @Version 1.0 + */ +public interface LinePayService { + + LinePayVO getLinePayInfo(Long lineId); + + Long submitPayInfo(LinePaySubmitRequest followLog, PartnerUserInfoVO partnerUser); + + +} diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/LineService.java b/coolstore-partner-service/src/main/java/com/cool/store/service/LineService.java index 0dc5fffa8..9717e8c2a 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/LineService.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/LineService.java @@ -1,6 +1,7 @@ package com.cool.store.service; import com.cool.store.context.LoginUserInfo; +import com.cool.store.request.AddTagsRequest; import com.cool.store.request.LineListRequest; import com.cool.store.vo.LineInfoVO; import com.cool.store.vo.LineListVO; @@ -31,4 +32,12 @@ public interface LineService { PageInfo getLineList(LineListRequest lineListRequest, LoginUserInfo loginUserInfo,Boolean teamFlag); + /** + * 添加标签 + * @param userInfo + * @param addTagsRequest + * @return + */ + Boolean addTags(LoginUserInfo userInfo, AddTagsRequest addTagsRequest); + } diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/OSSService.java b/coolstore-partner-service/src/main/java/com/cool/store/service/OSSService.java new file mode 100644 index 000000000..abe78907f --- /dev/null +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/OSSService.java @@ -0,0 +1,17 @@ +package com.cool.store.service; + +import com.cool.store.vo.oss.OssUploadConfigVO; +import org.springframework.web.multipart.MultipartFile; + +/** + * @Author suzhuhong + * @Date 2024/3/28 14:27 + * @Version 1.0 + */ +public interface OSSService { + /** + * 上传文件 + * @return + */ + OssUploadConfigVO getUploadFileConfig(); +} diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/RegionAreaConfigService.java b/coolstore-partner-service/src/main/java/com/cool/store/service/RegionAreaConfigService.java new file mode 100644 index 000000000..2a465bd3b --- /dev/null +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/RegionAreaConfigService.java @@ -0,0 +1,19 @@ +package com.cool.store.service; + +import com.cool.store.context.LoginUserInfo; +import com.cool.store.request.RegionAreaConfigAddRequest; + +import java.util.List; + +/** + * @Author wxp + * @Date 2022/12/29 11:18 + * @Version 1.0 + */ +public interface RegionAreaConfigService { + + Boolean saveOrUpdateRegionAreaConfig(RegionAreaConfigAddRequest regionAreaConfigAddRequest, LoginUserInfo user); + + List listAreaIdByRegionId(Long regionId); + +} diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/RegionService.java b/coolstore-partner-service/src/main/java/com/cool/store/service/RegionService.java new file mode 100644 index 000000000..065daba3e --- /dev/null +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/RegionService.java @@ -0,0 +1,16 @@ +package com.cool.store.service; + +import com.cool.store.vo.RegionPathNameVO; + +public interface RegionService { + + RegionPathNameVO getAllRegionName(Long regionId); + + /** + * 根据意向区域找大区id + * @param wantShopAreaId + * @return + */ + Long getBigRegionIdByAreaId(Long wantShopAreaId); + +} diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/BankServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/BankServiceImpl.java new file mode 100644 index 000000000..fdc06b792 --- /dev/null +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/BankServiceImpl.java @@ -0,0 +1,45 @@ +package com.cool.store.service.impl; + +import com.cool.store.dao.BankDAO; +import com.cool.store.entity.BankdocDO; +import com.cool.store.entity.BanktypeDO; +import com.cool.store.request.BranchBankPageRequest; +import com.cool.store.service.BankService; +import com.github.pagehelper.Page; +import com.github.pagehelper.PageInfo; +import com.google.common.collect.Lists; +import lombok.extern.slf4j.Slf4j; +import org.apache.commons.collections4.CollectionUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * @author wxp + * @version 1.0 + */ +@Service +@Slf4j +public class BankServiceImpl implements BankService { + + @Autowired + private BankDAO bankDAO; + + @Override + public List listBank() { + List bankList = bankDAO.listBank(); + if (CollectionUtils.isEmpty(bankList)) { + log.info("银行类型为空"); + return Lists.newArrayList(); + } + return bankList; + } + + @Override + public PageInfo listBranchBank(BranchBankPageRequest request) { + Page pageInfo = bankDAO.listBranchBank(request); + PageInfo resultPage = new PageInfo(pageInfo); + return resultPage; + } +} diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/JoinIntentionServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/JoinIntentionServiceImpl.java index f7852c67d..020a85e42 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/JoinIntentionServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/JoinIntentionServiceImpl.java @@ -1,14 +1,12 @@ package com.cool.store.service.impl; import com.cool.store.dao.HyOpenAreaInfoDAO; +import com.cool.store.dao.LineInfoDAO; import com.cool.store.entity.HyOpenAreaInfoDO; import com.cool.store.entity.LineInfoDO; import com.cool.store.entity.MemberQuestionDO; import com.cool.store.entity.PartnerBaseInfoDO; -import com.cool.store.enums.ErrorCodeEnum; -import com.cool.store.enums.WorkflowStageEnum; -import com.cool.store.enums.WorkflowSubStageEnum; -import com.cool.store.enums.WorkflowSubStageStatusEnum; +import com.cool.store.enums.*; import com.cool.store.exception.ServiceException; import com.cool.store.mapper.HyOpenAreaInfoMapper; import com.cool.store.mapper.JoinIntentionMapper; @@ -39,7 +37,7 @@ public class JoinIntentionServiceImpl extends LineFlowService implements JoinInt JoinIntentionMapper joinIntentionMapper; @Resource - LineInfoMapper lineInfoMapper; + LineInfoDAO lineInfoDAO; @Resource HyOpenAreaInfoMapper openAreaInfoMapper; @@ -60,7 +58,7 @@ public class JoinIntentionServiceImpl extends LineFlowService implements JoinInt } //todo 目前写死为进入私海 lineInfoParam.setLineStatus(1); - lineInfoMapper.insertOrUpdate(lineInfoParam); + lineInfoDAO.insertOrUpdate(lineInfoParam); MemberQuestionDO memberQuestionDO = request.toMemberQuestionDO(); memberQuestionDO.setLineId(lineInfoParam.getId()); @@ -78,24 +76,31 @@ public class JoinIntentionServiceImpl extends LineFlowService implements JoinInt protected Boolean auditPass(Long auditId, LineInfoDO lineInfo) { WorkflowSubStageEnum workflowSubStageEnum = WorkflowSubStageEnum.getWorkflowSubStageEnum(lineInfo.getWorkflowSubStage()); WorkflowSubStageEnum nextStage = workflowSubStageEnum.getNextStage(); - Integer nextStageInitStatus = nextStage.getInitStatus().getCode(); - return null; + lineInfo.setWorkflowSubStage(nextStage.getCode()); + lineInfo.setWorkflowSubStageStatus(WorkflowSubStageStatusEnum.INVITING_INTERVIEWS_10.getCode()); + lineInfoDAO.updateLineInfo(lineInfo); + return Boolean.TRUE; } @Override protected Boolean auditReject(Long auditId, LineInfoDO lineInfo) { - return null; + lineInfo.setWorkflowSubStageStatus(WorkflowSubStageStatusEnum.INTENT_7.getCode()); + lineInfoDAO.updateLineInfo(lineInfo); + return Boolean.TRUE; } + @Override protected Boolean auditClose(Long auditId, LineInfoDO lineInfo) { - return null; + lineInfo.setLineStatus(LineStatusEnum.PUBLIC_SEAS.getCode()); + lineInfoDAO.updateLineInfo(lineInfo); + return Boolean.TRUE; } @Override public PartnerBaseInfoVO getByLineId(Long lineId) { MemberQuestionDO result = joinIntentionMapper.getByLineId(lineId); - LineInfoDO byLineId = lineInfoMapper.getByLineId(lineId); + LineInfoDO byLineId = lineInfoDAO.getLineInfo(lineId); if (Objects.isNull(result)) { throw new ServiceException(LINE_ID_IS_NOT_EXIST); } diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/LinePayServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/LinePayServiceImpl.java new file mode 100644 index 000000000..e1de36f17 --- /dev/null +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/LinePayServiceImpl.java @@ -0,0 +1,98 @@ +package com.cool.store.service.impl; + +import cn.hutool.core.bean.BeanUtil; +import com.cool.store.dao.LineInfoDAO; +import com.cool.store.dao.LinePayDAO; +import com.cool.store.entity.LineInfoDO; +import com.cool.store.entity.LinePayDO; +import com.cool.store.enums.ErrorCodeEnum; +import com.cool.store.enums.WorkflowSubStageEnum; +import com.cool.store.enums.WorkflowSubStageStatusEnum; +import com.cool.store.exception.ServiceException; +import com.cool.store.mapper.LineInfoMapper; +import com.cool.store.request.LinePaySubmitRequest; +import com.cool.store.service.LinePayService; +import com.cool.store.vo.LinePayVO; +import com.cool.store.vo.PartnerUserInfoVO; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import javax.annotation.Resource; +import java.util.Date; +import java.util.Objects; + +/** + * @Author wxp + * @Date 2024/3/28 13:48 + * @Version 1.0 + */ +@Service +public class LinePayServiceImpl implements LinePayService { + + @Resource + private LinePayDAO linePayDAO; + + @Resource + private LineInfoDAO lineInfoDAO; + + @Resource + LineInfoMapper lineInfoMapper; + + @Override + public LinePayVO getLinePayInfo(Long lineId) { + LinePayVO result = new LinePayVO(); + LinePayDO linePayDO = linePayDAO.getLinePayByLineId(lineId); + if (linePayDO != null){ + BeanUtil.copyProperties(linePayDO,result); + } + return result; + } + + @Override + @Transactional(rollbackFor = Exception.class) + public Long submitPayInfo(LinePaySubmitRequest request, PartnerUserInfoVO partnerUser) { + LineInfoDO lineInfo = lineInfoDAO.getLineInfo(request.getLineId()); + if(Objects.isNull(lineInfo)){ + throw new ServiceException(ErrorCodeEnum.LINE_ID_IS_NOT_EXIST); + } + LinePayDO linePayDO = linePayDAO.getLinePayByLineId(request.getLineId()); + if(linePayDO == null){ + linePayDO = new LinePayDO(); + fillLinePay(true, linePayDO, request, partnerUser); + linePayDAO.addLinePay(linePayDO); + }else { + fillLinePay(false, linePayDO, request, partnerUser); + linePayDAO.updateLinePay(linePayDO); + } + lineInfo.setWorkflowSubStage(WorkflowSubStageEnum.SIGN_INTENT_AGREEMENT.getCode()); + lineInfo.setWorkflowSubStageStatus(WorkflowSubStageStatusEnum.SIGN_INTENT_AGREEMENT_60.getCode()); + lineInfoMapper.insertOrUpdate(lineInfo); + return linePayDO.getId(); + } + + private void fillLinePay(Boolean isAdd, LinePayDO linePayDO, LinePaySubmitRequest request, PartnerUserInfoVO partnerUser) { + linePayDO.setPayType(request.getPayType()); + linePayDO.setPayUserName(request.getPayUserName()); + linePayDO.setPayAccount(request.getPayAccount()); + linePayDO.setBankCode(request.getBankCode()); + linePayDO.setBankName(request.getBankName()); + linePayDO.setBranchBankCode(request.getBranchBankCode()); + linePayDO.setBranchBankName(request.getBranchBankName()); + linePayDO.setPayTime(request.getPayTime()); + linePayDO.setPayPic(request.getPayPic()); + linePayDO.setPromisePic(request.getPromisePic()); + if(isAdd){ + linePayDO.setPartnerId("123"); + // linePayDO.setPartnerId(partnerUser.getPartnerId()); + linePayDO.setLineId(request.getLineId()); + linePayDO.setCreateTime(new Date()); + linePayDO.setCreateUserId(partnerUser.getPartnerId()); + linePayDO.setDeleted(false); + linePayDO.setPayStatus(WorkflowSubStageStatusEnum.PAY_DEPOSIT_50.getCode()); + }else { + linePayDO.setUpdateTime(new Date()); + linePayDO.setUpdateUserId(partnerUser.getPartnerId()); + } + } + +} diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/LineServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/LineServiceImpl.java index 08a394974..fea360164 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/LineServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/LineServiceImpl.java @@ -1,32 +1,38 @@ package com.cool.store.service.impl; import cn.hutool.core.bean.BeanUtil; +import cn.hutool.core.date.DateUtil; +import com.cool.store.constants.CommonConstants; import com.cool.store.context.LoginUserInfo; -import com.cool.store.dao.EnterpriseUserDAO; -import com.cool.store.dao.HyOpenAreaInfoDAO; -import com.cool.store.dao.HyPartnerUserChannelDAO; -import com.cool.store.dao.LineInfoDAO; +import com.cool.store.dao.*; import com.cool.store.entity.EnterpriseUserDO; import com.cool.store.entity.HyOpenAreaInfoDO; import com.cool.store.entity.HyPartnerLabelDO; import com.cool.store.entity.LineInfoDO; import com.cool.store.enums.ErrorCodeEnum; +import com.cool.store.enums.OperateTypeEnum; +import com.cool.store.enums.WorkflowStageEnum; import com.cool.store.exception.ServiceException; +import com.cool.store.mapper.RegionMapper; +import com.cool.store.request.AddTagsRequest; import com.cool.store.request.LineListRequest; import com.cool.store.service.DeskService; import com.cool.store.service.LineService; +import com.cool.store.service.RegionService; +import com.cool.store.utils.CoolDateUtils; +import com.cool.store.utils.StringUtil; import com.cool.store.utils.poi.DateUtils; import com.cool.store.vo.BaseInfoVO; import com.cool.store.vo.LineInfoVO; import com.cool.store.vo.LineListVO; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; +import org.apache.commons.collections4.CollectionUtils; +import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; import javax.annotation.Resource; -import java.util.ArrayList; -import java.util.List; -import java.util.Map; +import java.util.*; import java.util.stream.Collectors; /** @@ -47,6 +53,10 @@ public class LineServiceImpl implements LineService { HyPartnerUserChannelDAO hyPartnerUserChannelDAO; @Resource EnterpriseUserDAO enterpriseUserDAO; + @Resource + RegionService regionService; + @Resource + RegionDao regionDao; @Override public LineInfoVO getLineInfo(Long lineId) { @@ -56,6 +66,28 @@ public class LineServiceImpl implements LineService { if (lineInfo==null){ throw new ServiceException(ErrorCodeEnum.LINE_ID_IS_NOT_EXIST); } + if (lineInfo.getLineSource()!=null){ + Map channelMapByIds = hyPartnerUserChannelDAO.getChannelMapByIds(Arrays.asList(lineInfo.getLineSource())); + result.setLineSourceName(channelMapByIds.get(lineInfo.getLineSource())); + } + if (StringUtil.isNotEmpty(lineInfo.getInvestmentManager())){ + EnterpriseUserDO user = enterpriseUserDAO.getUserInfoById(lineInfo.getInvestmentManager()); + result.setInvestmentManagerName(user.getName()); + result.setInvestmentManagerMobile(user.getMobile()); + } + if(lineInfo.getRegionId()!=null){ + Long bigRegionIdByAreaId = regionService.getBigRegionIdByAreaId(lineInfo.getWantShopAreaId()); + Map regionNameMap = regionDao.getRegionNameMap(Arrays.asList(bigRegionIdByAreaId, lineInfo.getRegionId())); + result.setRegionId(lineInfo.getRegionId()); + result.setRegionName(regionNameMap.get(lineInfo.getRegionId())); + result.setLargeRegionId(bigRegionIdByAreaId); + result.setLargeRegionName(regionNameMap.get(bigRegionIdByAreaId)); + } + Map userPortraitMap = deskService.getUserPortraitMap(Arrays.asList(lineInfo)); + Map wantShopAreaMap = hyOpenAreaInfoDAO.selectNameMapByIds(Arrays.asList(lineInfo.getWantShopAreaId())); + BaseInfoVO baseInfoVO = deskService.convertToBaseInfoVO(lineInfo, userPortraitMap, wantShopAreaMap); + result.setWantShopAreaName(baseInfoVO.getWantShopAreaName()); + result.setUserPortraitList(baseInfoVO.getUserPortraitList()); BeanUtil.copyProperties(lineInfo,result); return result; } @@ -90,4 +122,18 @@ public class LineServiceImpl implements LineService { page.setList(result); return page; } + + @Override + public Boolean addTags(LoginUserInfo user, AddTagsRequest addTagsRequest) { + LineInfoDO lineInfo = lineInfoDAO.getLineInfo(addTagsRequest.getLineId()); + if (lineInfo==null){ + throw new ServiceException(ErrorCodeEnum.LINE_ID_IS_NOT_EXIST); + } + + lineInfo.setUserPortrait(CollectionUtils.isNotEmpty(addTagsRequest.getTags())? + addTagsRequest.getTags().stream().map(Object::toString).collect(Collectors.joining(CommonConstants.COMMA, CommonConstants.COMMA, CommonConstants.COMMA)):""); + lineInfoDAO.updateLineInfo(lineInfo); + return Boolean.TRUE; + } + } diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/OSSServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/OSSServiceImpl.java new file mode 100644 index 000000000..5c89bb197 --- /dev/null +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/OSSServiceImpl.java @@ -0,0 +1,71 @@ +package com.cool.store.service.impl; + +import com.aliyun.oss.OSS; +import com.aliyun.oss.OSSClientBuilder; +import com.aliyun.oss.common.utils.BinaryUtil; +import com.aliyun.oss.model.MatchMode; +import com.aliyun.oss.model.PolicyConditions; +import com.cool.store.enums.ErrorCodeEnum; +import com.cool.store.exception.ServiceException; +import com.cool.store.response.ResponseResult; +import com.cool.store.service.OSSService; +import com.cool.store.vo.oss.OssUploadConfigVO; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.stereotype.Service; +import org.springframework.web.multipart.MultipartFile; + +import java.util.Date; +import java.util.Objects; + +/** + * @Author suzhuhong + * @Date 2024/3/28 14:29 + * @Version 1.0 + */ +@Service +@Slf4j +public class OSSServiceImpl implements OSSService { + + @Value("${oss.accessKeyId:null}") + private String accessKeyId; + @Value("${oss.accessKeySecret:null}") + private String accessKeySecret; + @Value("${oss.endpoint:null}") + private String endpoint; + @Value("${oss.bucket:null}") + private String bucket; + @Value("${cdn.url:null}") + private String cdnUrl; + @Value("${oss.file.dir:null}") + private String dir; + + @Override + public OssUploadConfigVO getUploadFileConfig() { + // host的格式为 bucketname.endpoint + String host = "https://" + bucket + "." + endpoint; + OSS client = null; + try { + client = new OSSClientBuilder().build(endpoint, accessKeyId, accessKeySecret); + long expireTime = 300; + long expireEndTime = System.currentTimeMillis() + expireTime * 1000; + Date expiration = new Date(expireEndTime); + PolicyConditions policyConds = new PolicyConditions(); + policyConds.addConditionItem(PolicyConditions.COND_CONTENT_LENGTH_RANGE, 0, 1048576000); + policyConds.addConditionItem(MatchMode.StartWith, PolicyConditions.COND_KEY, dir); + String postPolicy = client.generatePostPolicy(expiration, policyConds); + byte[] binaryData = postPolicy.getBytes("utf-8"); + String encodedPolicy = BinaryUtil.toBase64String(binaryData); + String signature = client.calculatePostSignature(postPolicy); + OssUploadConfigVO result = new OssUploadConfigVO(accessKeyId, encodedPolicy, signature, dir, host, String.valueOf(expireEndTime / 1000), cdnUrl); + return result; + }catch (Exception e){ + log.info("exception", e); + throw new ServiceException(ErrorCodeEnum.GET_INFO_ERROR); + }finally { + if(Objects.nonNull(client)){ + client.shutdown(); + } + } + } +} diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/RegionAreaConfigServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/RegionAreaConfigServiceImpl.java new file mode 100644 index 000000000..2a11cbc5c --- /dev/null +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/RegionAreaConfigServiceImpl.java @@ -0,0 +1,63 @@ +package com.cool.store.service.impl; + +import com.cool.store.context.LoginUserInfo; +import com.cool.store.dao.RegionAreaConfigDao; +import com.cool.store.entity.RegionAreaConfigDO; +import com.cool.store.request.RegionAreaConfigAddRequest; +import com.cool.store.service.RegionAreaConfigService; +import lombok.extern.slf4j.Slf4j; +import org.apache.commons.collections4.CollectionUtils; +import org.apache.commons.collections4.ListUtils; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.ArrayList; +import java.util.List; +import java.util.stream.Collectors; + +/** + * @Author wxp + * @Date 2022/12/29 11:18 + * @Version 1.0 + */ +@Service +@Slf4j +public class RegionAreaConfigServiceImpl implements RegionAreaConfigService { + + @Resource + private RegionAreaConfigDao regionAreaConfigDao; + + @Override + public Boolean saveOrUpdateRegionAreaConfig(RegionAreaConfigAddRequest regionAreaConfigAddRequest, LoginUserInfo user) { + List areaIdList = regionAreaConfigAddRequest.getAreaIdList(); + if(CollectionUtils.isEmpty(areaIdList)){ + return Boolean.TRUE; + } + regionAreaConfigDao.deleteRegionAreaConfigByRegionId(regionAreaConfigAddRequest.getRegionId()); + List regionAreaConfigList = new ArrayList<>(); + for (Long areaId: areaIdList) { + RegionAreaConfigDO regionAreaConfigDO = new RegionAreaConfigDO(); + regionAreaConfigDO.setRegionId(regionAreaConfigAddRequest.getRegionId()); + regionAreaConfigDO.setWantShopAreaId(areaId); + regionAreaConfigDO.setCreateUserId(user.getUserId()); + regionAreaConfigDO.setUpdateUserId(user.getUserId()); + regionAreaConfigList.add(regionAreaConfigDO); + } + if (CollectionUtils.isNotEmpty(regionAreaConfigList)) { + regionAreaConfigDao.batchInsertOrUpdateRegionAreaConfig(regionAreaConfigList); + } + return Boolean.TRUE; + } + + @Override + public List listAreaIdByRegionId(Long regionId) { + List regionAreaConfigDOList = regionAreaConfigDao.listAreaByRegionId(regionId); + List areaIdIdList = ListUtils.emptyIfNull(regionAreaConfigDOList) + .stream() + .map(RegionAreaConfigDO::getWantShopAreaId) + .collect(Collectors.toList()); + return areaIdIdList; + } + + +} diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/RegionServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/RegionServiceImpl.java new file mode 100644 index 000000000..4271ba9b0 --- /dev/null +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/RegionServiceImpl.java @@ -0,0 +1,117 @@ +package com.cool.store.service.impl; + +import cn.hutool.json.JSONUtil; +import com.alibaba.fastjson.JSONObject; +import com.cool.store.constants.CommonConstants; +import com.cool.store.dao.RegionAreaConfigDao; +import com.cool.store.dao.RegionDao; +import com.cool.store.entity.RegionDO; +import com.cool.store.enums.ErrorCodeEnum; +import com.cool.store.exception.ServiceException; +import com.cool.store.mapper.RegionMapper; +import com.cool.store.service.RegionService; +import com.cool.store.utils.RedisConstantUtil; +import com.cool.store.utils.RedisUtilPool; +import com.cool.store.utils.poi.constant.Constants; +import com.cool.store.vo.RegionPathNameVO; +import lombok.extern.slf4j.Slf4j; +import org.apache.commons.collections4.CollectionUtils; +import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.*; +import java.util.stream.Collectors; + +/** + * @ClassName RegionServiceImpl + * @Description 区域服务 + */ +@Slf4j +@Service +public class RegionServiceImpl implements RegionService { + + @Autowired + private RedisConstantUtil redisConstantUtil; + @Resource + private RedisUtilPool redisUtilPool; + @Resource + private RegionMapper regionMapper; + @Resource + private RegionDao regionDao; + @Resource + private RegionAreaConfigDao regionAreaConfigDao; + + + @Override + public RegionPathNameVO getAllRegionName(Long regionId) { + RegionDO regionDO = regionMapper.getByRegionId(regionId); + if(regionDO == null){ + throw new ServiceException(ErrorCodeEnum.REGION_NOT_EXIST); + } + + if(regionDO.getDeleted() || StringUtils.isBlank(regionDO.getRegionPath()) || CommonConstants.LONG_ONE.equals(regionDO.getId())){ + return RegionPathNameVO.builder().allRegionName(regionDO.getName()).regionNameList(Arrays.asList(regionDO.getName())).build(); + } + //若果在缓存中存在，从缓存中去取 + String regionNameListStr = redisUtilPool.getString(redisConstantUtil.getRegionNameListKey(String.valueOf(regionId))); + if(StringUtils.isNotBlank(regionNameListStr)){ + RegionPathNameVO regionPathNameVO = JSONObject.parseObject(regionNameListStr, RegionPathNameVO.class); + if(regionPathNameVO == null){ + regionPathNameVO = new RegionPathNameVO(); + } + return regionPathNameVO; + } + String regionPath = regionDO.getRegionPath().substring(1, regionDO.getRegionPath().length() - 1); + String[] regionIdArr = regionPath.split(Constants.FORWARD_SLASH); + List regionDOList = regionMapper.getRegionByRegionIds(Arrays.asList(regionIdArr)); + Map regionNameMap = new HashMap<>(); + if(CollectionUtils.isNotEmpty(regionDOList)){ + regionNameMap = regionDOList.stream().collect(Collectors.toMap(RegionDO::getId,RegionDO::getName)); + } + List regionNameList = new ArrayList<>(); + StringBuilder allRegionName = new StringBuilder(); + for (String id : regionIdArr){ + if(StringUtils.isBlank(id) || !regionNameMap.containsKey(Long.valueOf(id))){ + continue; + } + allRegionName.append(regionNameMap.get(Long.valueOf(id))).append(Constants.M_LINE); + regionNameList.add(regionNameMap.get(Long.valueOf(id))); + } + allRegionName.append(regionDO.getName()); + regionNameList.add(regionDO.getName()); + RegionPathNameVO regionPathNameVO = RegionPathNameVO.builder().allRegionName(allRegionName.toString()).regionNameList(regionNameList).build(); + //放在缓存中存5分钟 + redisUtilPool.setString(redisConstantUtil.getRegionNameListKey(String.valueOf(regionId)), JSONUtil.toJsonStr(regionPathNameVO), 5 * 60); + return regionPathNameVO; + } + + /** + * 根据意向区域找大区id + * @param wantShopAreaId + * @return + */ + @Override + public Long getBigRegionIdByAreaId(Long wantShopAreaId) { + // 根据意向省市获取战区id + Long warRegionId = regionAreaConfigDao.getByWantShopAreaId(wantShopAreaId); + if(Objects.isNull(warRegionId)){ + return 0L; + } + RegionDO warRegion = regionMapper.getByRegionId(warRegionId); + if(warRegion == null){ + throw new ServiceException(ErrorCodeEnum.REGION_NOT_EXIST); + } + // 根据战区id获取大区id + String warRegionPath = warRegion.getRegionPath().substring(1, warRegion.getRegionPath().length() - 1); + String[] warRegionIdArr = warRegionPath.split(Constants.FORWARD_SLASH); + List regionDOList = regionMapper.getRegionByRegionIds(Arrays.asList(warRegionIdArr)); + for (RegionDO regionDO : regionDOList){ + if(regionDO.getRegionType().equals("大区")){ + return regionDO.getId(); + } + } + return 0L; + } +} diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/WechatMiniAppServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/WechatMiniAppServiceImpl.java index 8ebb820b6..23012ebb7 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/WechatMiniAppServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/WechatMiniAppServiceImpl.java @@ -222,11 +222,13 @@ public class WechatMiniAppServiceImpl implements WechatMiniAppService { private void fillLineInfo(PartnerUserInfoVO userInfoVO, String partnerId) { LineInfoDO lineInfoDO = lineInfoDAO.getByPartnerId(partnerId); if (lineInfoDO != null){ + userInfoVO.setUsername(lineInfoDO.getUsername()); userInfoVO.setLineId(lineInfoDO.getId()); userInfoVO.setWorkflowStage(lineInfoDO.getWorkflowStage()); userInfoVO.setWorkflowSubStage(lineInfoDO.getWorkflowSubStage()); userInfoVO.setWorkflowSubStageStatus(lineInfoDO.getWorkflowSubStageStatus()); userInfoVO.setLineStatus(lineInfoDO.getLineStatus()); + userInfoVO.setLineSource(lineInfoDO.getLineSource()); } } diff --git a/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/LineInfoController.java b/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/LineInfoController.java index df361c596..c2744e2d9 100644 --- a/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/LineInfoController.java +++ b/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/LineInfoController.java @@ -2,6 +2,7 @@ package com.cool.store.controller.webb; import com.cool.store.context.CurrentUserHolder; import com.cool.store.context.LoginUserInfo; +import com.cool.store.request.AddTagsRequest; import com.cool.store.request.LineListRequest; import com.cool.store.response.ResponseResult; import com.cool.store.service.LineService; @@ -58,6 +59,12 @@ public class LineInfoController { return ResponseResult.success(lineService.getLineList(lineListRequest,user,Boolean.TRUE)); } + @PostMapping(path = "/addTags") + @ApiOperation("添加标签接口") + public ResponseResult addTags(@RequestBody AddTagsRequest addTagsRequest){ + return ResponseResult.success(lineService.addTags(CurrentUserHolder.getUser(),addTagsRequest)); + } + diff --git a/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/OssClientController.java b/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/OssClientController.java new file mode 100644 index 000000000..b523b1502 --- /dev/null +++ b/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/OssClientController.java @@ -0,0 +1,31 @@ +package com.cool.store.controller.webb; + +import com.cool.store.response.ResponseResult; +import com.cool.store.service.OSSService; +import io.swagger.annotations.Api; +import lombok.extern.slf4j.Slf4j; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.annotation.Resource; + +/** + * @Author suzhuhong + * @Date 2024/3/28 14:25 + * @Version 1.0 + */ +@Api(tags ="PC OSS配置") +@RestController +@RequestMapping({"/pc/oss"}) +@Slf4j +public class OssClientController { + + @Resource + OSSService ossService; + + @GetMapping("/getUploadFileConfig") + public ResponseResult getUploadFileConfig(){ + return ResponseResult.success(ossService.getUploadFileConfig()); + } +} diff --git a/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/RegionAreaConfigController.java b/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/RegionAreaConfigController.java new file mode 100644 index 000000000..3b3c1134b --- /dev/null +++ b/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/RegionAreaConfigController.java @@ -0,0 +1,41 @@ +package com.cool.store.controller.webb; + +import com.cool.store.context.CurrentUserHolder; +import com.cool.store.context.LoginUserInfo; +import com.cool.store.request.RegionAreaConfigAddRequest; +import com.cool.store.response.ResponseResult; +import com.cool.store.service.RegionAreaConfigService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import javax.validation.Valid; +import java.util.List; + +/** + * @author wxp + * @version 1.0 + */ +@Api(tags = "区域配置") +@RestController +@RequestMapping("pc/regionAreaConfig") +public class RegionAreaConfigController { + + @Autowired + private RegionAreaConfigService regionAreaConfigService; + + @ApiOperation(value = "区域配置省市") + @PostMapping("/addRegionAreaConfig") + public ResponseResult saveOrUpdateRegionAreaConfig(@Valid @RequestBody RegionAreaConfigAddRequest request) { + LoginUserInfo user = CurrentUserHolder.getUser(); + return ResponseResult.success(regionAreaConfigService.saveOrUpdateRegionAreaConfig(request, user)); + } + + @ApiOperation("根据战区id获取配置的省市列表") + @GetMapping("/listAreaIdByRegionId") + public ResponseResult> listAreaIdByRegionId(@RequestParam("regionId")Long regionId) { + return ResponseResult.success(regionAreaConfigService.listAreaIdByRegionId(regionId)); + } + +} diff --git a/coolstore-partner-web/src/main/java/com/cool/store/controller/webc/BankController.java b/coolstore-partner-web/src/main/java/com/cool/store/controller/webc/BankController.java new file mode 100644 index 000000000..13f2bbaa9 --- /dev/null +++ b/coolstore-partner-web/src/main/java/com/cool/store/controller/webc/BankController.java @@ -0,0 +1,46 @@ +package com.cool.store.controller.webc; + +import com.cool.store.entity.BankdocDO; +import com.cool.store.entity.BanktypeDO; +import com.cool.store.request.BranchBankPageRequest; +import com.cool.store.response.ResponseResult; +import com.cool.store.service.BankService; +import com.github.pagehelper.PageInfo; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; + +/** + * @author Fun Li 2023/8/10 14:20 + * @version 1.0 + */ +@RestController +@RequestMapping("/mini/bank") +@Api(tags = "银行信息") +@Slf4j +public class BankController { + + @Autowired + private BankService bankService; + + @ApiOperation("银行类型") + @GetMapping("/listBank") + public ResponseResult> listBank() { + List result = bankService.listBank(); + return ResponseResult.success(result); + } + + @ApiOperation("支行列表查询") + @GetMapping("/listBranchBank") + public ResponseResult> listBranchBank(@RequestBody BranchBankPageRequest request) { + return ResponseResult.success(bankService.listBranchBank(request)); + } + +} diff --git a/coolstore-partner-web/src/main/java/com/cool/store/controller/webc/LinePayController.java b/coolstore-partner-web/src/main/java/com/cool/store/controller/webc/LinePayController.java new file mode 100644 index 000000000..c85d3f3aa --- /dev/null +++ b/coolstore-partner-web/src/main/java/com/cool/store/controller/webc/LinePayController.java @@ -0,0 +1,48 @@ +package com.cool.store.controller.webc; + +import com.cool.store.context.PartnerUserHolder; +import com.cool.store.request.LinePaySubmitRequest; +import com.cool.store.response.ResponseResult; +import com.cool.store.service.LinePayService; +import com.cool.store.vo.LinePayVO; +import com.cool.store.vo.PartnerUserInfoVO; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiImplicitParam; +import io.swagger.annotations.ApiImplicitParams; +import io.swagger.annotations.ApiOperation; +import lombok.extern.slf4j.Slf4j; +import org.springframework.web.bind.annotation.*; + +import javax.annotation.Resource; + +/** + * @Author wxp + * @Date 2024/3/25 13:43 + * @Version 1.0 + */ +@RestController +@RequestMapping("/mini/linePay") +@Api(tags = "缴纳意向金") +@Slf4j +public class LinePayController { + + @Resource + private LinePayService linePayService; + + @ApiOperation("查询意向金详情") + @GetMapping("/getLinePayInfo") + @ApiImplicitParams({ + @ApiImplicitParam(name = "lineId", value = "线索id", required = true) + }) + public ResponseResult getLinePayInfo(@RequestParam("lineId")Long lineId) { + return ResponseResult.success(linePayService.getLinePayInfo(lineId)); + } + + @ApiOperation("缴纳意向金") + @PostMapping("/submitPayInfo") + public ResponseResult submitPayInfo(@RequestBody LinePaySubmitRequest request){ + PartnerUserInfoVO partnerUser = PartnerUserHolder.getUser(); + return ResponseResult.success(linePayService.submitPayInfo(request, partnerUser)); + } + +} diff --git a/coolstore-partner-web/src/main/java/com/cool/store/controller/webc/MiniOssClientController.java b/coolstore-partner-web/src/main/java/com/cool/store/controller/webc/MiniOssClientController.java new file mode 100644 index 000000000..417c90621 --- /dev/null +++ b/coolstore-partner-web/src/main/java/com/cool/store/controller/webc/MiniOssClientController.java @@ -0,0 +1,31 @@ +package com.cool.store.controller.webc; + +import com.cool.store.response.ResponseResult; +import com.cool.store.service.OSSService; +import io.swagger.annotations.Api; +import lombok.extern.slf4j.Slf4j; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.annotation.Resource; + +/** + * @Author suzhuhong + * @Date 2024/3/28 14:25 + * @Version 1.0 + */ +@RestController +@Api(tags ="小程序OSS配置") +@RequestMapping({"/mini/oss"}) +@Slf4j +public class MiniOssClientController { + + @Resource + OSSService ossService; + + @GetMapping("/getUploadFileConfig") + public ResponseResult getUploadFileConfig(){ + return ResponseResult.success(ossService.getUploadFileConfig()); + } +} diff --git a/coolstore-partner-web/src/main/java/com/cool/store/controller/webc/TestController.java b/coolstore-partner-web/src/main/java/com/cool/store/controller/webc/TestController.java index 830ff03c6..b27235345 100644 --- a/coolstore-partner-web/src/main/java/com/cool/store/controller/webc/TestController.java +++ b/coolstore-partner-web/src/main/java/com/cool/store/controller/webc/TestController.java @@ -6,7 +6,9 @@ import com.cool.store.dto.OpenCityDTO; import com.cool.store.entity.*; import com.cool.store.mapper.HyOpenAreaInfoMapper; import com.cool.store.response.ResponseResult; +import com.cool.store.service.RegionService; import com.cool.store.utils.poi.ExcelUtil; +import com.cool.store.vo.RegionPathNameVO; import lombok.extern.slf4j.Slf4j; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; @@ -41,6 +43,9 @@ public class TestController { @Resource private UserRegionMappingDAO userRegionMappingDAO; + @Resource + private RegionService regionService; + @PostMapping("/importCity") public ResponseResult importCity(MultipartFile file){ @@ -155,4 +160,10 @@ public class TestController { List userRegionMappingDOList = userRegionMappingDAO.listUserRegionMappingByUserId(userIds); return ResponseResult.success(userRegionMappingDOList); } + + @GetMapping("/getAllRegionName") + public ResponseResult getAllRegionName(@RequestParam("regionId")Long regionId){ + RegionPathNameVO regionPathNameVO = regionService.getAllRegionName(regionId); + return ResponseResult.success(regionPathNameVO); + } }