elink-star
/
ShibeiWorkPlatform
12
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge remote-tracking branch 'origin/dev' into release

dev_shibei_match
zxc 5 years ago
parent
e959a20d8b e31ed06624
commit
6393181995
13 changed files with 57 additions and 42 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      epmet-module/epmet-common-service/common-service-server/pom.xml
  2. 6
      epmet-module/epmet-common-service/common-service-server/src/main/resources/db/migration/V0.0.2__add_event.sql
  3. 2
      epmet-module/epmet-heart/epmet-heart-server/deploy/docker-compose-dev.yml
  4. 2
      epmet-module/epmet-heart/epmet-heart-server/pom.xml
  5. 4
      epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/ActInfoServiceImpl.java
  6. 59
      epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/WorkActUserServiceImpl.java
  7. 1
      epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/result/PointDetailResultDTO.java
  8. 5
      epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/entity/PointRuleEntity.java
  9. 10
      epmet-module/epmet-point/epmet-point-server/src/main/resources/db/migration/epmet_point.sql
  10. 1
      epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/PointRuleDao.xml
  11. 2
      epmet-module/epmet-third/epmet-third-server/deploy/docker-compose-dev.yml
  12. 2
      epmet-module/epmet-third/epmet-third-server/pom.xml
  13. 3
      epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/ComponentVerifyTicketServiceImpl.java

2
epmet-module/epmet-common-service/common-service-server/pom.xml
View File

@ -107,7 +107,7 @@
<spring.redis.port>6379</spring.redis.port>
<spring.redis.password>123456</spring.redis.password>
<!-- nacos -->
<nacos.register-enabled>true</nacos.register-enabled>
<nacos.register-enabled>false</nacos.register-enabled>
<nacos.server-addr>122.152.200.70:8848</nacos.server-addr>
<nacos.discovery.namespace>fcd6fc8f-ca3a-4b01-8026-2b05cdc5976b</nacos.discovery.namespace>
<nacos.config.namespace></nacos.config.namespace>

6
epmet-module/epmet-common-service/common-service-server/src/main/resources/db/migration/V0.0.2__add_event.sql
View File

@ -17,6 +17,6 @@ CREATE TABLE `event` (
PRIMARY KEY (`ID`),
UNIQUE KEY `unx_event_code` (`EVENT_CODE`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='事件表';
INSERT INTO `epmet_common_service`.`event`(`ID`, `CLASS_ID`, `APP_ID`, `APP_NAME`, `EVENT_CODE`, `EVENT_NAME`, `EVENT_DESC`, `FUNCTION_ID`, `IS_COMMON`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1', 'epmet_heart', '202007161443499985fa2d397436d10356542134c8f008c48', '党群e事通开发测试', 'register_volunteer', '注册志愿者', '给注册志愿者的人发放积分', '43addd0735230c01eedbb38d721076b0', '0', '0', 0, 'APP_USER', '2020-07-23 14:19:17', 'APP_USER', '2020-07-23 14:19:17');
INSERT INTO `epmet_common_service`.`event`(`ID`, `CLASS_ID`, `APP_ID`, `APP_NAME`, `EVENT_CODE`, `EVENT_NAME`, `EVENT_DESC`, `FUNCTION_ID`, `IS_COMMON`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('2', 'epmet_heart', '202007161443499985fa2d397436d10356542134c8f008c48', '党群e事通开发测试', 'active_send_point', '活动发放积分', '给参加活动的人发放积分', '43addd0735230c01eedbb38d721076b0', '0', '0', 0, 'APP_USER', '2020-07-23 14:16:49', 'APP_USER', '2020-07-23 14:16:49');
INSERT INTO `epmet_common_service`.`event`(`ID`, `CLASS_ID`, `APP_ID`, `APP_NAME`, `EVENT_CODE`, `EVENT_NAME`, `EVENT_DESC`, `FUNCTION_ID`, `IS_COMMON`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('3', 'epmet_heart', '202007161443499985fa2d397436d10356542134c8f008c48', '党群e事通开发测试', 'publist_active_live', '发布实况', '给发布实况的人发放积分', '43addd0735230c01eedbb38d721076b0', '0', '0', 0, 'APP_USER', '2020-07-23 14:16:49', 'APP_USER', '2020-07-23 14:16:49');
INSERT INTO `epmet_common_service`.`event`(`ID`, `CLASS_ID`, `APP_ID`, `APP_NAME`, `EVENT_CODE`, `EVENT_NAME`, `EVENT_DESC`, `FUNCTION_ID`, `IS_COMMON`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1', 'epmet_heart', '202007161443499985fa2d397436d10356542134c8f008c48', '党群e事通', 'register_volunteer', '注册志愿者', '注册志愿者获得积分', '43addd0735230c01eedbb38d721076b0', '0', '0', 0, 'APP_USER', '2020-07-23 14:19:17', 'APP_USER', '2020-07-23 14:19:17');
INSERT INTO `epmet_common_service`.`event`(`ID`, `CLASS_ID`, `APP_ID`, `APP_NAME`, `EVENT_CODE`, `EVENT_NAME`, `EVENT_DESC`, `FUNCTION_ID`, `IS_COMMON`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('2', 'epmet_heart', '202007161443499985fa2d397436d10356542134c8f008c48', '党群e事通', 'active_send_point', '活动发放积分', '参加活动获得积分', '43addd0735230c01eedbb38d721076b0', '0', '0', 0, 'APP_USER', '2020-07-23 14:16:49', 'APP_USER', '2020-07-23 14:16:49');
INSERT INTO `epmet_common_service`.`event`(`ID`, `CLASS_ID`, `APP_ID`, `APP_NAME`, `EVENT_CODE`, `EVENT_NAME`, `EVENT_DESC`, `FUNCTION_ID`, `IS_COMMON`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('3', 'epmet_heart', '202007161443499985fa2d397436d10356542134c8f008c48', '党群e事通', 'publist_active_live', '添加活动实况', '添加活动实况获得积分', '43addd0735230c01eedbb38d721076b0', '0', '0', 0, 'APP_USER', '2020-07-23 14:16:49', 'APP_USER', '2020-07-23 14:16:49');

2
epmet-module/epmet-heart/epmet-heart-server/deploy/docker-compose-dev.yml
View File

@ -2,7 +2,7 @@ version: "3.7"
services:
epmet-heart-server:
container_name: epmet-heart-server-dev
image: 192.168.1.130:10080/epmet-cloud-dev/epmet-heart-server:0.0.32
image: 192.168.1.130:10080/epmet-cloud-dev/epmet-heart-server:0.0.33
ports:
- "8111:8111"
network_mode: host # 使用现有网络

2
epmet-module/epmet-heart/epmet-heart-server/pom.xml
View File

@ -2,7 +2,7 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<version>0.0.32</version>
<version>0.0.33</version>
<parent>
<groupId>com.epmet</groupId>
<artifactId>epmet-heart</artifactId>

4
epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/ActInfoServiceImpl.java
View File

@ -288,7 +288,7 @@ public class ActInfoServiceImpl extends BaseServiceImpl<ActInfoDao, ActInfoEntit
private String getCurrentUserStatusNotSignUp(ActInfoEntity actInfoEntity, Integer signUpNum, Date currentTime) {
if (currentTime.before(actInfoEntity.getSignUpEndTime())) {
/*报名结束前*/
if (Boolean.FALSE.equals(actInfoEntity.getActQuotaCategory()) || actInfoEntity.getActQuota() > signUpNum) {
if (!actInfoEntity.getActQuotaCategory() || actInfoEntity.getActQuota() > signUpNum) {
// 我要报名(不限名额或者未报满的)
return ActConstant.CURRENT_STATUS_USER_SIGN_UP;
} else {
@ -336,7 +336,7 @@ public class ActInfoServiceImpl extends BaseServiceImpl<ActInfoDao, ActInfoEntit
return ActConstant.ACT_USER_STATUS_CANCELD;
}
// 活动限制名额，且报名人数已满 已报满
if (Boolean.FALSE.equals(actInfoEntity.getActQuotaCategory()) && signUpNum >= actInfoEntity.getActQuota()) {
if (actInfoEntity.getActQuotaCategory() && signUpNum >= actInfoEntity.getActQuota()) {
return ActConstant.CURRENT_STATUS_USER_ENOUGH;
}
// （报名审核未通过或者已经取消报名的）可再次报名-我要报名

59
epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/WorkActUserServiceImpl.java
View File

@ -314,31 +314,36 @@ public class WorkActUserServiceImpl implements WorkActUserService {
@Override
public AuditingUserDetailResultDTO queryAuditingUserDetail(AactUserDetailFormDTO formDTO) {
ActUserRelationDTO actUserRelationDTO=actUserRelationService.get(formDTO.getActUserRelationId());
if(null==actUserRelationDTO){
return null;
}
UserBaseInfoResultDTO userBaseInfo=queryUserBaseInfo(actUserRelationDTO.getUserId());
AuditingUserDetailResultDTO resultDTO=new AuditingUserDetailResultDTO();
//基本信息赋值
resultDTO.setActUserRelationId(actUserRelationDTO.getId());
resultDTO.setActId(actUserRelationDTO.getActId());
resultDTO.setUserId(actUserRelationDTO.getUserId());
if (StringUtils.isNotBlank(userBaseInfo.getRealName())) {
resultDTO.setRealName(userBaseInfo.getRealName());
} else {
resultDTO.setRealName(StrConstant.EPMETY_STR);
}
if (StringUtils.isNotBlank(userBaseInfo.getGender())) {
resultDTO.setGender(userBaseInfo.getGender());
} else {
resultDTO.setGender(StrConstant.EPMETY_STR);
}
if (StringUtils.isNotBlank(userBaseInfo.getMobile())) {
resultDTO.setMobile(userBaseInfo.getMobile());
} else {
resultDTO.setMobile(StrConstant.EPMETY_STR);
}
if (StringUtils.isNotBlank(userBaseInfo.getIdNum())) {
resultDTO.setIdNum(userBaseInfo.getIdNum());
if(null!=userBaseInfo){
if (StringUtils.isNotBlank(userBaseInfo.getRealName())) {
resultDTO.setRealName(userBaseInfo.getRealName());
} else {
resultDTO.setRealName(StrConstant.EPMETY_STR);
}
if (StringUtils.isNotBlank(userBaseInfo.getGender())) {
resultDTO.setGender(userBaseInfo.getGender());
} else {
resultDTO.setGender(StrConstant.EPMETY_STR);
}
if (StringUtils.isNotBlank(userBaseInfo.getMobile())) {
resultDTO.setMobile(userBaseInfo.getMobile());
} else {
resultDTO.setMobile(StrConstant.EPMETY_STR);
}
if (StringUtils.isNotBlank(userBaseInfo.getIdNum())) {
resultDTO.setIdNum(userBaseInfo.getIdNum());
}
resultDTO.setAddress(userBaseInfo.getStreet()+userBaseInfo.getDistrict()+userBaseInfo.getBuildingAddress());
}
resultDTO.setAddress(userBaseInfo.getStreet()+userBaseInfo.getDistrict()+userBaseInfo.getBuildingAddress());
resultDTO.setSignUpTime(actUserRelationDTO.getCreatedTime());
/**
* 当前状态（已报名/待审核auditing，
@ -389,14 +394,16 @@ public class WorkActUserServiceImpl implements WorkActUserService {
UserBaseInfoResultDTO userBaseInfoResultDTO=this.queryUserBaseInfo(formDTO.getUserId());
//基本信息
resultDTO.setUserId(formDTO.getUserId());
if(StringUtils.isNotBlank(userBaseInfoResultDTO.getHeadImgUrl())){
resultDTO.setHeadImgUrl(userBaseInfoResultDTO.getHeadImgUrl());
}
if(StringUtils.isNotBlank(userBaseInfoResultDTO.getNickname())){
resultDTO.setNickName(userBaseInfoResultDTO.getNickname());
}
if(StringUtils.isNotBlank(userBaseInfoResultDTO.getRealName())){
resultDTO.setRealName(userBaseInfoResultDTO.getRealName());
if(null!=userBaseInfoResultDTO){
if(StringUtils.isNotBlank(userBaseInfoResultDTO.getHeadImgUrl())){
resultDTO.setHeadImgUrl(userBaseInfoResultDTO.getHeadImgUrl());
}
if(StringUtils.isNotBlank(userBaseInfoResultDTO.getNickname())){
resultDTO.setNickName(userBaseInfoResultDTO.getNickname());
}
if(StringUtils.isNotBlank(userBaseInfoResultDTO.getRealName())){
resultDTO.setRealName(userBaseInfoResultDTO.getRealName());
}
}
//参与活动统计值
HistoricalActInfo historicalActInfo=getHistoricalActInfo(formDTO.getUserId(),formDTO.getCurrentActId());

1
epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/result/PointDetailResultDTO.java
View File

@ -19,6 +19,7 @@ public class PointDetailResultDTO implements Serializable {
private Integer point;
private String pointUnit;
private String pointUnitDesc;
private String upLimitPrefix;
private Integer upLimit;
private Boolean enabledFlag;
private String upLimitDesc;

5
epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/entity/PointRuleEntity.java
View File

@ -77,6 +77,11 @@ public class PointRuleEntity extends BaseEpmetEntity {
*/
private String upLimitDesc;
/**
* 积分示例中 积分上限前缀
*/
private String upLimitPrefix;
/**
* 获得积分值
*/

10
epmet-module/epmet-point/epmet-point-server/src/main/resources/db/migration/epmet_point.sql
View File

@ -4,10 +4,11 @@ CREATE TABLE `point_rule` (
`RULE_NAME` varchar(32) DEFAULT NULL COMMENT '规则名称 与事件名称保持一致即可',
`RULE_DESC` varchar(32) DEFAULT NULL COMMENT '规则说明 事件说明',
`EVENT_CODE` varchar(32) DEFAULT NULL COMMENT '事件CODE 来自事件表',
`FUNCTION_ID` varchar(32) DEFAULT NULL COMMENT '功能分组Id 来自customize.function',
`FUNCTION_ID` varchar(32) DEFAULT NULL COMMENT '功能Id 来自customize.function',
`OPERATE_TYPE` varchar(32) DEFAULT 'plus' COMMENT '操作类型 加积分:plus;减积分:minus',
`UP_LIMIT` int(11) DEFAULT '-1' COMMENT '积分上限 -1不限制；',
`UP_LIMIT` int(11) DEFAULT '-1' COMMENT '积分上限 -1表示不涉及积分上限；',
`UP_LIMIT_DESC` varchar(64) DEFAULT NULL COMMENT '积分上限描述',
`UP_LIMIT_PREFIX` varchar(64) DEFAULT '' COMMENT '积分示例中 积分上限前缀',
`POINT` int(11) DEFAULT '0' COMMENT '单位积分值',
`POINT_UNIT` varchar(32) DEFAULT NULL COMMENT '获得积分单位 次：time；分钟：minute；小时：hour',
`ENABLED_FLAG` varchar(1) DEFAULT '0' COMMENT '是否启用 0-否，1-是',
@ -38,6 +39,5 @@ CREATE TABLE rule_operate_log(
PRIMARY KEY (ID)
) COMMENT = '积分规则操作记录表';
INSERT INTO `epmet_point`.`point_rule`(`ID`, `CUSTOMER_ID`, `RULE_NAME`, `RULE_DESC`, `EVENT_CODE`, `FUNCTION_ID`, `OPERATE_TYPE`, `UP_LIMIT`, `UP_LIMIT_DESC`, `POINT`, `POINT_UNIT`, `ENABLED_FLAG`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1', '3ef7e4bb195eb9e622d68b52509aa940', '注册志愿者', '认证志愿者会获得积分', 'register_volunteer', '43addd0735230c01eedbb38d721076b0', 'plus', 0, '无', 10, 'time', '1', '0', 0, 'APP_USER', '2020-07-23 14:48:56', 'APP_USER', '2020-07-23 14:48:56');
INSERT INTO `epmet_point`.`point_rule`(`ID`, `CUSTOMER_ID`, `RULE_NAME`, `RULE_DESC`, `EVENT_CODE`, `FUNCTION_ID`, `OPERATE_TYPE`, `UP_LIMIT`, `UP_LIMIT_DESC`, `POINT`, `POINT_UNIT`, `ENABLED_FLAG`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('2', '3ef7e4bb195eb9e622d68b52509aa940', '发布实况', '发布实况获得积分', 'publist_active_live', '43addd0735230c01eedbb38d721076b0', 'plus', 0, '无', 10, 'time', '1', '0', 0, 'APP_USER', '2020-07-23 14:48:56', 'APP_USER', '2020-07-23 14:48:56');
INSERT INTO `epmet_point`.`point_rule`(`ID`, `CUSTOMER_ID`, `RULE_NAME`, `RULE_DESC`, `EVENT_CODE`, `FUNCTION_ID`, `OPERATE_TYPE`, `UP_LIMIT`, `UP_LIMIT_DESC`, `UP_LIMIT_PREFIX`, `POINT`, `POINT_UNIT`, `ENABLED_FLAG`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1', '3ef7e4bb195eb9e622d68b52509aa940', '注册志愿者', '首次注册志愿者获得积分 ', 'register_volunteer', '43addd0735230c01eedbb38d721076b0', 'plus', 0, '无', '', 7, 'time', '1', '0', 0, 'APP_USER', '2020-07-23 14:48:56', 'APP_USER', '2020-07-23 14:48:56');
INSERT INTO `epmet_point`.`point_rule`(`ID`, `CUSTOMER_ID`, `RULE_NAME`, `RULE_DESC`, `EVENT_CODE`, `FUNCTION_ID`, `OPERATE_TYPE`, `UP_LIMIT`, `UP_LIMIT_DESC`, `UP_LIMIT_PREFIX`, `POINT`, `POINT_UNIT`, `ENABLED_FLAG`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('2', '3ef7e4bb195eb9e622d68b52509aa940', '添加实况', '添加活动实况获得积分', 'active_insert_live', '43addd0735230c01eedbb38d721076b0', 'plus', 30, '每日该项所得积分总和上限，为0时表示没有积分上限', '每日获得积分上限', 20, 'time', '1', '0', 0, 'APP_USER', '2020-07-23 14:48:56', 'APP_USER', '2020-07-23 14:48:56');

1
epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/PointRuleDao.xml
View File

@ -12,6 +12,7 @@
<result property="operateType" column="OPERATE_TYPE"/>
<result property="upLimit" column="UP_LIMIT"/>
<result property="upLimitDesc" column="UP_LIMIT_DESC"/>
<result property="upLimitPrefix" column="UP_LIMIT_PREFIX"/>
<result property="point" column="POINT"/>
<result property="pointUnit" column="POINT_UNIT"/>
<result property="enabledFlag" column="ENABLED_FLAG"/>

2
epmet-module/epmet-third/epmet-third-server/deploy/docker-compose-dev.yml
View File

@ -2,7 +2,7 @@ version: "3.7"
services:
epmet-third-server:
container_name: epmet-third-server-dev
image: 192.168.1.130:10080/epmet-cloud-dev/epmet-third-server:0.0.96
image: 192.168.1.130:10080/epmet-cloud-dev/epmet-third-server:0.0.97
ports:
- "8110:8110"
network_mode: host # 使用现有网络

2
epmet-module/epmet-third/epmet-third-server/pom.xml
View File

@ -2,7 +2,7 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<version>0.0.96</version>
<version>0.0.97</version>
<parent>
<groupId>com.epmet</groupId>

3
epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/ComponentVerifyTicketServiceImpl.java
View File

@ -397,6 +397,7 @@ public class ComponentVerifyTicketServiceImpl implements ComponentVerifyTicketSe
String expiresIn = authCodeAndTime.getExpiresIn();
// 公众号创建客户的id
String customerId = this.getLoginUserCustomerId(tokenDto);
String userId = tokenDto.getUserId();
Date expiresInTime = this.countExpirationTime(expiresIn);
@ -438,7 +439,7 @@ public class ComponentVerifyTicketServiceImpl implements ComponentVerifyTicketSe
paCustomerServiceImpl.modifyCustomer(modifyCustomer);
// 管理员授权
CustomerManagerFormDTO customerManager = paUserDao.selectManagerInfo(finalCustomerId);
CustomerManagerFormDTO customerManager = paUserDao.selectManagerInfo(userId);
log.info("=======================公众号的客户id为："+finalCustomerId);
customerManager.setCustomerId(finalCustomerId);
operCrmOpenFeignClient.addManager(customerManager);

Write Preview
Loading…
Cancel
Save