springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/WxCallbackApi.java
@@ -21,9 +21,8 @@ import io.swagger.annotations.ApiOperation; import com.panzhihua.common.service.community.ComBatteryCommodityOrderFeign; import org.json.XML; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; import org.springframework.beans.factory.annotation.Value; import org.springframework.web.bind.annotation.*; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/constants/Constants.java
@@ -238,11 +238,11 @@ /** * 党建包名 */ public static final String SERVICE_PARTYBUILDING = "partybuilding"; public static final String SERVICE_PARTYBUILDING = "huacheng-partybuilding"; /** * service_community包 */ public static final String SERVICE_COMMUNITY = "community"; public static final String SERVICE_COMMUNITY = "huacheng-community"; /** * 操作类型 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActNeighborCircleServiceImpl.java
@@ -1002,7 +1002,7 @@ public R deleteNeighborByApp(DeleteNeighborCircleAppDTO circleTopicAppDTO){ ComActNeighborCircleDO neighborCircleDO = new ComActNeighborCircleDO(); neighborCircleDO.setId(circleTopicAppDTO.getId()); neighborCircleDO.setIsDel(ComActNeighborCircleDO.IsDel.YES); neighborCircleDO.setIsDel(ComActNeighborCircleDO.isDel.yes); if(this.baseMapper.updateById(neighborCircleDO) > 0){ return R.ok(); } springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActServiceImpl.java
@@ -1,7 +1,9 @@ package com.panzhihua.service_community.service.impl; import java.util.ArrayList; import java.util.Comparator; import java.util.List; import java.util.stream.Collectors; import javax.annotation.Resource;