springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActUserWalletTradeExcelVO.java
@@ -38,7 +38,7 @@ * 时间 */ @ExcelProperty(value = "时间" ,index = 3) @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private Date createAt; /** springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActUserWalletTradeRewardExcelVO.java
@@ -42,7 +42,7 @@ * 时间 */ @ExcelProperty(value = "时间" ,index = 5) @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private Date createAt; /** springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/wallet/ComActWalletTradeStatisticsAdminVO.java
@@ -1,23 +1,21 @@ package com.panzhihua.common.model.vos.community.wallet; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.math.BigDecimal; import java.util.Date; @Data @ApiModel("交易记录统计返回参数") public class ComActWalletTradeStatisticsAdminVO { @ApiModelProperty("今日交易金额") private BigDecimal dayTotal; private BigDecimal dayTotal = BigDecimal.ZERO; @ApiModelProperty("本月交易金额") private BigDecimal monthTotal; private BigDecimal monthTotal = BigDecimal.ZERO; @ApiModelProperty("累计交易金额") private BigDecimal total; private BigDecimal total = BigDecimal.ZERO; } springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/neighbor/ComActNeighborCircleAppVO.java
@@ -103,4 +103,7 @@ @ApiModelProperty("话题名称") private String topicName; @ApiModelProperty("话题id") private String topicId; } springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/CommunityActivityApi.java
@@ -14,6 +14,7 @@ import com.panzhihua.common.service.community.CommunityService; import com.panzhihua.common.service.user.UserService; import com.panzhihua.common.utlis.DateUtils; import com.panzhihua.common.utlis.StringUtils; import com.panzhihua.common.utlis.WxUtil; import com.panzhihua.common.utlis.WxXCXTempSend; import io.swagger.annotations.Api; @@ -334,8 +335,13 @@ String openid = userResult.getData().toString(); WxXCXTempSend util = new WxXCXTempSend(); try { String result = comActMicroWishVO1.getRejectReason(); if(StringUtils.isNotEmpty(result)){ result = result.substring(0,4); result += "…"; } WxUtil.sendSubscribeSHZT(openid,util.getAppAccessToken(),"微心愿" , DateUtils.format(comActMicroWishVO1.getExamineAt(),DateUtils.ymdhms_format),"审核驳回，驳回原因：" + comActMicroWishVO1.getRejectReason()); , DateUtils.format(comActMicroWishVO1.getExamineAt(),DateUtils.ymdhms_format),result); }catch (Exception e){ log.error("消息推送失败，失败原因：" + e.getMessage()); } @@ -438,8 +444,13 @@ String openid = userResult.getData().toString(); WxXCXTempSend util = new WxXCXTempSend(); try { String result = comActEasyPhotoVO1.getRejectReason(); if(StringUtils.isNotEmpty(result)){ result = result.substring(0,4); result += "…"; } WxUtil.sendSubscribeSHZT(openid,util.getAppAccessToken(),"随手拍" , DateUtils.format(comActEasyPhotoVO1.getExamineAt(),DateUtils.ymdhms_format),"审核驳回，驳回原因：" + comActEasyPhotoVO.getRejectReason()); , DateUtils.format(comActEasyPhotoVO1.getExamineAt(),DateUtils.ymdhms_format),result); }catch (Exception e){ log.error("消息推送失败，失败原因：" + e.getMessage()); } springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/HouseApi.java
@@ -10,6 +10,10 @@ import com.panzhihua.common.model.vos.user.SysUserNoticeVO; import com.panzhihua.common.service.community.CommunityService; import com.panzhihua.common.service.user.UserService; import com.panzhihua.common.utlis.DateUtils; import com.panzhihua.common.utlis.StringUtils; import com.panzhihua.common.utlis.WxUtil; import com.panzhihua.common.utlis.WxXCXTempSend; import com.panzhihua.common.validated.AddGroup; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -64,6 +68,10 @@ return R.fail("房屋租售id主键不能为空"); } R r = communityService.putOpsHouse(comOpsHouseVO); Date nowDate = new Date(); //查询用户openid R userResult = userService.getUserOpenId(comOpsHouseVO.getUserId()); if(R.isOk(r) && 1==comOpsHouseVO.getStatus()) { //审核通过添加提示信息 SysUserNoticeVO sysUserNoticeVO = new SysUserNoticeVO(); @@ -80,6 +88,17 @@ R r2 = userService.addNotice(sysUserNoticeVO); if (R.isOk(r2)) { log.info("新增房屋出租通过审核通知成功【{}】", JSONObject.toJSONString(sysUserNoticeVO)); } if(R.isOk(userResult)){ String openid = userResult.getData().toString(); WxXCXTempSend util = new WxXCXTempSend(); try { WxUtil.sendSubscribeSHZT(openid,util.getAppAccessToken(),"房屋租售" , DateUtils.format(nowDate,DateUtils.ymdhms_format),"审核通过"); }catch (Exception e){ log.error("消息推送失败，失败原因：" + e.getMessage()); } } }else if(R.isOk(r) && 2==comOpsHouseVO.getStatus()){ //您提交的xxxx房屋出租审核已经审核通过/被驳回 @@ -100,6 +119,22 @@ if (R.isOk(r2)) { log.info("新增房屋出租通过审核通知成功【{}】", JSONObject.toJSONString(sysUserNoticeVO)); } if(R.isOk(userResult)){ String openid = userResult.getData().toString(); WxXCXTempSend util = new WxXCXTempSend(); try { String result = comOpsHouseVO.getReason(); if(StringUtils.isNotEmpty(result)){ result = result.substring(0,4); result += "…"; } WxUtil.sendSubscribeSHZT(openid,util.getAppAccessToken(),"房屋租售" , DateUtils.format(nowDate,DateUtils.ymdhms_format),result); }catch (Exception e){ log.error("消息推送失败，失败原因：" + e.getMessage()); } } } return r; } springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActNeighborCircleDAO.java
@@ -42,6 +42,7 @@ "canc.last_fabulous_num," + "canc.last_views_num," + "canc.type," + "canc.topic_id," + "su.nick_name as name," + "su.community_id," + "canct.name as topicName," + springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActUserWalletServiceImpl.java
@@ -150,6 +150,8 @@ amount = photoActivityDO.getExcellentReward(); }else if(activityType.equals(ComActEasyPhotoDO.activityType.pt)){ amount = photoActivityDO.getOrdinaryReward(); }else if(activityType.equals(ComActEasyPhotoDO.activityType.yb)){ amount = photoActivityDO.getCommonlyReward(); } // Date nowDate = new Date();
