suzhuhong/zxjp-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/cc_20230520_partner' into cc_20230520_partner

Browse Source
This commit is contained in:
pserimal
2023-06-19 12:03:01 +08:00
parent 3c7ba3ce49 c94f8083d6
commit eb5e802ac6
16 changed files with 98 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
coolstore-partner-dao/src/main/resources/mapper/HyPartnerIntentInfoMapper.xml
View File

@@ -25,16 +25,12 @@
<result column="weakness" jdbcType="VARCHAR" property="weakness" />
<result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
<result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
<result column="pass_cause" jdbcType="VARCHAR" property="passCause" />
<result column="pass_time" jdbcType="TIMESTAMP" property="passTime" />
<result column="pass_user" jdbcType="VARCHAR" property="passUser" />
<result column="pass_certify-file" jdbcType="VARCHAR" property="passCertifyFile" />
</resultMap>
<sql id="Base_Column_List">
id, partner_id, partner_line_id, live_area, want_shop_area, accept_adjust_type, is_have_want_shop,
want_shop_info, max_budget, money_source, money_prove, education, work_year, is_have_work_exp,
work_exp, is_consumer, other_band, brand_strength, need_improve, strength, weakness,
create_time, update_time,pass_cause,pass_time,pass_user,pass_certify-file
create_time, update_time
</sql>
<select id="selectByPrimaryKeySelective" resultMap="BaseResultMap">
select

6
coolstore-partner-dao/src/main/resources/mapper/HyPartnerLineInfoMapper.xml
View File

@@ -297,7 +297,11 @@
a.partner_id as partnerUserId,
a.investment_manager as investmentManager,
b.user_portrait as user_portrait,
b.id as partnerBaseInfoId
b.id as partnerBaseInfoId,
b.pass_reason as passReason,
b.certify_file as certifyFile,
b.pass_time as passTime,
b.pass_user_id as passUserId
from hy_partner_line_info a inner join hy_partner_base_info b
on a.id = b.partner_line_id
<where>

18
coolstore-partner-model/src/main/java/com/cool/store/dto/partner/PartnerLineInfoAndBaseInfoDTO.java
View File

@@ -3,6 +3,8 @@ package com.cool.store.dto.partner;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.Date;
/**
* @Author suzhuhong
* @Date 2023/6/12 16:05
@@ -43,5 +45,21 @@ public class PartnerLineInfoAndBaseInfoDTO {
@ApiModelProperty("招商经理手机号")
private String investmentManagerPhone;
@ApiModelProperty("用户画像")
private String userPortrait;
@ApiModelProperty("通过原因")
private String passCause;
@ApiModelProperty("通过时间")
private Date passTime;
@ApiModelProperty("通过人名称")
private String passUserName;
@ApiModelProperty("通过人ID")
private String passUserId;
@ApiModelProperty("通过证明")
private String passCertifyFile;
}

2
coolstore-partner-model/src/main/java/com/cool/store/entity/HyPartnerBaseInfoDO.java
View File

@@ -34,7 +34,7 @@ public class HyPartnerBaseInfoDO implements Serializable {
private String username;
@ApiModelProperty("1男 2女")
private Boolean sex;
private Integer sex;
@ApiModelProperty("民族")
private String nation;

2
coolstore-partner-model/src/main/java/com/cool/store/request/PartnerBaseInfoRequest.java
View File

@@ -31,7 +31,7 @@ public class PartnerBaseInfoRequest {
private String username;
@ApiModelProperty("1男 2女")
private Boolean sex;
private Integer sex;
@ApiModelProperty("民族")
private String nation;

2
coolstore-partner-model/src/main/java/com/cool/store/vo/PartnerBaseInfoVO.java
View File

@@ -31,7 +31,7 @@ public class PartnerBaseInfoVO {
private String username;
@ApiModelProperty("1男 2女")
private Boolean sex;
private Integer sex;
@ApiModelProperty("民族")
private String nation;

14
coolstore-partner-model/src/main/java/com/cool/store/vo/PartnerIntentInfoVO.java
View File

@@ -88,19 +88,5 @@ public class PartnerIntentInfoVO {
@ApiModelProperty("创建时间")
private Date createTime;
@ApiModelProperty("通过原因")
private String passCause;
@ApiModelProperty("通过时间")
private Date passTime;
@ApiModelProperty("通过人名称")
private String passUserName;
@ApiModelProperty("通过人ID")
private String passUserId;
@ApiModelProperty("通过证明")
private String passCertifyFile;
}

18
coolstore-partner-model/src/main/java/com/cool/store/vo/PartnerLineInfoAndBaseInfoVO.java
View File

@@ -4,6 +4,7 @@ import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.Date;
import java.util.List;
/**
@@ -46,8 +47,25 @@ public class PartnerLineInfoAndBaseInfoVO {
@ApiModelProperty("招商经理手机号")
private String investmentManagerPhone;
@ApiModelProperty("用户画像")
private String userPortrait;
@ApiModelProperty("线索状态")
private Integer lineStatus;
@ApiModelProperty("通过原因")
private String passCause;
@ApiModelProperty("通过时间")
private Date passTime;
@ApiModelProperty("通过人名称")
private String passUserName;
@ApiModelProperty("通过人ID")
private String passUserId;
@ApiModelProperty("通过证明")
private List<String> passCertifyFile;
}

21
coolstore-partner-service/coolstore-partner-service.iml
View File

@@ -1,5 +1,19 @@
<?xml version="1.0" encoding="UTF-8"?>
<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
<component name="FacetManager">
<facet type="Spring" name="Spring">
<configuration />
</facet>
<facet type="web" name="Web">
<configuration>
<webroots />
<sourceRoots>
<root url="file://$MODULE_DIR$/src/main/java" />
<root url="file://$MODULE_DIR$/src/main/resources" />
</sourceRoots>
</configuration>
</facet>
</component>
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
<output url="file://$MODULE_DIR$/target/classes" />
<output-test url="file://$MODULE_DIR$/target/test-classes" />
@@ -81,6 +95,11 @@
<orderEntry type="library" name="Maven: org.json:json:20180130" level="project" />
<orderEntry type="library" name="Maven: com.github.librepdf:openpdf:1.3.30" level="project" />
<orderEntry type="library" name="Maven: com.google.code.findbugs:jsr305:3.0.2" level="project" />
<orderEntry type="library" name="Maven: org.icepdf.os:icepdf-core:6.1.2" level="project" />
<orderEntry type="library" name="Maven: org.bouncycastle:bcprov-jdk15on:1.54" level="project" />
<orderEntry type="library" name="Maven: org.bouncycastle:bcprov-ext-jdk15on:1.54" level="project" />
<orderEntry type="library" name="Maven: org.bouncycastle:bcpkix-jdk15on:1.54" level="project" />
<orderEntry type="library" name="Maven: javax.media:jai-core:1.1.3" level="project" />
<orderEntry type="module" module-name="coolstore-partner-dao" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-jdbc:3.0.2" level="project" />
<orderEntry type="library" name="Maven: com.zaxxer:HikariCP:3.4.2" level="project" />
@@ -123,8 +142,6 @@
<orderEntry type="library" name="Maven: com.sun.xml.bind:jaxb-core:2.3.0" level="project" />
<orderEntry type="library" name="Maven: com.sun.xml.bind:jaxb-impl:2.3.0" level="project" />
<orderEntry type="library" name="Maven: com.aliyun:openapiutil:0.1.9" level="project" />
<orderEntry type="library" name="Maven: org.bouncycastle:bcpkix-jdk15on:1.65" level="project" />
<orderEntry type="library" name="Maven: org.bouncycastle:bcprov-jdk15on:1.65" level="project" />
<orderEntry type="library" name="Maven: com.aliyun:tea:1.2.7" level="project" />
<orderEntry type="library" name="Maven: com.squareup.okhttp3:okhttp:3.14.7" level="project" />
<orderEntry type="library" name="Maven: com.squareup.okio:okio:1.17.2" level="project" />

24
coolstore-partner-service/src/main/java/com/cool/store/http/WechatRest.java
View File

@@ -9,8 +9,10 @@ import com.cool.store.enums.ErrorCodeEnum;
import com.cool.store.exception.ServiceException;
import com.cool.store.mq.util.HttpRestTemplateService;
import com.cool.store.utils.RedisUtilPool;
import com.cool.store.utils.RestTemplateUtil;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.springframework.http.ResponseEntity;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
@@ -50,15 +52,17 @@ public class WechatRest {
requestMap.put("secret", secret);
requestMap.put("js_code", jsCode);
requestMap.put("grant_type","authorization_code");
ResultDTO responseEntity = null;
ResponseEntity<CodeSessionDTO> responseEntity = null;
try {
responseEntity = httpRestTemplateService.getForObject(url, ResultDTO.class, requestMap);
responseEntity = RestTemplateUtil.loadGet(url, CodeSessionDTO.class);
log.info("WechatRest#miniProgramJsCodeSession, url:{}, response:{}", url, JSONObject.toJSONString(responseEntity));
if(Objects.nonNull(responseEntity.getData()) && responseEntity.isSuccess()){
return JSONObject.parseObject(JSONObject.toJSONString(responseEntity.getData()), CodeSessionDTO.class);
if(Objects.nonNull(responseEntity.getBody()) && responseEntity.getBody().isSuccess()){
return responseEntity.getBody();
}
} catch (Exception e) {
log.error("调用微信服务异常", e);
log.info("调用微信服务异常{}", e);
throw new ServiceException(ErrorCodeEnum.WX_SERVICE_ERROR);
}
return null;
}
@@ -70,19 +74,17 @@ public class WechatRest {
return accessToken;
}
String reqUrl = String.format(ACCESS_TOKEN, appId, secret);
ResultDTO responseEntity = null;
JSONObject jsonObject = null;
try {
responseEntity = httpRestTemplateService.getForObject(reqUrl, ResultDTO.class, null);
log.info("WechatRest#getAccessToken, reqUrl:{}, response:{}", reqUrl, JSONObject.toJSONString(responseEntity));
if(Objects.nonNull(responseEntity.getData()) && responseEntity.isSuccess()){
JSONObject jsonObject = JSON.parseObject(JSONObject.toJSONString(responseEntity.getData()));
jsonObject = httpRestTemplateService.getForObject(reqUrl, JSONObject.class, null);
log.info("WechatRest#getAccessToken, reqUrl:{}, response:{}", reqUrl, JSONObject.toJSONString(jsonObject));
String token = jsonObject.getString("access_token");
if (StringUtils.isBlank(token)) {
throw new ServiceException(ErrorCodeEnum.GET_ACCESSTOKEN_ERROR);
}
redisUtilPool.setString(cacheAccessToken, token, 7000);
accessToken = token;
}
} catch (Exception e) {
log.error("获取微信小程序token异常", e);
}

8
coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerIntentInfoServiceImpl.java
View File

@@ -108,10 +108,6 @@ public class HyPartnerIntentInfoServiceImpl implements HyPartnerIntentInfoServic
HyPartnerUserInfoDO hyPartnerUserInfoDO = hyPartnerUserInfoDAO.selectByPartnerId(hyPartnerIntentInfoDO.getPartnerId());
partnerIntentInfoVO.setPartnerUserName(hyPartnerUserInfoDO.getUsername());
partnerIntentInfoVO.setPartnerUserPhone(hyPartnerUserInfoDO.getMobile());
EnterpriseUserDO userInfo = enterpriseUserDAO.getUserInfoById(hyPartnerIntentInfoDO.getPassUser());
if (userInfo!=null){
partnerIntentInfoVO.setPassUserName(userInfo.getName());
}
//todo su 手机号归属地 意向申请区域名称
return partnerIntentInfoVO;
}
@@ -214,10 +210,6 @@ public class HyPartnerIntentInfoServiceImpl implements HyPartnerIntentInfoServic
partnerIntentInfoVO.setOtherBand(hyPartnerIntentInfoDO.getOtherBand());
partnerIntentInfoVO.setStrength(hyPartnerIntentInfoDO.getStrength());
partnerIntentInfoVO.setNeedImprove(hyPartnerIntentInfoDO.getNeedImprove());
partnerIntentInfoVO.setPassCause(hyPartnerIntentInfoDO.getPassCause());
partnerIntentInfoVO.setPassCertifyFile(hyPartnerIntentInfoDO.getPassCertifyFile());
partnerIntentInfoVO.setPassUserId(hyPartnerIntentInfoDO.getPassUser());
partnerIntentInfoVO.setPassTime(hyPartnerIntentInfoDO.getPassTime());
return partnerIntentInfoVO;
}

10
coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerLineInfoServiceImpl.java
View File

@@ -80,6 +80,10 @@ public class HyPartnerLineInfoServiceImpl implements HyPartnerLineInfoService {
partnerLineInfoAndBaseInfoVO.setPartnerUserName(hyPartnerUserInfoDO.getUsername());
partnerLineInfoAndBaseInfoVO.setPartnerUserPhone(hyPartnerUserInfoDO.getMobile());
}
EnterpriseUserDO userInfo = enterpriseUserDAO.getUserInfoById(partnerLineInfoAndBaseInfoDTO.getPassUserId());
if (userInfo!=null){
partnerLineInfoAndBaseInfoVO.setPassUserName(userInfo.getName());
}
//todo su 1、招商经理名称 手机号归属地 2、加盟商手机号归属地
return partnerLineInfoAndBaseInfoVO;
}
@@ -362,6 +366,12 @@ public class HyPartnerLineInfoServiceImpl implements HyPartnerLineInfoService {
partnerLineInfoAndBaseInfoVO.setPartnerBaseInfoId(partnerLineInfoAndBaseInfoDTO.getPartnerBaseInfoId());
partnerLineInfoAndBaseInfoVO.setWorkflowStage(partnerLineInfoAndBaseInfoDTO.getWorkflowStage());
partnerLineInfoAndBaseInfoVO.setWorkflowStatus(partnerLineInfoAndBaseInfoDTO.getWorkflowStatus());
partnerLineInfoAndBaseInfoVO.setPassCause(partnerLineInfoAndBaseInfoDTO.getPassCause());
if (StringUtil.isNotEmpty(partnerLineInfoAndBaseInfoDTO.getPassCertifyFile())){
partnerLineInfoAndBaseInfoVO.setPassCertifyFile(JSONObject.parseArray(partnerLineInfoAndBaseInfoDTO.getPassCertifyFile(), String.class));
}
partnerLineInfoAndBaseInfoVO.setPassUserId(partnerLineInfoAndBaseInfoDTO.getPassUserId());
partnerLineInfoAndBaseInfoVO.setPassTime(partnerLineInfoAndBaseInfoDTO.getPassTime());
return partnerLineInfoAndBaseInfoVO;
}

2
coolstore-partner-webb/src/main/java/com/cool/store/controller/ClerkController.java
View File

@@ -3,6 +3,7 @@ package com.cool.store.controller;
import com.cool.store.response.ResponseResult;
import com.cool.store.service.HyPartnerClerkService;
import com.cool.store.vo.PartnerClerkVO;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
@@ -21,6 +22,7 @@ import java.util.List;
*/
@RestController
@Slf4j
@Api(tags = "店员")
public class ClerkController {
@Resource

2
coolstore-partner-webb/src/main/java/com/cool/store/controller/ZoneController.java
View File

@@ -7,6 +7,7 @@ import com.cool.store.service.ZoneService;
import com.cool.store.vo.ZoneCheckVO;
import com.cool.store.vo.ZoneVO;
import com.github.pagehelper.PageInfo;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
@@ -23,6 +24,7 @@ import java.util.List;
*/
@RestController
@Slf4j
@Api(tags = "战区")
public class ZoneController {
@Resource

1
coolstore-partner-webc/src/main/java/com/cool/store/config/SignValidateFilter.java
View File

@@ -49,6 +49,7 @@ public class SignValidateFilter implements Filter {
private static List<String> patternList =
Lists.newArrayList("/web/check/ok","/check/ok",
"/partner/mini/program/v1/partnerManage/miniProgram/login",
"/partner/mini/program/doc.html","/partner/mini/program/v2/api-docs","/**/test/**",
"/partner/mini/program/oss/getUploadFileConfig",
"/partner/mini/program/v1/partnerManage/partner/getIdentityCardInfo",

2
coolstore-partner-webc/src/main/java/com/cool/store/controller/PartnerController.java
View File

@@ -63,7 +63,7 @@ public class PartnerController {
@GetMapping(path = "/getSubmitIntentionApplyFlag")
@ApiOperation("获取提交意向申请标识 true 已提交 false 未提交")
public ResponseResult<Boolean> getSubmitIntentionApplyFlag(){
PartnerUserInfoVO userInfoVO = PartnerUserHolder.getUser();
return ResponseResult.success();
}