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

Merge remote-tracking branch 'xfsg/cc_partner_init' into cc_partner_init

Browse Source 
# Conflicts:
#	coolstore-partner-dao/src/main/java/com/cool/store/mapper/LineInfoMapper.java
#	coolstore-partner-service/src/main/java/com/cool/store/service/impl/JoinIntentionServiceImpl.java
This commit is contained in:
苏竹红
2024-03-27 15:55:29 +08:00
parent e3dee054c2 48e910af63
commit 6318cca496
61 changed files with 2278 additions and 98 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
coolstore-partner-web/src/main/java/com/cool/store/controller/webb/LineFollowController.java Normal file
View File

@@ -0,0 +1,43 @@
package com.cool.store.controller.webb;
import com.cool.store.context.CurrentUserHolder;
import com.cool.store.context.LoginUserInfo;
import com.cool.store.request.LineFollowLogRequest;
import com.cool.store.response.ResponseResult;
import com.cool.store.service.LineFollowService;
import com.cool.store.vo.log.LineFollowLogVO;
import com.github.pagehelper.PageInfo;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
/**
* @author zhangchenbiao
* @FileName: LineFollowController
* @Description:
* @date 2024-03-27 15:02
*/
@Api(tags = "跟进日志")
@RestController
@RequestMapping({"pc/follow"})
public class LineFollowController {
@Resource
private LineFollowService lineFollowService;
@ApiOperation("跟进日志分页")
@GetMapping("/page")
public ResponseResult<PageInfo<LineFollowLogVO>> getFollowLogPage(Long lineId, Integer pageNum, Integer pageSize){
return ResponseResult.success(lineFollowService.getFollowLogPage(lineId, pageNum, pageSize));
}
@ApiOperation("新增跟进日志")
@PostMapping("/log/add")
public ResponseResult<Long> addFollowLog(@RequestBody LineFollowLogRequest request){
LoginUserInfo user = CurrentUserHolder.getUser();
return ResponseResult.success(lineFollowService.addFollowLog(request, user.getUserId(), user.getName()));
}
}

36
coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCTestController.java Normal file
View File

@@ -0,0 +1,36 @@
package com.cool.store.controller.webb;
import com.alibaba.fastjson.JSONObject;
import com.cool.store.dao.*;
import com.cool.store.dto.OpenCityDTO;
import com.cool.store.entity.*;
import com.cool.store.enums.MessageEnum;
import com.cool.store.mapper.HyOpenAreaInfoMapper;
import com.cool.store.response.ResponseResult;
import com.cool.store.service.impl.CommonService;
import com.cool.store.utils.poi.ExcelUtil;
import lombok.extern.slf4j.Slf4j;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
import javax.annotation.Resource;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashMap;
import java.util.List;
@Slf4j
@RestController
@RequestMapping("/pc/test")
public class PCTestController {
@Resource
private CommonService commonService;
@GetMapping("/sendMessage")
public ResponseResult<Boolean> sendMessage(){
commonService.sendMessage(Arrays.asList("123836131931284423"), 1L, MessageEnum.MESSAGE_1, "张三", "浙江-杭州");
return ResponseResult.success(Boolean.FALSE);
}
}

31
coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCTrainingExperienceController.java Normal file
View File

@@ -0,0 +1,31 @@
package com.cool.store.controller.webb;
import com.cool.store.enums.ExperienceStatusEnum;
import com.cool.store.request.TrainingExperienceDistributionRequest;
import com.cool.store.response.ResponseResult;
import com.cool.store.service.TrainingExperienceService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import lombok.extern.slf4j.Slf4j;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import javax.websocket.server.PathParam;
@RestController
@RequestMapping("/pc/training/experience/")
@Api(tags = "PC端-实训体验")
@Slf4j
public class PCTrainingExperienceController {
@Resource
TrainingExperienceService trainingExperienceService;
@ApiOperation("实训体验分配")
@PostMapping("/distribution")
public ResponseResult<Boolean> distribution(@RequestBody TrainingExperienceDistributionRequest request) {
return ResponseResult.success(trainingExperienceService.distribution(request));
}
}

17
coolstore-partner-web/src/main/java/com/cool/store/controller/webc/MiniJoinIntentionController.java
View File

@@ -4,13 +4,11 @@ package com.cool.store.controller.webc;
import com.cool.store.request.JoinIntentionRequest;
import com.cool.store.response.ResponseResult;
import com.cool.store.service.JoinIntentionService;
import com.cool.store.vo.PartnerBaseInfoVO;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import javax.validation.Valid;
@@ -24,9 +22,16 @@ public class MiniJoinIntentionController {
@Resource
private JoinIntentionService joinIntentionService;
@PostMapping(path = "/submit")
@ApiOperation("填写加盟意向申请书")
@PostMapping(path = "/submitOrUpdate")
@ApiOperation("填写或更新加盟意向申请书")
public ResponseResult<Boolean> submit(@RequestBody @Valid JoinIntentionRequest request) {
return ResponseResult.success(joinIntentionService.submit(request));
}
@GetMapping(path = "/getByLineId")
@ApiOperation("查找加盟意向申请书")
public ResponseResult<PartnerBaseInfoVO> getByLineId(@RequestParam("lineId") Long lineId) {
return ResponseResult.success(joinIntentionService.getByLineId(lineId));
}
}

16
coolstore-partner-web/src/main/java/com/cool/store/controller/webb/TrainingExperienceController.java → coolstore-partner-web/src/main/java/com/cool/store/controller/webc/MiniTrainingExperienceController.java
View File

@@ -1,4 +1,4 @@
package com.cool.store.controller.webb;
package com.cool.store.controller.webc;
import com.cool.store.enums.ExperienceStatusEnum;
import com.cool.store.request.TrainingExperienceDistributionRequest;
@@ -11,24 +11,16 @@ import lombok.extern.slf4j.Slf4j;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import javax.websocket.server.PathParam;
@RestController
@RequestMapping("/pc/training/experience/")
@Api(tags = "PC端-实训体验")
@RequestMapping("/mini/training/experience/")
@Api(tags = "移动端-实训体验")
@Slf4j
public class TrainingExperienceController {
public class MiniTrainingExperienceController {
@Resource
TrainingExperienceService trainingExperienceService;
@ApiOperation("实训体验分配")
@PostMapping("/distribution")
public ResponseResult<Boolean> distribution(@RequestBody TrainingExperienceDistributionRequest request) {
return ResponseResult.success(trainingExperienceService.distribution(request));
}
@ApiOperation("实训体验状态变更")
@GetMapping("/experience/{status}")
public ResponseResult experienceStatusChange(@ApiParam(value = "实训体验状态 DONE:完成 ABANDON:放弃") @PathVariable(value = "status") ExperienceStatusEnum statusEnum,

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

@@ -20,7 +20,7 @@ import java.util.concurrent.Future;
@Slf4j
@RestController
@RequestMapping("/pc/test")
@RequestMapping("/test")
public class TestController {
@Resource

4
coolstore-partner-web/src/main/resources/application-local.properties
View File

@@ -72,4 +72,6 @@ recommended.channel.id=52400
wx.pay.privateKeyPath=D:\\weixin\\apiclient_key.pem
aliyun.accessKeyId=LTAI5tQ6QBnWaB5LaJYz6zcD
aliyun.accessKeySecret=spqsOgtfr54cwK861O3N3fInydTgjA
aliyun.accessKeySecret=spqsOgtfr54cwK861O3N3fInydTgjA
coolstore.page.domain=https://t2store.coolstore.cn/

10
coolstore-partner-web/src/main/resources/application-test.properties
View File

@@ -37,9 +37,9 @@ mybatis.configuration.map-underscore-to-camel-case=true
isv.domain=https://abstore-isv.coolstore.cn/isv
#rocketmq \u914D\u7F6E
rocketmq.accessKey=zK2oVEz4G1ts23d2
rocketmq.secretKey=0UstLCS0mh2ASgBh
rocketmq.nameSrvAdder=http://rmq-cn-9lb38l1rx04.cn-hangzhou.rmq.aliyuncs.com:8080
rocketmq.accessKey=LTAI5t5ouXZuFgxJMbQea3b2
rocketmq.secretKey=yuomDstRjSdihtN5zo8viDbWu8Z0ig
rocketmq.nameSrvAdder=http://MQ_INST_1947409023213164_BX3sLZnA.cn-hangzhou.mq-internal.aliyuncs.com:8080
rocketmq.topic=simple_message
#oss配置
@@ -77,4 +77,6 @@ xxl.job.executor.logretentiondays = 30
xxl.job.accessToken =
exhibition.channel.id=52399
recommended.channel.id=52400
recommended.channel.id=52400
coolstore.page.domain=https://t2store.coolstore.cn/

1
coolstore-partner-web/src/main/resources/application.properties
View File

@@ -51,6 +51,7 @@ server.tomcat.basedir=/tmp/tomcat/partner-b
log4j2.formatMsgNoLookups=true
mybatis.configuration.variables.enterpriseId=e17cd2dc350541df8a8b0af9bd27f77d
enterprise.dingCorpId=dingef2502a50df74ccc35c2f4657eb6378f
wx.pay.merchantId=1670560201
wx.pay.privateKeyPath=/opt/apps/coolcollege/apiclient/apiclient_key.pem