From 8b50b807a54d5ca927feb5bdadc807665882c74e Mon Sep 17 00:00:00 2001 From: wangxiaopeng <807933401@qq.com> Date: Mon, 8 Apr 2024 12:19:50 +0800 Subject: [PATCH 1/8] =?UTF-8?q?=E6=9F=A5=E8=A7=92=E8=89=B2=E4=B8=8B?= =?UTF-8?q?=E7=9A=84=E4=BA=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/cool/store/mapper/SysRoleMapper.java | 2 +- .../src/main/resources/mapper/SysRoleMapper.xml | 5 +++-- .../com/cool/store/service/RegionService.java | 7 +++++++ .../store/service/impl/RegionServiceImpl.java | 10 ++++++++++ .../service/impl/UserAuthMappingServiceImpl.java | 15 ++++++++++++++- .../store/controller/webb/RegionController.java | 5 +++++ .../webb/UserAuthMappingController.java | 8 ++++++++ 7 files changed, 48 insertions(+), 4 deletions(-) diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/SysRoleMapper.java b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/SysRoleMapper.java index 1ff259a6f..e931decb1 100644 --- a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/SysRoleMapper.java +++ b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/SysRoleMapper.java @@ -117,7 +117,7 @@ public interface SysRoleMapper { List selectUserRoleBySourceAndUserId(@Param("source") String source , @Param("userIdList") List userIdList); - List getUserIdListByRoleIdList(@Param("roleIdList") List roleIdList); + List getUserIdListByRoleIdList(@Param("roleIdList") List roleIdList); /** * 获取用户岗位信息 * @param userIdList diff --git a/coolstore-partner-dao/src/main/resources/mapper/SysRoleMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/SysRoleMapper.xml index 07bdb7e27..d6bf37949 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/SysRoleMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/SysRoleMapper.xml @@ -89,9 +89,10 @@ - select - distinct a.user_id + b.role_id as roleId, + b.user_id as userId from enterprise_user_${enterpriseId} a left join enterprise_user_role_${enterpriseId} b on a.user_id=b.user_id 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 index 6ef6c3a1c..8908b7aa0 100644 --- 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 @@ -9,6 +9,13 @@ public interface RegionService { RegionPathNameVO getAllRegionName(Long regionId); + /** + * 获取所属战区 + * @param regionId + * @return + */ + String getBelongWarRegionName(Long regionId); + /** * 根据意向区域找大区id * @param wantShopAreaId 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 index 6ee4e68e3..3a442d2f5 100644 --- 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 @@ -90,6 +90,16 @@ public class RegionServiceImpl implements RegionService { return regionPathNameVO; } + @Override + public String getBelongWarRegionName(Long regionId) { + RegionPathNameVO regionPathNameVO = this.getAllRegionName(regionId); + if(regionPathNameVO != null && StringUtils.isNotBlank(regionPathNameVO.getAllRegionName())){ + String allRegionName = regionPathNameVO.getAllRegionName(); + return allRegionName.substring(allRegionName.indexOf(Constants.M_LINE) + 1); + } + return ""; + } + /** * 根据意向区域找大区id * @param wantShopAreaId diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/UserAuthMappingServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/UserAuthMappingServiceImpl.java index f29eee8ed..970d07a4f 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/UserAuthMappingServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/UserAuthMappingServiceImpl.java @@ -113,7 +113,20 @@ public class UserAuthMappingServiceImpl implements UserAuthMappingService { if(CollectionUtils.isEmpty(roleIds) || Objects.isNull(regionId)){ return Maps.newHashMap(); } - return null; + RegionDO regionDO = regionMapper.getByRegionId(regionId); + if(regionDO == null){ + throw new ServiceException(ErrorCodeEnum.REGION_NOT_EXIST); + } + // 查找有区域权限的人 + List authRegionUserIdList = authWarRegionUser(regionId); + if(CollectionUtils.isEmpty(authRegionUserIdList)){ + return Maps.newHashMap(); + } + List roleIdList = roleIds.stream().map(a -> Long.valueOf(a)).collect(Collectors.toList()); + List enterpriseUserRoleList = sysRoleMapper.getUserIdListByRoleIdList(roleIdList); + enterpriseUserRoleList = enterpriseUserRoleList.stream().filter(o -> authRegionUserIdList.contains(o.getUserId())).collect(Collectors.toList()); + Map> enterpriseUserRoleMap = ListUtils.emptyIfNull(enterpriseUserRoleList).stream().collect(Collectors.groupingBy(EnterpriseUserRole::getRoleId, Collectors.mapping(k->k.getUserId(), Collectors.toList()))); + return enterpriseUserRoleMap; } /** diff --git a/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/RegionController.java b/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/RegionController.java index 9da5b4cea..278de5ba3 100644 --- a/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/RegionController.java +++ b/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/RegionController.java @@ -40,5 +40,10 @@ public class RegionController { return ResponseResult.success(regionService.listByThirdRegionType(parentId, thirdRegionType)); } + @ApiOperation("获取所属战区") + @GetMapping("/getBelongWarRegionName") + public ResponseResult getBelongWarRegionName(@RequestParam(value = "regionId", required = true) Long regionId) { + return ResponseResult.success(regionService.getBelongWarRegionName(regionId)); + } } diff --git a/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/UserAuthMappingController.java b/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/UserAuthMappingController.java index 49428c3c7..9d9a8c083 100644 --- a/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/UserAuthMappingController.java +++ b/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/UserAuthMappingController.java @@ -13,6 +13,7 @@ import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; import java.util.List; +import java.util.Map; /** * @ClassName UserAuthMappingController @@ -41,4 +42,11 @@ public class UserAuthMappingController { return ResponseResult.success(userAuthMappingService.listWantShopAreaIdByUserId(userId)); } + @ApiOperation("找角色下的人") + @GetMapping("/getUserIdByRoleIdAndRegionId") + public ResponseResult>> getUserIdByRoleIdAndRegionId(@RequestParam(value = "roleIds", required = true) List roleIds, + @RequestParam(value = "regionId", required = true) Long regionId) { + return ResponseResult.success(userAuthMappingService.getUserIdByRoleIdAndRegionId(roleIds, regionId)); + } + } From 94bf84c45deb4205870b8b25118a1e4cb04fffc6 Mon Sep 17 00:00:00 2001 From: wangxiaopeng <807933401@qq.com> Date: Mon, 8 Apr 2024 15:06:11 +0800 Subject: [PATCH 2/8] partnerName --- .../src/main/java/com/cool/store/vo/LinePayVO.java | 3 +++ .../com/cool/store/service/impl/LinePayServiceImpl.java | 7 +++++++ 2 files changed, 10 insertions(+) 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 index e71b13e83..a2c785484 100644 --- 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 @@ -19,6 +19,9 @@ public class LinePayVO { @ApiModelProperty("xfsg_user_info.partner_id") private String partnerId; + @ApiModelProperty("加盟商姓名") + private String partnerName; + @ApiModelProperty("line_info.id") private Long lineId; 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 index 9f3b63433..6a6bdf315 100644 --- 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 @@ -1,8 +1,10 @@ package com.cool.store.service.impl; import cn.hutool.core.bean.BeanUtil; +import com.cool.store.dao.HyPartnerUserInfoDAO; import com.cool.store.dao.LineInfoDAO; import com.cool.store.dao.LinePayDAO; +import com.cool.store.entity.HyPartnerUserInfoDO; import com.cool.store.entity.LineInfoDO; import com.cool.store.entity.LinePayDO; import com.cool.store.enums.ErrorCodeEnum; @@ -32,6 +34,9 @@ public class LinePayServiceImpl implements LinePayService { @Resource private LinePayDAO linePayDAO; + @Resource + private HyPartnerUserInfoDAO hyPartnerUserInfoDAO; + @Resource private LineInfoDAO lineInfoDAO; @@ -45,6 +50,8 @@ public class LinePayServiceImpl implements LinePayService { if (linePayDO != null){ result = new LinePayVO(); BeanUtil.copyProperties(linePayDO,result); + LineInfoDO lineInfo = lineInfoDAO.getLineInfo(lineId); + result.setPartnerName(lineInfo != null ? lineInfo.getUsername() : ""); } return result; } From 19ca51a3be71d0fe9d90d1b522823bb92d2557e1 Mon Sep 17 00:00:00 2001 From: wangxiaopeng <807933401@qq.com> Date: Mon, 8 Apr 2024 15:09:32 +0800 Subject: [PATCH 3/8] =?UTF-8?q?=E6=89=8B=E6=9C=BA=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/cool/store/vo/LinePayVO.java | 6 ++++++ .../com/cool/store/service/impl/LinePayServiceImpl.java | 1 + 2 files changed, 7 insertions(+) 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 index a2c785484..3b08c2d5a 100644 --- 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 @@ -22,6 +22,12 @@ public class LinePayVO { @ApiModelProperty("加盟商姓名") private String partnerName; + /** + * 手机号 + */ + @ApiModelProperty("手机号") + private String mobile; + @ApiModelProperty("line_info.id") private Long lineId; 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 index 6a6bdf315..ee629096b 100644 --- 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 @@ -52,6 +52,7 @@ public class LinePayServiceImpl implements LinePayService { BeanUtil.copyProperties(linePayDO,result); LineInfoDO lineInfo = lineInfoDAO.getLineInfo(lineId); result.setPartnerName(lineInfo != null ? lineInfo.getUsername() : ""); + result.setMobile(lineInfo != null ? lineInfo.getMobile() : ""); } return result; } From de3fca1aeefd4fbb16d1ea0069ce3e3dd3bf2496 Mon Sep 17 00:00:00 2001 From: guohb Date: Mon, 8 Apr 2024 15:12:58 +0800 Subject: [PATCH 4/8] =?UTF-8?q?=E5=8A=A0=E7=9B=9F=E5=95=86=E7=BC=96?= =?UTF-8?q?=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cool/store/enums/ReceivingBankEnum.java | 44 ++++++++++++ .../main/resources/mapper/LineInfoMapper.xml | 11 ++- .../com/cool/store/entity/FranchiseeDO.java | 72 +++++++++++++++++++ .../com/cool/store/entity/LineInfoDO.java | 4 +- .../store/request/FranchiseeSaveRequest.java | 54 ++++++++++++++ .../com/cool/store/context/LoginUserInfo.java | 4 ++ .../store/service/IntentAgreementService.java | 3 + .../impl/IntentAgreementServiceImpl.java | 62 +++++++++++++--- .../store/utils/poi/constant/Constants.java | 5 ++ .../webb/PCIntentAgreementController.java | 9 +++ 10 files changed, 258 insertions(+), 10 deletions(-) create mode 100644 coolstore-partner-common/src/main/java/com/cool/store/enums/ReceivingBankEnum.java create mode 100644 coolstore-partner-model/src/main/java/com/cool/store/entity/FranchiseeDO.java create mode 100644 coolstore-partner-model/src/main/java/com/cool/store/request/FranchiseeSaveRequest.java diff --git a/coolstore-partner-common/src/main/java/com/cool/store/enums/ReceivingBankEnum.java b/coolstore-partner-common/src/main/java/com/cool/store/enums/ReceivingBankEnum.java new file mode 100644 index 000000000..b1e29c3ea --- /dev/null +++ b/coolstore-partner-common/src/main/java/com/cool/store/enums/ReceivingBankEnum.java @@ -0,0 +1,44 @@ +package com.cool.store.enums; + +public enum ReceivingBankEnum { + + XFSG_RECEIVING_BANK("鲜丰水果股份有限公司","33050161642700001117","中国建设银行浙江省分行文晖支行"), + + + ; + + + private String accountName; + private String accountNum; + private String bank; + + ReceivingBankEnum(String accountName, String accountNum, String bank) { + this.accountName = accountName; + this.accountNum = accountNum; + this.bank = bank; + } + + public String getAccountName() { + return accountName; + } + + public void setAccountName(String accountName) { + this.accountName = accountName; + } + + public String getAccountNum() { + return accountNum; + } + + public void setAccountNum(String accountNum) { + this.accountNum = accountNum; + } + + public String getBank() { + return bank; + } + + public void setBank(String bank) { + this.bank = bank; + } +} diff --git a/coolstore-partner-dao/src/main/resources/mapper/LineInfoMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/LineInfoMapper.xml index 2279265c7..13bf8c094 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/LineInfoMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/LineInfoMapper.xml @@ -113,7 +113,10 @@ update_user_id, - deleted + deleted, + + + partner_num, @@ -198,6 +201,9 @@ #{param.deleted} + + #{param.partnerNum} + ON DUPLICATE KEY UPDATE @@ -279,6 +285,9 @@ deleted = #{param.deleted} + + partner_num = #{param.partnerNum} + diff --git a/coolstore-partner-model/src/main/java/com/cool/store/entity/FranchiseeDO.java b/coolstore-partner-model/src/main/java/com/cool/store/entity/FranchiseeDO.java new file mode 100644 index 000000000..c50f7a7be --- /dev/null +++ b/coolstore-partner-model/src/main/java/com/cool/store/entity/FranchiseeDO.java @@ -0,0 +1,72 @@ +package com.cool.store.entity; + +import lombok.Data; + +@Data +public class FranchiseeDO { + /** + * 开户行 + */ + private String bank; + /** + * 开户行支行 + */ + private String bankSub; + /** + * 生日 + */ + private String birthday; + /** + * 城市代码 + */ + private String cityCode; + /** + * 加盟商手机号码 + */ + private String frMobile; + /** + * 加盟商姓名 + */ + private String frName; + /** + * 个人身份证号/企业统一社会信用代码 + */ + private String idCard; + /** + * 身份证地址/公司地址 + */ + private String idCardAddress; + /** + * 身份证原件国徽面/食品经营许可证上传 + */ + private String idCardBackUrl; + /** + * 身份证原件正面地址/营业执照拍照上传 + */ + private String idCardFrontUrl; + /** + * 操作人工号 + */ + private String operator; + /** + * 缴款时间 + */ + private String payDateStr; + /** + * 省份代码 + */ + private String provinceCode; + /** + * 收款账户 + */ + private String retAccount; + /** + * 性别：0-女，1-男 + */ + private Integer sex; + /** + * 签约类型：0-个人签约；1-企业签约 + */ + private long signType; + +} 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 678ac5bcf..0b0ae3a51 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 @@ -163,7 +163,9 @@ public class LineInfoDO { * 是否删除：0.否 1.是 */ private Boolean deleted; - + /** + * 加盟商编码 + */ private String partnerNum; } \ No newline at end of file diff --git a/coolstore-partner-model/src/main/java/com/cool/store/request/FranchiseeSaveRequest.java b/coolstore-partner-model/src/main/java/com/cool/store/request/FranchiseeSaveRequest.java new file mode 100644 index 000000000..31c34fd61 --- /dev/null +++ b/coolstore-partner-model/src/main/java/com/cool/store/request/FranchiseeSaveRequest.java @@ -0,0 +1,54 @@ +package com.cool.store.request; + +import com.cool.store.entity.FranchiseeDO; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +public class FranchiseeSaveRequest { + + private String partnerId; + + private Long lineId; + + @ApiModelProperty("加盟商姓名") + private String frName; + + @ApiModelProperty("加盟商手机号码") + private String frMobile; + + @ApiModelProperty("个人身份证号/企业统一社会信用代码") + private String idCard; + + @ApiModelProperty("身份证地址/公司地址") + private String idCardAddress; + + @ApiModelProperty("性别：0-女，1-男") + private Integer sex; + + @ApiModelProperty("身份证原件正面地址/营业执照拍照上传") + private String idCardFrontUrl; + @ApiModelProperty("身份证原件国徽面/食品经营许可证上传") + private String idCardBackUrl; + + @ApiModelProperty("0-个人签约；1-企业签约") + private Integer signType; + + @ApiModelProperty("生日，企业不用传") + private String birthday; + + + public FranchiseeDO toFranchiseeDO() { + FranchiseeDO franchiseeDO = new FranchiseeDO(); + franchiseeDO.setBirthday(this.birthday); + franchiseeDO.setFrMobile(this.frMobile); + franchiseeDO.setFrName(this.frName); + franchiseeDO.setIdCard(this.idCard); + franchiseeDO.setIdCardAddress(this.idCardAddress); + franchiseeDO.setIdCardBackUrl(this.idCardBackUrl); + franchiseeDO.setIdCardFrontUrl(this.idCardFrontUrl); + franchiseeDO.setSex(this.sex); + franchiseeDO.setSignType(this.signType); + return franchiseeDO; + } +} diff --git a/coolstore-partner-service/src/main/java/com/cool/store/context/LoginUserInfo.java b/coolstore-partner-service/src/main/java/com/cool/store/context/LoginUserInfo.java index feadd1bd9..18ac9900e 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/context/LoginUserInfo.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/context/LoginUserInfo.java @@ -31,4 +31,8 @@ public class LoginUserInfo { // private SysRoleDO sysRole; private Integer onlineStatus; + /** + * 工号 + */ + private String jobNumber; } diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/IntentAgreementService.java b/coolstore-partner-service/src/main/java/com/cool/store/service/IntentAgreementService.java index 524d132a9..b3e4ab378 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/IntentAgreementService.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/IntentAgreementService.java @@ -1,5 +1,6 @@ package com.cool.store.service; +import com.cool.store.request.FranchiseeSaveRequest; import com.cool.store.request.InitiatingRequest; import com.cool.store.request.IntentAgreementSubmitRequest; import com.cool.store.response.InitiatingResponse; @@ -22,4 +23,6 @@ public interface IntentAgreementService { SigningBaseInfoResponse getMiniIntentAgreement(String partnerId, Long lineId); InitiatingResponse initiating(InitiatingRequest request); + + InitiatingResponse save(FranchiseeSaveRequest request); } diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/IntentAgreementServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/IntentAgreementServiceImpl.java index 332958830..78ce7f639 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/IntentAgreementServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/IntentAgreementServiceImpl.java @@ -1,19 +1,19 @@ package com.cool.store.service.impl; +import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; import com.cool.store.context.CurrentUserHolder; import com.cool.store.context.LoginUserInfo; import com.cool.store.dao.LineInfoDAO; import com.cool.store.entity.*; import com.cool.store.enums.ErrorCodeEnum; +import com.cool.store.enums.ReceivingBankEnum; import com.cool.store.enums.WorkflowSubStageEnum; import com.cool.store.enums.WorkflowSubStageStatusEnum; import com.cool.store.exception.ServiceException; -import com.cool.store.mapper.IntentAgreementMapper; -import com.cool.store.mapper.JoinIntentionMapper; -import com.cool.store.mapper.LineAuditInfoMapper; -import com.cool.store.mapper.LineInfoMapper; +import com.cool.store.mapper.*; import com.cool.store.mq.util.HttpRestTemplateService; +import com.cool.store.request.FranchiseeSaveRequest; import com.cool.store.request.InitiatingRequest; import com.cool.store.request.IntentAgreementSubmitRequest; import com.cool.store.response.InitiatingResponse; @@ -28,11 +28,11 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; +import java.text.SimpleDateFormat; import java.util.HashMap; import java.util.Map; import java.util.Objects; -import static com.cool.store.enums.ErrorCodeEnum.PARAMS_VALIDATE_ERROR; @Service @Slf4j @@ -60,6 +60,12 @@ public class IntentAgreementServiceImpl extends LineFlowService implements Inten @Resource LineAuditInfoMapper lineAuditInfoMapper; + @Resource + LinePayMapper linePayMapper; + + @Resource + HyOpenAreaInfoMapper openAreaInfoMapper; + @Override @Transactional(rollbackFor = Exception.class) @@ -88,7 +94,7 @@ public class IntentAgreementServiceImpl extends LineFlowService implements Inten @Override public SigningBaseInfoResponse getMiniIntentAgreement(String partnerId, Long lineId) { if (StringUtil.isBlank(partnerId) && lineId == null) { - throw new ServiceException(PARAMS_VALIDATE_ERROR); + throw new ServiceException(ErrorCodeEnum.PARAMS_VALIDATE_ERROR); } SigningBaseInfoDO signingBaseInfoDO = intentAgreementMapper.selectByPartnerIdOrLineId(partnerId, lineId); if (Objects.isNull(signingBaseInfoDO)) { @@ -98,9 +104,9 @@ public class IntentAgreementServiceImpl extends LineFlowService implements Inten SigningBaseInfoResponse response = SigningBaseInfoResponse.from(signingBaseInfoDO); MemberQuestionDO byLineId = joinIntentionMapper.getByLineId(lineId); response.setType(byLineId.getJoinType()); - if (Objects.nonNull(signingBaseInfoDO.getAuditId())){ + if (Objects.nonNull(signingBaseInfoDO.getAuditId())) { LineAuditInfoDO lineAuditInfoDO = lineAuditInfoMapper.selectByPrimaryKey(signingBaseInfoDO.getAuditId()); - if (Objects.isNull(lineAuditInfoDO)){ + if (Objects.isNull(lineAuditInfoDO)) { response.setRejectPublicReason(null); } response.setRejectPublicReason(lineAuditInfoDO.getRejectPublicReason()); @@ -187,6 +193,46 @@ public class IntentAgreementServiceImpl extends LineFlowService implements Inten } + @Override + public InitiatingResponse save(FranchiseeSaveRequest request) { + log.info("save request:{}", JSONObject.toJSONString(request)); + if (Objects.isNull(request)) { + throw new ServiceException(ErrorCodeEnum.PARAMS_VALIDATE_ERROR); + } + Map requestMap = new HashMap<>(); + fillSignatureInfo(requestMap); + String url = xfsgUrl + Constants.FRANCHISEE_STORE_NUM + "?timestamp=" + requestMap.get("timestamp") + "&signature=" + requestMap.get("signature"); + FranchiseeDO franchiseeDO = request.toFranchiseeDO(); + //查银行信息 + LinePayDO linePayDO = linePayMapper.getLinePayByLineId(request.getLineId()); + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); + String dateString = sdf.format(linePayDO.getPayTime()); + franchiseeDO.setPayDateStr(dateString); + franchiseeDO.setRetAccount(ReceivingBankEnum.XFSG_RECEIVING_BANK.getAccountNum()); + franchiseeDO.setBank(linePayDO.getBankCode()); + franchiseeDO.setBankSub(linePayDO.getBranchBankCode()); + //查城市信息 + LineInfoDO lineInfoDO = lineInfoMapper.getByLineId(request.getLineId()); + HyOpenAreaInfoDO openAreaInfoDO = openAreaInfoMapper.selectById(lineInfoDO.getWantShopAreaId()); + franchiseeDO.setProvinceCode(String.valueOf(openAreaInfoDO.getParentId())); + franchiseeDO.setCityCode(String.valueOf(openAreaInfoDO.getId())); + //操作人工号 暂时写死 + LoginUserInfo user = CurrentUserHolder.getUser(); + franchiseeDO.setOperator("22090043"); + InitiatingResponse initiatingResponse = httpRestTemplateService.postForObject(url, franchiseeDO, InitiatingResponse.class); + //更新线索(进入蓄水池并回填加盟商编码) + if (initiatingResponse.getCode() == 0){ + LineInfoDO lineInfoParam = new LineInfoDO(); + lineInfoParam.setId(request.getLineId()); + //蓄水池 + lineInfoParam.setJoinStatus(1); + lineInfoParam.setPartnerNum(initiatingResponse.getData()); + lineInfoMapper.updateByPrimaryKeySelective(lineInfoParam); + } + + return initiatingResponse; + } + private void fillSignatureInfo(Map requestMap) { long timestamp = System.currentTimeMillis(); String signature = SecureUtil.getSignature(timestamp); diff --git a/coolstore-partner-service/src/main/java/com/cool/store/utils/poi/constant/Constants.java b/coolstore-partner-service/src/main/java/com/cool/store/utils/poi/constant/Constants.java index f20a3b69e..421af9938 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/utils/poi/constant/Constants.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/utils/poi/constant/Constants.java @@ -170,6 +170,11 @@ public class Constants public static final String INTENTION_CONTRACT_URL = "/api/coolstore/start-flow/intention-contract"; + public static final String FRANCHISEE_STORE_NUM = "/api/kdz/franchisee/save"; + + public static final Integer ZERO_INTEGER = 0; + + } diff --git a/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCIntentAgreementController.java b/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCIntentAgreementController.java index f17cc2bde..bdb6fdca7 100644 --- a/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCIntentAgreementController.java +++ b/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCIntentAgreementController.java @@ -1,5 +1,6 @@ package com.cool.store.controller.webb; +import com.cool.store.request.FranchiseeSaveRequest; import com.cool.store.request.InitiatingRequest; import com.cool.store.response.InitiatingResponse; import com.cool.store.response.ResponseResult; @@ -36,5 +37,13 @@ public class PCIntentAgreementController { return ResponseResult.success(intentAgreementService.initiating(request)); } + @PostMapping(path = "/franchisee/save") + @ApiOperation("kdz -> xfsg 加盟商新增") + public ResponseResult save(@RequestBody FranchiseeSaveRequest request) { + return ResponseResult.success(intentAgreementService.save(request)); + } + + + } From 2aee3b5299d49290e2137fd229145c5e768e4287 Mon Sep 17 00:00:00 2001 From: wangxiaopeng <807933401@qq.com> Date: Mon, 8 Apr 2024 15:35:05 +0800 Subject: [PATCH 5/8] =?UTF-8?q?=E6=94=AF=E4=BB=98=E7=8A=B6=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/cool/store/entity/LinePayDO.java | 2 +- .../main/java/com/cool/store/request/LinePaySubmitRequest.java | 2 +- .../src/main/java/com/cool/store/vo/LinePayVO.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) 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 index 301347e2b..3774a48bd 100644 --- 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 @@ -27,7 +27,7 @@ public class LinePayDO implements Serializable { @ApiModelProperty("line_info.id") private Long lineId; - @ApiModelProperty("支付状态 0:待付款 1:已付款") + @ApiModelProperty("支付状态 45:待缴费 50:已缴费 55缴费失败") private Integer payStatus; @ApiModelProperty("支付方式 1微信 2银行转账") 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 index 1641dc925..387f25bee 100644 --- 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 @@ -19,7 +19,7 @@ public class LinePaySubmitRequest { @NotNull(message = "线索id不能为空") private Long lineId; - @ApiModelProperty("支付状态 0:待付款 1:已付款") + @ApiModelProperty("支付状态 45:待缴费 50:已缴费 55缴费失败") private Integer payStatus; @ApiModelProperty("支付方式 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 index 3b08c2d5a..af1570a8c 100644 --- 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 @@ -31,7 +31,7 @@ public class LinePayVO { @ApiModelProperty("line_info.id") private Long lineId; - @ApiModelProperty("支付状态 0:待付款 1:已付款") + @ApiModelProperty("支付状态 45:待缴费 50:已缴费 55缴费失败") private Byte payStatus; @ApiModelProperty("支付方式 1微信 2银行转账") From 97b0b8330b978122c8c7d1cbebc65f34ad0ee195 Mon Sep 17 00:00:00 2001 From: wangxiaopeng <807933401@qq.com> Date: Mon, 8 Apr 2024 15:37:58 +0800 Subject: [PATCH 6/8] fillLinePay --- .../java/com/cool/store/service/impl/LinePayServiceImpl.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) 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 index ee629096b..1e268a80d 100644 --- 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 @@ -92,8 +92,7 @@ public class LinePayServiceImpl implements LinePayService { linePayDO.setPayPic(request.getPayPic()); linePayDO.setPromisePic(request.getPromisePic()); if(isAdd){ - linePayDO.setPartnerId("123"); - // linePayDO.setPartnerId(partnerUser.getPartnerId()); + linePayDO.setPartnerId(partnerUser.getPartnerId()); linePayDO.setLineId(request.getLineId()); linePayDO.setCreateTime(new Date()); linePayDO.setCreateUserId(partnerUser.getPartnerId()); From 3a53a748680a7e9413e74a62ed012ec74625db86 Mon Sep 17 00:00:00 2001 From: wangxiaopeng <807933401@qq.com> Date: Mon, 8 Apr 2024 19:08:29 +0800 Subject: [PATCH 7/8] =?UTF-8?q?=E6=9C=89=E6=88=98=E5=8C=BA=E6=9D=83?= =?UTF-8?q?=E9=99=90=E7=9A=84=E4=BA=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../store/service/impl/UserAuthMappingServiceImpl.java | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/UserAuthMappingServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/UserAuthMappingServiceImpl.java index 970d07a4f..7ed59cd8e 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/UserAuthMappingServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/UserAuthMappingServiceImpl.java @@ -84,6 +84,12 @@ public class UserAuthMappingServiceImpl implements UserAuthMappingService { return userDO; } } + Long warRegionId = regionAreaConfigDao.getByWantShopAreaId(wantShopAreaId); + // 查找有战区权限的人 + List authWarRegionUserIdList = authWarRegionUser(warRegionId); + if(CollectionUtils.isEmpty(authWarRegionUserIdList)){ + return null; + } SysRoleDO sysRoleDO = sysRoleMapper.getRolesByNameAndSource(roleName, RoleSourceEnum.CREATE.getCode()); Long roleId = sysRoleDO.getId(); List hasRoleUserIdList = sysRoleMapper.getPositionUserIds(Collections.singletonList(String.valueOf(roleId))); @@ -93,9 +99,6 @@ public class UserAuthMappingServiceImpl implements UserAuthMappingService { roleId = sysRoleDO.getId(); hasRoleUserIdList = sysRoleMapper.getPositionUserIds(Collections.singletonList(String.valueOf(roleId))); } - Long warRegionId = regionAreaConfigDao.getByWantShopAreaId(wantShopAreaId); - // 查找有战区权限的人 - List authWarRegionUserIdList = authWarRegionUser(warRegionId); authWarRegionUserIdList.retainAll(hasRoleUserIdList); if(UserRoleEnum.INVESTMENT_MANAGER.getDesc().equals(roleName)){ // 按工号排序后放入redis From 313326a5a00638348474f902d476ec587ac57bc5 Mon Sep 17 00:00:00 2001 From: wangxiaopeng <807933401@qq.com> Date: Mon, 8 Apr 2024 19:11:41 +0800 Subject: [PATCH 8/8] KdzApiController --- .../java/com/cool/store/controller/webb/KdzApiController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/KdzApiController.java b/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/KdzApiController.java index 1b27f8fc1..190bee0a9 100644 --- a/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/KdzApiController.java +++ b/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/KdzApiController.java @@ -20,7 +20,7 @@ import javax.annotation.Resource; @Slf4j public class KdzApiController { - String allowEnterpriseId = "45f92210375346858b6b6694967f44de,e17cd2dc350541df8a8b0af9bd27f77d"; + String allowEnterpriseId = "45f92210375346858b6b6694967f44de,e17cd2dc350541df8a8b0af9bd27f77d,28c20a7b42b94171acb1ab3f631d69e1,9ee7b8b48e2447f9a2075b5a46e94d08"; @Resource KdzApiService kdzApiService;