From a3c3ba463cc00092177bfab3f7007ddc09a4e34c Mon Sep 17 00:00:00 2001 From: zhaoqifeng Date: Wed, 29 Jul 2020 16:05:45 +0800 Subject: [PATCH 01/10] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E5=AE=A1=E6=A0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/dto/result/CategoryResultDTO.java | 40 +++++++++++++++++++ .../com/epmet/controller/CodeController.java | 28 ++++++++++++- .../java/com/epmet/service/CodeService.java | 24 ++++++++++- .../epmet/service/impl/CodeServiceImpl.java | 28 +++++++++++++ .../wxapi/result/WxMaCategoryResult.java | 15 +------ .../epmet/wxapi/service/WxMaCodeService.java | 4 +- .../service/impl/WxMaCodeServiceImpl.java | 4 +- 7 files changed, 122 insertions(+), 21 deletions(-) create mode 100644 epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/result/CategoryResultDTO.java diff --git a/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/result/CategoryResultDTO.java b/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/result/CategoryResultDTO.java new file mode 100644 index 0000000000..e2f377ad22 --- /dev/null +++ b/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/result/CategoryResultDTO.java @@ -0,0 +1,40 @@ +package com.epmet.dto.result; + +import lombok.Data; + +import java.io.Serializable; + +/** + * @author zhaoqifeng + * @dscription + * @date 2020/7/29 13:36 + */ +@Data +public class CategoryResultDTO implements Serializable { + private static final long serialVersionUID = -5691303280428707533L; + + /** + * 一级类目名称 + */ + private String firstClass; + /** + * 二级类目名称 + */ + private String secondClass; + /** + * 三级类目名称 + */ + private String thirdClass; + /** + * 一级类目的ID编号 + */ + private String firstId; + /** + * 二级类目的ID编号 + */ + private String secondId; + /** + * 三级类目的ID编号 + */ + private String thirdId; +} diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/CodeController.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/CodeController.java index 0c61ff9ac2..b7fd36db66 100644 --- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/CodeController.java +++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/CodeController.java @@ -1,12 +1,10 @@ package com.epmet.controller; -import com.baomidou.mybatisplus.extension.api.R; import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.utils.Result; import com.epmet.dto.form.*; import com.epmet.dto.result.*; import com.epmet.service.CodeService; -import oracle.jdbc.proxy.annotation.Post; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; @@ -179,4 +177,30 @@ public class CodeController { String result = codeService.mediaUpload(formDTO); return new Result().ok(result); } + + /** + * 获取小程序的第三方提交代码的页面配置 + * @author zhaoqifeng + * @date 2020/7/29 15:45 + * @param formDTO + * @return com.epmet.commons.tools.utils.Result> + */ + @PostMapping("getpage") + public Result> getPage(@RequestBody CodeCommonFormDTO formDTO){ + List result = codeService.getPage(formDTO); + return new Result>().ok(result); + } + + /** + * 获取小程序的第三方提交代码的页面配置 + * @author zhaoqifeng + * @date 2020/7/29 15:45 + * @param formDTO + * @return com.epmet.commons.tools.utils.Result> + */ + @PostMapping("getcategory") + public Result> getCategory(@RequestBody CodeCommonFormDTO formDTO) { + List result = codeService.getCategory(formDTO); + return new Result>().ok(result); + } } diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/CodeService.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/CodeService.java index 9bc9bb9bd1..2993445932 100644 --- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/CodeService.java +++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/CodeService.java @@ -1,9 +1,11 @@ package com.epmet.service; import com.epmet.commons.tools.page.PageData; -import com.epmet.commons.tools.utils.Result; import com.epmet.dto.form.*; -import com.epmet.dto.result.*; +import com.epmet.dto.result.CategoryResultDTO; +import com.epmet.dto.result.QrCodeResultDTO; +import com.epmet.dto.result.ReasonResultDTO; +import com.epmet.dto.result.TemplateListResultDTO; import java.util.List; @@ -118,4 +120,22 @@ public interface CodeService { * @date 2020/7/17 11:20 */ String mediaUpload(MediaUploadFormDTO formDTO); + + /** + * 获取小程序的第三方提交代码的页面配置 + * @author zhaoqifeng + * @date 2020/7/29 13:34 + * @param formDTO + * @return java.util.List + */ + List getPage(CodeCommonFormDTO formDTO); + + /** + * 获取小程序的第三方提交代码的页面配置 + * @author zhaoqifeng + * @date 2020/7/29 13:34 + * @param formDTO + * @return java.util.List + */ + List getCategory(CodeCommonFormDTO formDTO); } diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/CodeServiceImpl.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/CodeServiceImpl.java index df3c720e97..0410944f5a 100644 --- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/CodeServiceImpl.java +++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/CodeServiceImpl.java @@ -425,6 +425,34 @@ public class CodeServiceImpl implements CodeService { } } + @Override + public List getPage(CodeCommonFormDTO formDTO) { + //获取上传代码信息 + CodeCustomerDTO codeCustomerDTO = codeCustomerService.get(formDTO.getCodeId()); + //获取小程序调用令牌 + AuthorizationInfoDTO authInfo = authorizationInfoDao.getAuthInfoByCustomer(codeCustomerDTO.getCustomerId(), codeCustomerDTO.getClientType()); + //调用微信API获取获取体验版二维码 + WxResult> wxResult = wxMaCodeService.getPage(authInfo.getAuthorizerAccessToken()); + if (!wxResult.success()) { + throw new RenException(wxResult.getErrorCode(), wxResult.getErrorMsg()); + } + return wxResult.getData(); + } + + @Override + public List getCategory(CodeCommonFormDTO formDTO) { + //获取上传代码信息 + CodeCustomerDTO codeCustomerDTO = codeCustomerService.get(formDTO.getCodeId()); + //获取小程序调用令牌 + AuthorizationInfoDTO authInfo = authorizationInfoDao.getAuthInfoByCustomer(codeCustomerDTO.getCustomerId(), codeCustomerDTO.getClientType()); + //调用微信API获取获取体验版二维码 + WxResult> wxResult = wxMaCodeService.getCategory(authInfo.getAuthorizerAccessToken()); + if (!wxResult.success()) { + throw new RenException(wxResult.getErrorCode(), wxResult.getErrorMsg()); + } + return ConvertUtils.sourceToTarget(wxResult.getData(), CategoryResultDTO.class); + } + private void saveOperation(String customerId, String codeId, String version, String operation, String describe) { CodeOperationHistoryDTO operationDTO = new CodeOperationHistoryDTO(); operationDTO.setCustomerId(customerId); diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/wxapi/result/WxMaCategoryResult.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/wxapi/result/WxMaCategoryResult.java index a8bbb25e5e..b0d8445e8b 100644 --- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/wxapi/result/WxMaCategoryResult.java +++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/wxapi/result/WxMaCategoryResult.java @@ -12,6 +12,7 @@ import java.io.Serializable; */ @Data public class WxMaCategoryResult implements Serializable { + private static final long serialVersionUID = 2504852726988873959L; /** * 一级类目名称 */ @@ -37,16 +38,4 @@ public class WxMaCategoryResult implements Serializable { */ private String thirdId; - /** - * 小程序的页面，可通过“获取小程序的第三方提交代码的页面配置”接口获得 - */ - private String address; - /** - * 小程序的标签，多个标签用空格分隔，标签不能多于10个，标签长度不超过20 - */ - private String tag; - /** - * 小程序页面的标题,标题长度不超过32 - */ - private String title; -} +} \ No newline at end of file diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/wxapi/service/WxMaCodeService.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/wxapi/service/WxMaCodeService.java index b22c03e451..b71f9b4c66 100644 --- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/wxapi/service/WxMaCodeService.java +++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/wxapi/service/WxMaCodeService.java @@ -56,7 +56,7 @@ public interface WxMaCodeService { * @param accessToken 提交审核参数 * @return List */ - WxResult getCategory(String accessToken); + WxResult> getCategory(String accessToken); /** * 获取小程序的第三方提交代码的页面配置（仅供第三方开发者代小程序调用）. @@ -64,7 +64,7 @@ public interface WxMaCodeService { * @param accessToken 提交审核参数 * @return page_list 页面配置列表 */ - WxResult getPage(String accessToken); + WxResult> getPage(String accessToken); /** * 将第三方提交的代码包提交审核（仅供第三方开发者代小程序调用）. diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/wxapi/service/impl/WxMaCodeServiceImpl.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/wxapi/service/impl/WxMaCodeServiceImpl.java index 3c9917d9e8..34c1931c88 100644 --- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/wxapi/service/impl/WxMaCodeServiceImpl.java +++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/wxapi/service/impl/WxMaCodeServiceImpl.java @@ -97,7 +97,7 @@ public class WxMaCodeServiceImpl implements WxMaCodeService { } @Override - public WxResult getCategory(String accessToken) { + public WxResult> getCategory(String accessToken) { WxResult> result = new WxResult<>(); String url = WxMaCodeConstant.GET_CATEGORY_URL + "?" + "access_token=" + accessToken; Result getCategoryResult = HttpClientManager.getInstance().sendGet(url, null); @@ -115,7 +115,7 @@ public class WxMaCodeServiceImpl implements WxMaCodeService { } @Override - public WxResult getPage(String accessToken) { + public WxResult> getPage(String accessToken) { WxResult> result = new WxResult<>(); String url = WxMaCodeConstant.GET_PAGE_URL + "?" + "access_token=" + accessToken; Result getPageResult = HttpClientManager.getInstance().sendGet(url, null); From 2c03654630350f6f28b21a110c1d095443d40efc Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Wed, 29 Jul 2020 16:42:10 +0800 Subject: [PATCH 02/10] =?UTF-8?q?gateway=E5=AF=B9=E4=BA=8E=E5=85=AC?= =?UTF-8?q?=E4=BC=97=E5=8F=B7=E6=9C=8D=E5=8A=A1=E4=B8=8D=E8=AF=A5=E4=BC=A0?= =?UTF-8?q?=E9=80=92token=E7=9A=84=E4=B8=8D=E8=BF=9B=E8=A1=8Ctoken?= =?UTF-8?q?=E6=A0=A1=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/epmet/filter/UserTokenFilter.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/epmet-gateway/src/main/java/com/epmet/filter/UserTokenFilter.java b/epmet-gateway/src/main/java/com/epmet/filter/UserTokenFilter.java index 73f876906f..f66b0e6707 100644 --- a/epmet-gateway/src/main/java/com/epmet/filter/UserTokenFilter.java +++ b/epmet-gateway/src/main/java/com/epmet/filter/UserTokenFilter.java @@ -16,7 +16,8 @@ public interface UserTokenFilter { //是否过期 Claims claims = jwtTokenUtils.getClaimByToken(token); if (claims == null || jwtTokenUtils.isTokenExpired(claims.getExpiration())) { - throw new RenException(EpmetErrorCode.ERR401.getCode()); +// throw new RenException(EpmetErrorCode.ERR401.getCode()); + return null; } //获取用户ID String app = (String) claims.get("app"); From 21b954ab752f81101fd5709b43d3fbb3c122db43 Mon Sep 17 00:00:00 2001 From: zhangyongzhangyong <2012005003@qq.coom> Date: Wed, 29 Jul 2020 17:41:32 +0800 Subject: [PATCH 03/10] =?UTF-8?q?=E6=B4=BB=E5=8A=A8=E5=9B=9E=E9=A1=BE?= =?UTF-8?q?=E7=A8=BF=20-=20=E6=8E=A5=E5=8F=A3=E4=BF=AE=E6=94=B9=EF=BC=8C?= =?UTF-8?q?=E4=B8=8D=E5=8A=A0=E5=88=86=E9=A1=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/dto/form/resi/ResiActContentFormDTO.java | 12 ------------ .../epmet/service/impl/ActSummaryServiceImpl.java | 2 -- .../src/main/resources/mapper/ActSummaryDao.xml | 1 - 3 files changed, 15 deletions(-) diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/resi/ResiActContentFormDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/resi/ResiActContentFormDTO.java index 29ccd9fd98..1297ccb96c 100644 --- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/resi/ResiActContentFormDTO.java +++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/resi/ResiActContentFormDTO.java @@ -31,16 +31,4 @@ public class ResiActContentFormDTO implements Serializable { */ @NotBlank(message = "活动Id不能为空", groups = { AddUserInternalGroup.class }) private String actId; - - /** - * 页码，从1开始 - */ - @Min(value = 1, message = "页码必须大于0", groups = { AddUserInternalGroup.class }) - private Integer pageNo; - - /** - * 页容量，默认20页 - */ - @Min(value = 1, message = "每页条数必须大于必须大于0", groups = { ResiActBaseFormDTO.AddUserInternalGroup.class }) - private Integer pageSize; } diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/ActSummaryServiceImpl.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/ActSummaryServiceImpl.java index d3f9087afc..e3331cf7a1 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/ActSummaryServiceImpl.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/ActSummaryServiceImpl.java @@ -107,8 +107,6 @@ public class ActSummaryServiceImpl extends BaseServiceImpl summaryList(ResiActContentFormDTO formDto) { - int pageIndex = (formDto.getPageNo() - NumConstant.ONE) * formDto.getPageSize(); - formDto.setPageNo(pageIndex); return new Result().ok(baseDao.selectListSummary(formDto)); } diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/ActSummaryDao.xml b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/ActSummaryDao.xml index 6ff1b956d0..ff8b70f796 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/ActSummaryDao.xml +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/ActSummaryDao.xml @@ -29,6 +29,5 @@ WHERE s.DEL_FLAG = '0' AND s.ACT_ID = #{actId} ORDER BY s.ORDER_NUM ASC - LIMIT #{pageNo}, #{pageSize} From f9530c376842cfb8398c9f9a65de3224236d89b3 Mon Sep 17 00:00:00 2001 From: wangchao Date: Wed, 29 Jul 2020 19:28:30 +0800 Subject: [PATCH 04/10] =?UTF-8?q?=E7=A7=AF=E5=88=86bug=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/controller/ExchangeController.java | 18 +++++++++++++++++- .../impl/PointVerificationLogServiceImpl.java | 4 ++-- .../com/epmet/redis/UserBaseInfoRedis.java | 1 + .../main/resources/mapper/UserWechatDao.xml | 4 ++-- 4 files changed, 22 insertions(+), 5 deletions(-) diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/controller/ExchangeController.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/controller/ExchangeController.java index 5b1445db95..ff4bdd2285 100644 --- a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/controller/ExchangeController.java +++ b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/controller/ExchangeController.java @@ -1,12 +1,15 @@ package com.epmet.controller; -import com.epmet.common.token.annotation.Login; + import com.epmet.commons.tools.annotation.LoginUser; import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.commons.tools.utils.Result; import com.epmet.commons.tools.validator.ValidatorUtils; import com.epmet.dto.form.PointVerificationFormDTO; +import com.epmet.dto.form.ResiCommonUserIdFormDTO; +import com.epmet.dto.form.WorkPointVerificationFormDTO; import com.epmet.dto.result.PointVerificationResultDTO; +import com.epmet.dto.result.WorkPointVerficationListResultDTO; import com.epmet.service.PointVerificationLogService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.PostMapping; @@ -40,5 +43,18 @@ public class ExchangeController { return new Result().ok(pointVerificationLogService.verifyPoint(verificationParam)); } + /** + * @Description 获取工作端积分核销记录 + * @param verificationParam + * @return + * @author wangc + * @date 2020.07.24 16:08 + **/ + @PostMapping("recordmonthly") + public Result getStaffVerificationRecordMonthly(@LoginUser TokenDto token,@RequestBody WorkPointVerificationFormDTO verificationParam){ + verificationParam.setStaffId(token.getUserId()); + ValidatorUtils.validateEntity(verificationParam, ResiCommonUserIdFormDTO.UserIdGroup.class); + return new Result().ok(pointVerificationLogService.getStaffVerificationRecordMonthly(verificationParam)); + } } diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/PointVerificationLogServiceImpl.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/PointVerificationLogServiceImpl.java index 319b3fa0ce..32d86c57a5 100644 --- a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/PointVerificationLogServiceImpl.java +++ b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/PointVerificationLogServiceImpl.java @@ -195,8 +195,8 @@ public class PointVerificationLogServiceImpl extends BaseServiceImpl o.getPoint()).sum() ); }else{ - int fromIndex = verificationParam.getPageNo() * verificationParam.getPageSize(); - int toIndex = (verificationParam.getPageNo() + 1) * verificationParam.getPageSize(); + int fromIndex = (verificationParam.getPageNo() - 1) * verificationParam.getPageSize(); + int toIndex = verificationParam.getPageNo() * verificationParam.getPageSize(); if(toIndex > dataList.size()) { toIndex = dataList.size(); } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/redis/UserBaseInfoRedis.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/redis/UserBaseInfoRedis.java index ac442388ad..f8b68ddb11 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/redis/UserBaseInfoRedis.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/redis/UserBaseInfoRedis.java @@ -106,6 +106,7 @@ public class UserBaseInfoRedis { baseInfo.setCustomerId(relation.getCustomerId()); BelongGridNameFormDTO gridParam = new BelongGridNameFormDTO(); gridParam.setGridId(relation.getGridId()); + baseInfo.setRegisteredGridId(relation.getGridId()); Result gridResult = govOrgOpenFeignClient.getGridNameByGridId(gridParam); if(gridResult.success() && null != gridResult.getData() diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/UserWechatDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/UserWechatDao.xml index cfacc58191..11dc871caa 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/UserWechatDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/UserWechatDao.xml @@ -107,8 +107,8 @@ wechat.USER_ID = #{item} - - AND base.REAL_NAME = #{realName} + + AND (base.REAL_NAME LIKE concat('%',#{realName},'%') OR wechat.NICKNAME LIKE concat('%',#{realName},'%')) ORDER BY base.REAL_NAME , wechat.NICKNAME From accacfd87a7c7b6f36b4894c6b480f7a9f5cd676 Mon Sep 17 00:00:00 2001 From: wangchao Date: Thu, 30 Jul 2020 09:11:46 +0800 Subject: [PATCH 05/10] =?UTF-8?q?mine=20=20user=20=20=20point=20=E6=9C=8D?= =?UTF-8?q?=E5=8A=A1=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet-point-server/deploy/docker-compose-dev.yml | 2 +- epmet-module/epmet-point/epmet-point-server/pom.xml | 2 +- .../resi-mine/resi-mine-server/deploy/docker-compose-dev.yml | 2 +- epmet-module/resi-mine/resi-mine-server/pom.xml | 2 +- epmet-user/epmet-user-server/deploy/docker-compose-dev.yml | 2 +- epmet-user/epmet-user-server/pom.xml | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/epmet-module/epmet-point/epmet-point-server/deploy/docker-compose-dev.yml b/epmet-module/epmet-point/epmet-point-server/deploy/docker-compose-dev.yml index f634958d1d..a77c87301f 100644 --- a/epmet-module/epmet-point/epmet-point-server/deploy/docker-compose-dev.yml +++ b/epmet-module/epmet-point/epmet-point-server/deploy/docker-compose-dev.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-point-server: container_name: epmet-point-server-dev - image: 192.168.1.130:10080/epmet-cloud-dev/epmet-point-server:0.0.8 + image: 192.168.1.130:10080/epmet-cloud-dev/epmet-point-server:0.0.9 ports: - "8112:8112" network_mode: host # 使用现有网络 diff --git a/epmet-module/epmet-point/epmet-point-server/pom.xml b/epmet-module/epmet-point/epmet-point-server/pom.xml index c252af1634..0b8b4b2f52 100644 --- a/epmet-module/epmet-point/epmet-point-server/pom.xml +++ b/epmet-module/epmet-point/epmet-point-server/pom.xml @@ -3,7 +3,7 @@ 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"> 4.0.0 - 0.0.8 + 0.0.9 epmet-point com.epmet diff --git a/epmet-module/resi-mine/resi-mine-server/deploy/docker-compose-dev.yml b/epmet-module/resi-mine/resi-mine-server/deploy/docker-compose-dev.yml index 1854054da8..c47df434d3 100644 --- a/epmet-module/resi-mine/resi-mine-server/deploy/docker-compose-dev.yml +++ b/epmet-module/resi-mine/resi-mine-server/deploy/docker-compose-dev.yml @@ -2,7 +2,7 @@ version: "3.7" services: resi-mine-server: container_name: resi-mine-server-dev - image: 192.168.1.130:10080/epmet-cloud-dev/resi-mine-server:0.3.31 + image: 192.168.1.130:10080/epmet-cloud-dev/resi-mine-server:0.3.32 ports: - "8094:8094" network_mode: host # 使用现有网络 diff --git a/epmet-module/resi-mine/resi-mine-server/pom.xml b/epmet-module/resi-mine/resi-mine-server/pom.xml index b8c200940a..8ca040d22a 100644 --- a/epmet-module/resi-mine/resi-mine-server/pom.xml +++ b/epmet-module/resi-mine/resi-mine-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.3.31 + 0.3.32 com.epmet resi-mine diff --git a/epmet-user/epmet-user-server/deploy/docker-compose-dev.yml b/epmet-user/epmet-user-server/deploy/docker-compose-dev.yml index 615c149f21..020bec0c41 100644 --- a/epmet-user/epmet-user-server/deploy/docker-compose-dev.yml +++ b/epmet-user/epmet-user-server/deploy/docker-compose-dev.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-user-server: container_name: epmet-user-server-dev - image: 192.168.1.130:10080/epmet-cloud-dev/epmet-user-server:0.3.90 + image: 192.168.1.130:10080/epmet-cloud-dev/epmet-user-server:0.3.91 ports: - "8087:8087" network_mode: host # 不会创建新的网络 diff --git a/epmet-user/epmet-user-server/pom.xml b/epmet-user/epmet-user-server/pom.xml index 6351062f8e..d8f0af6e05 100644 --- a/epmet-user/epmet-user-server/pom.xml +++ b/epmet-user/epmet-user-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.3.90 + 0.3.91 com.epmet epmet-user From a94d9614d8fc5ba55798c03004722ccd495ebc5c Mon Sep 17 00:00:00 2001 From: zhaoqifeng Date: Thu, 30 Jul 2020 09:13:19 +0800 Subject: [PATCH 06/10] =?UTF-8?q?=E7=AC=AC=E4=B8=89=E6=96=B9=E7=89=88?= =?UTF-8?q?=E6=9C=AC=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet-third-server/deploy/docker-compose-dev.yml | 2 +- epmet-module/epmet-third/epmet-third-server/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-module/epmet-third/epmet-third-server/deploy/docker-compose-dev.yml b/epmet-module/epmet-third/epmet-third-server/deploy/docker-compose-dev.yml index 4a0c5ab1c4..c13ef834e2 100644 --- a/epmet-module/epmet-third/epmet-third-server/deploy/docker-compose-dev.yml +++ b/epmet-module/epmet-third/epmet-third-server/deploy/docker-compose-dev.yml @@ -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.76 + image: 192.168.1.130:10080/epmet-cloud-dev/epmet-third-server:0.0.77 ports: - "8110:8110" network_mode: host # 使用现有网络 diff --git a/epmet-module/epmet-third/epmet-third-server/pom.xml b/epmet-module/epmet-third/epmet-third-server/pom.xml index 59950716a9..a52498eafc 100644 --- a/epmet-module/epmet-third/epmet-third-server/pom.xml +++ b/epmet-module/epmet-third/epmet-third-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.0.76 + 0.0.77 com.epmet From 4f02f36d60e2fe04e0cdf681bc394a95dc51bf8a Mon Sep 17 00:00:00 2001 From: zhangyongzhangyong <2012005003@qq.coom> Date: Thu, 30 Jul 2020 09:57:27 +0800 Subject: [PATCH 07/10] =?UTF-8?q?=E6=B4=BB=E5=8A=A8=E5=8D=B3=E5=B0=86?= =?UTF-8?q?=E5=BC=80=E5=A7=8B=EF=BC=8C=E6=8E=A5=E5=8F=A3=E5=8F=8D=E5=8F=82?= =?UTF-8?q?=E5=86=85=E5=AE=B9=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/ActInfoDao.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/ActInfoDao.xml b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/ActInfoDao.xml index 8d89ba7406..75d62f1059 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/ActInfoDao.xml +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/ActInfoDao.xml @@ -316,9 +316,9 @@ i.ID actId, CASE WHEN NOW() AND ]]> NOW() THEN - CONCAT('您报名的 "',i.TITLE,'" 活动还有',TIMESTAMPDIFF(MINUTE, NOW(), i.ACT_START_TIME),'分钟开始。') + '您报名的活动即将开始' ELSE - CONCAT('正在进行中的活动："',i.TITLE,'"。。。') + '活动进行中' END title FROM act_info i LEFT JOIN act_user_relation r ON i.ID = r.ACT_ID WHERE i.DEL_FLAG = '0' From e59918c480ca33d9708f70d723a538d0c359b5c1 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Thu, 30 Jul 2020 10:05:52 +0800 Subject: [PATCH 08/10] heart+1 --- .../epmet-heart-server/deploy/docker-compose-dev.yml | 2 +- epmet-module/epmet-heart/epmet-heart-server/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-module/epmet-heart/epmet-heart-server/deploy/docker-compose-dev.yml b/epmet-module/epmet-heart/epmet-heart-server/deploy/docker-compose-dev.yml index d31b6fd06d..cd227183d9 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/deploy/docker-compose-dev.yml +++ b/epmet-module/epmet-heart/epmet-heart-server/deploy/docker-compose-dev.yml @@ -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.9 + image: 192.168.1.130:10080/epmet-cloud-dev/epmet-heart-server:0.0.10 ports: - "8111:8111" network_mode: host # 使用现有网络 diff --git a/epmet-module/epmet-heart/epmet-heart-server/pom.xml b/epmet-module/epmet-heart/epmet-heart-server/pom.xml index ffb2ec42ff..5a699202fb 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/pom.xml +++ b/epmet-module/epmet-heart/epmet-heart-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.0.9 + 0.0.10 com.epmet epmet-heart From f62ed7c7ae04a71c6829ee1e5d969c7e7b557504 Mon Sep 17 00:00:00 2001 From: wangchao Date: Thu, 30 Jul 2020 10:18:09 +0800 Subject: [PATCH 09/10] =?UTF-8?q?POINT=20=20=20USER=20=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../result/WorkPointVerificationDetailResultDTO.java | 4 +++- .../com/epmet/feign/EpmetPointOpenFeignClient.java | 2 +- .../fallback/EpmetPointOpenFeignClientFallback.java | 2 +- .../service/impl/PointVerificationLogServiceImpl.java | 2 +- .../epmet/dto/result/CustomerUser4PointResultDTO.java | 10 +++++----- 5 files changed, 11 insertions(+), 9 deletions(-) diff --git a/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/result/WorkPointVerificationDetailResultDTO.java b/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/result/WorkPointVerificationDetailResultDTO.java index 694c80a1cd..f93cace94e 100644 --- a/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/result/WorkPointVerificationDetailResultDTO.java +++ b/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/result/WorkPointVerificationDetailResultDTO.java @@ -17,7 +17,7 @@ public class WorkPointVerificationDetailResultDTO implements Serializable { /** * 被核销用户昵称 * */ - private String userNickname; + private String userNickname = ""; /** * 核销积分 "-100" @@ -29,5 +29,7 @@ public class WorkPointVerificationDetailResultDTO implements Serializable { * */ private String remark; + private String date; + } diff --git a/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/feign/EpmetPointOpenFeignClient.java b/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/feign/EpmetPointOpenFeignClient.java index 09dfbd3e3d..deaa7bb6d5 100644 --- a/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/feign/EpmetPointOpenFeignClient.java +++ b/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/feign/EpmetPointOpenFeignClient.java @@ -15,7 +15,7 @@ import org.springframework.web.bind.annotation.GetMapping; * @author wangc * @date 2020/7/9 13:25 */ -@FeignClient(name = ServiceConstant.EPMET_HEART_SERVER, fallback = EpmetPointOpenFeignClientFallback.class) +@FeignClient(name = ServiceConstant.EPMET_POINT_SERVER, fallback = EpmetPointOpenFeignClientFallback.class) public interface EpmetPointOpenFeignClient { /** diff --git a/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/feign/fallback/EpmetPointOpenFeignClientFallback.java b/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/feign/fallback/EpmetPointOpenFeignClientFallback.java index 188881efd8..8901a0724b 100644 --- a/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/feign/fallback/EpmetPointOpenFeignClientFallback.java +++ b/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/feign/fallback/EpmetPointOpenFeignClientFallback.java @@ -18,6 +18,6 @@ import org.springframework.stereotype.Component; public class EpmetPointOpenFeignClientFallback implements EpmetPointOpenFeignClient { @Override public Result myPoint(TokenDto dto) { - return ModuleUtils.feignConError(ServiceConstant.RESI_PARTYMEMBER_SERVER, "myPoint", dto); + return ModuleUtils.feignConError(ServiceConstant.EPMET_POINT_SERVER, "myPoint", dto); } } diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/PointVerificationLogServiceImpl.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/PointVerificationLogServiceImpl.java index 32d86c57a5..d60444edb1 100644 --- a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/PointVerificationLogServiceImpl.java +++ b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/PointVerificationLogServiceImpl.java @@ -190,7 +190,7 @@ public class PointVerificationLogServiceImpl extends BaseServiceImpl dataList = baseDao.selectStaffVerificationLog(verificationParam.getStaffId(),getFirstDayDateOfMonth(date),getLastDayOfMonth(date)); - if(NumConstant.ONE < verificationParam.getPageNo()){ + if(NumConstant.ONE == verificationParam.getPageNo()){ result.setTotalPoint( dataList.stream().mapToInt(o -> o.getPoint()).sum() ); diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/CustomerUser4PointResultDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/CustomerUser4PointResultDTO.java index 95cba037ef..a8049ae3fc 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/CustomerUser4PointResultDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/CustomerUser4PointResultDTO.java @@ -16,25 +16,25 @@ public class CustomerUser4PointResultDTO implements Serializable { /** * 用户头像 * */ - private String userHeadPhoto; + private String userHeadPhoto = ""; /** * 用户显示昵称 * */ - private String userName; + private String userName = ""; /** * 用户微信昵称 * */ - private String userNickname; + private String userNickname = ""; /** *注册网格名称 * */ - private String registeredGrid; + private String registeredGrid = ""; /** * 用户Id * */ - private String userId; + private String userId = ""; } From 32f7ce9b74d56e9da6238cd1ac840ae04a6e3aa6 Mon Sep 17 00:00:00 2001 From: wangchao Date: Thu, 30 Jul 2020 10:21:14 +0800 Subject: [PATCH 10/10] =?UTF-8?q?POINT=20=20=20USER=20=20=E6=9C=8D?= =?UTF-8?q?=E5=8A=A1=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet-point-server/deploy/docker-compose-dev.yml | 2 +- epmet-module/epmet-point/epmet-point-server/pom.xml | 2 +- epmet-user/epmet-user-server/deploy/docker-compose-dev.yml | 2 +- epmet-user/epmet-user-server/pom.xml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/epmet-module/epmet-point/epmet-point-server/deploy/docker-compose-dev.yml b/epmet-module/epmet-point/epmet-point-server/deploy/docker-compose-dev.yml index a77c87301f..87c378fe47 100644 --- a/epmet-module/epmet-point/epmet-point-server/deploy/docker-compose-dev.yml +++ b/epmet-module/epmet-point/epmet-point-server/deploy/docker-compose-dev.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-point-server: container_name: epmet-point-server-dev - image: 192.168.1.130:10080/epmet-cloud-dev/epmet-point-server:0.0.9 + image: 192.168.1.130:10080/epmet-cloud-dev/epmet-point-server:0.0.10 ports: - "8112:8112" network_mode: host # 使用现有网络 diff --git a/epmet-module/epmet-point/epmet-point-server/pom.xml b/epmet-module/epmet-point/epmet-point-server/pom.xml index 0b8b4b2f52..bd3e0397ac 100644 --- a/epmet-module/epmet-point/epmet-point-server/pom.xml +++ b/epmet-module/epmet-point/epmet-point-server/pom.xml @@ -3,7 +3,7 @@ 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"> 4.0.0 - 0.0.9 + 0.0.10 epmet-point com.epmet diff --git a/epmet-user/epmet-user-server/deploy/docker-compose-dev.yml b/epmet-user/epmet-user-server/deploy/docker-compose-dev.yml index 020bec0c41..d7a3ab5278 100644 --- a/epmet-user/epmet-user-server/deploy/docker-compose-dev.yml +++ b/epmet-user/epmet-user-server/deploy/docker-compose-dev.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-user-server: container_name: epmet-user-server-dev - image: 192.168.1.130:10080/epmet-cloud-dev/epmet-user-server:0.3.91 + image: 192.168.1.130:10080/epmet-cloud-dev/epmet-user-server:0.3.92 ports: - "8087:8087" network_mode: host # 不会创建新的网络 diff --git a/epmet-user/epmet-user-server/pom.xml b/epmet-user/epmet-user-server/pom.xml index d8f0af6e05..d0ba44872e 100644 --- a/epmet-user/epmet-user-server/pom.xml +++ b/epmet-user/epmet-user-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.3.91 + 0.3.92 com.epmet epmet-user