refactor(mcwl-communityCenter):调整

mcwl-admin/src/main/java/com/mcwl/web/controller/communityCenter/PublishController.java

@@ -87,10 +87,8 @@ public class PublishController {
     @ApiOperation(value = "删除")
     @PostMapping("remove")
     public R<Object> deletePublish(@RequestBody @Valid PublishRemoveRes publishRemoveRes) {
-        Long communityId = publishRemoveRes.getCommunityId();
+
-        Long publishId = publishRemoveRes.getPublishId();
+        return publishService.removePublish(publishRemoveRes);
-        publishService.remove(new LambdaQueryWrapper<Publish>().eq(Publish::getId, publishId).eq(Publish::getCommunityId, communityId));
-        return R.ok();
     }
 
     /**
@@ -98,14 +96,17 @@ public class PublishController {
      */
     @ApiOperation(value = "精选/取消精选")
     @GetMapping("elite")
-    public R<Object> elitePublish(@NotNull(message = "社区id不能为空")
+    public R<Object> elitePublish(@NotNull(message = "租户id不能为空")
+                                  @ApiParam(value = "租户id")
+                                  @Valid Long tenantId,
+                                  @NotNull(message = "社区id不能为空")
                                   @ApiParam(value = "社区id")
                                   @Valid Long communityId,
                                   @NotNull(message = "发布文章id不能为空")
                                   @ApiParam(value = "发布文章id")
                                   @Valid Long publishId) {
-        publishService.elitePublish(communityId, publishId);
+
-        return R.ok();
+        return publishService.elitePublish(tenantId, communityId, publishId);
     }
 
     /**

mcwl-admin/src/main/java/com/mcwl/web/controller/personalCenter/PersonalCenterController.java

@@ -145,9 +145,9 @@ public class PersonalCenterController {
 
 
     /**
-     * 获取金币消费记录
+     * 获取金币收入支出消费记录
      */
-    @ApiOperation(value = "获取金币消费记录")
+    @ApiOperation(value = "获取金币收入支出消费记录")
     @PostMapping("/getWalletRecord")
     public TableDataInfo getWalletRecord(@Valid @RequestBody PageDomain pageDomain) {
         return consumeService.getWalletRecord(pageDomain);

mcwl-admin/src/main/resources/application-dev.yml

@@ -136,7 +136,7 @@ mall:
       # 沙箱应用id
       appId: 9021000135682614
       # 沙箱应用私钥
-      privateKey: MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCQxmQGcaiKjOhayWi+zNTvpp8B5YT8jFFkjLzrD+W+T2Dwf2GfFR4p95zsCJxYeoLWdghMPA6/GMFrLbuVFpaEjuTm4icqA9N8n5d3W0j7gh+wMjZoqyJclAIeb09ut7rY6mWzilA9kWmZnUG7MOWIU70RVRYrfJectCFw/odM9lG4XIVe13X2h+1ecTQyQzLWmnvKFCfo7dQjE7fIYiWfud1ZGUneNs3u73pNWMB6ThGTTCbs0atcgM3fYOg3q7fTxIu9VcaUCJiJ/kNbL9sVEyOrSyx2f2o6w06zdEaOiQFsuDeS8QPYGMg7pf42wAfqCO6hqxQiQT5vp1hvB0o1AgMBAAECggEAIhaEYLwMSispXo8D2cES9iaOU/z91hUX6Qv2Q4anuqqoEZh8nN91Db6etTjFz1NxURvTklelxTsH97t56n26DRY0MWTYgd0Kw9Iz8MeOpKGb4nnAM97vpUq4QQBGfLRIC2ENdzu+7vA5JBFR88hsky/cWaNmJ/EbJauIIDneE7GigMR2HF7kfzdZzOBN4ZEh/ef5NKeCnEieRJJhWRgrgNXVZ44Tqi67AM7ey9pyUtBe7fgzxXtrWXBN9yKaVxxSXm3KJXFQqA6mcilFVZaxMNlAySc4MPTW8lq0ozOCOCunoeIphNz/OVIxGu3/voXFXlBfOKqOkYMVZxMY6OrvtQKBgQD0nIlXK4VW72VaGpz9kxQkRNzJV/yqaqet1GOSlPM2l0RCRFOVVdnvbQdHGPe6+HxHL1dh5MP8T/aHoP+4UXkkQCc8moS2FZxJvFH2QTSZBcSSdGL7GMpROqs38J+XlJzrhNcB20lrW6D7yMeQa4YEcXwdbD8Er/YaIqODBWYYewKBgQCXg+16RLDArciwwhf0TBWZPor2iYFDdwU5UPu7CKOhU1MLfQhG85gGpXHjB6G8cMUi/ezxh/FEl+sWOZegpkPwL5/BQS9tNYWIaC4kipPF/a5Up4DMYUHVAuuPwNqqXpvgU+rGjCns0wtPRnjrkghLkc3oTSID7o7pzUwIk2whDwKBgAys3+EIfExY82OL5X6uVGjcuKQmTw11oWK8krxRw5iclgjpCXu/ix+BAtOIU634mlgF9/02oYE9k4TLrvSaJDDgsifNyfq1e/fGLmkYT+VuCxWbulVQn4s+AwlPCrYMGWWK6KlL9638fYcOjGjLaZJpXwkXRtyzUYlhKh/r87JpAoGBAIavRp2mi/xrPvgpQQPv0k9L8llfOCHRnjoqC+thrZsNp8eRmJcBmMVnskofEZ2iHQuS71pw/n58EQTLo0ayJbhPjVJL8K3CovXzrfjbmqqoa5xi3bJQTiXdF6rMw1QpD6Uk05E1LVuQ6v/IZFr7kBYlAQWb8z3NhQq+bPU+nyLvAoGAGpBbSM8gPzdWQqkHoos0icu3cj0GhN3MU7+1Eb/rsXyh/lk5wtZTEnHjwhdUOUtwVNjvrv7CzA7unhOoaM6YcE/Zpd4zt8pjqH1Mhds7UHf4Xg+A+J4G6meYnhSwfBpOub02ncsqfBlXE0qhFv6AvcMewWndyLb8EYaUUXTYkG0=
+      privateKey: MIIEvAIBADANBgkqhkiG9w0BAQEFAASCBKYwggSiAgEAAoIBAQCZVV6wTtfUJP7UoSLMCYiGad2Jj2hlOyDVNLXZVf+Vffckt7/g3Ye/jIPt1D/arB2f/wO01qKOkraBCXg2LQOL3g72Na9MUZ0JJ6Tk4JAgRngR3GoO1XuEz52yq4yX7nVcD+xDbAt865GZWZhKL+7DgW22z1f7TtEDpfHwFcvMfznwTm5R6VpOw0qYnnHzOZwNxrtKNQLYIJVZhuvi51PuLn4dpC1nH487BjPBLSFiTMcN0aQzaFs2d3OQcMBykQFp8CR00LvKqsUHjVm6hwMm0/sObd3Meu7to6fRCNIYtu3LaDwS9s7tvRGIf3y7wFb+R2nfz83FSXx20D2wGxKhAgMBAAECggEASpXrTGndtLUWPEnxijys6209tTdL+coMS4mrV3/spkQy3up+7Jv192gbmKmhMfZ9JqG+pM2vHxkgq532mqvEyNmIf51XmxEsCRL+s9LEaN6+czm7YWHZBp6TQCEQb6sv7UtViupYoDhah7S8ToIIa5Ne0gkD7BvHsjWbfUSs8NjFjGawTeueQh8m2w6qcudlIh6/5FGyFSWM74qUh3kOzmxjv95z8NSXTPmdwdOuRl/H77T6E4/IxV8CHIF0FkhT4v8ApkHSUgYs1qWRtt6YPZ21rmv0UqUFhJJwhRaqm+Cwob2HT/7RTn8EUVtOIFpQnqmTpGg/NjuDkocwKA+lUQKBgQDISdLtmoOnCHeDlG22kIulbPTkcwAzkdKQuVJ0ZSsaHq5PHMVa60YOHYQyjTgY2SKJH/t9/P+QdvR0/An5osQsw0pE1/qj1VufTYdDq2/P2Cot/k9EerOpAjnsel1/9O4kIu67sFBI4R48YhD7Ui0ncfrjEyo8FXzvVI9Xi8kWNQKBgQDD+/jHYwG8o9zOVJHzl+wP2PHhWhKKdrTrIv3JlcwsAKMO3zB+FyUDSG5IxieLJCaNsNSeAVRqkTG/VBLe33Cf6bfrqgS0iRiVB2i8fiXpQfGO17eYcHe7Jm2ys6CSFMoLXfvRXgxMTOiwewChU+vp2DuEC4yrhDyLWckQe+aoPQKBgDRPu8ydJ7ePqY9vS/x74k1RmOC1/J57frCYBqYp6kkHLGWzUQR/IKv9H5MIeVdcFv4ToV71nlZAC3cmgQB3d59tXk9+zZLO3gBMgoC1HR3/Cn06x79OAPCqiTBvgU4zTaOYkBvrX/y492mz/1V00CBWT73ROp24ywnDXzDxbJLlAoGAEQ3xNTCZaxf7U/0qAj+bLDndupWC/Yec8MVHvm4JqV6Y0ed8KczLzMBV0IFl2YbY0AWuSt2kwe1Gnfar+bcJ7vCAr8JIzIkNmZJee+CiXez+H0cIU/ydfqy2aRGWjH/AoUKZcjuz6EPdD9Z0VJWf9uZ5L2Ft6VMFjb7Pb17I0KUCgYAHjL4lL5FK3eXPaE2FFf4nG8b/h3PKErcAr4LlLKdiZLKPIR3bCW3PR+HYYdDdlrfPNzad7XVNpVKRCBDEP1FWoJsJ0HFYus7AmclUiv2FFbwnLizBo8OhZMGGaddW5xuQNcxjOkPMnfNxQP+qG86PNpgzg88YfyegWtCk8oywJQ==
       # 沙箱应用公钥证书
       appCertPath: /opt/cert/dev/appPublicCert.crt
       # 沙箱支付宝公钥证书路径

mcwl-admin/src/main/resources/cert/dev/appPublicCert.crt

@@ -1,19 +1,19 @@
 -----BEGIN CERTIFICATE-----
-MIIDmTCCAoGgAwIBAgIQICQEAub4U5TMozibHLcg8zANBgkqhkiG9w0BAQsFADCBkTELMAkGA1UE
+MIIDmTCCAoGgAwIBAgIQICUEKLy77ndlVg3UfaV5GDANBgkqhkiG9w0BAQsFADCBkTELMAkGA1UE
 BhMCQ04xGzAZBgNVBAoMEkFudCBGaW5hbmNpYWwgdGVzdDElMCMGA1UECwwcQ2VydGlmaWNhdGlv
 biBBdXRob3JpdHkgdGVzdDE+MDwGA1UEAww1QW50IEZpbmFuY2lhbCBDZXJ0aWZpY2F0aW9uIEF1
-dGhvcml0eSBDbGFzcyAyIFIxIHRlc3QwHhcNMjQwNDAyMDUzMjU2WhcNMjUwNDA3MDUzMjU2WjBr
+dGhvcml0eSBDbGFzcyAyIFIxIHRlc3QwHhcNMjUwNDI4MDY1NjQ2WhcNMjYwNTAzMDY1NjQ2WjBr
 MQswCQYDVQQGEwJDTjEfMB0GA1UECgwWZGJwbGZ1MTI5NEBzYW5kYm94LmNvbTEPMA0GA1UECwwG
 QWxpcGF5MSowKAYDVQQDDCEyMDg4NzIxMDMyOTcxMTQzLTkwMjEwMDAxMzU2ODI2MTQwggEiMA0G
-CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCQxmQGcaiKjOhayWi+zNTvpp8B5YT8jFFkjLzrD+W+
+CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCZVV6wTtfUJP7UoSLMCYiGad2Jj2hlOyDVNLXZVf+V
-T2Dwf2GfFR4p95zsCJxYeoLWdghMPA6/GMFrLbuVFpaEjuTm4icqA9N8n5d3W0j7gh+wMjZoqyJc
+ffckt7/g3Ye/jIPt1D/arB2f/wO01qKOkraBCXg2LQOL3g72Na9MUZ0JJ6Tk4JAgRngR3GoO1XuE
-lAIeb09ut7rY6mWzilA9kWmZnUG7MOWIU70RVRYrfJectCFw/odM9lG4XIVe13X2h+1ecTQyQzLW
+z52yq4yX7nVcD+xDbAt865GZWZhKL+7DgW22z1f7TtEDpfHwFcvMfznwTm5R6VpOw0qYnnHzOZwN
-mnvKFCfo7dQjE7fIYiWfud1ZGUneNs3u73pNWMB6ThGTTCbs0atcgM3fYOg3q7fTxIu9VcaUCJiJ
+xrtKNQLYIJVZhuvi51PuLn4dpC1nH487BjPBLSFiTMcN0aQzaFs2d3OQcMBykQFp8CR00LvKqsUH
-/kNbL9sVEyOrSyx2f2o6w06zdEaOiQFsuDeS8QPYGMg7pf42wAfqCO6hqxQiQT5vp1hvB0o1AgMB
+jVm6hwMm0/sObd3Meu7to6fRCNIYtu3LaDwS9s7tvRGIf3y7wFb+R2nfz83FSXx20D2wGxKhAgMB
-AAGjEjAQMA4GA1UdDwEB/wQEAwIE8DANBgkqhkiG9w0BAQsFAAOCAQEAZmMSaD7s3aervdACl0cN
+AAGjEjAQMA4GA1UdDwEB/wQEAwIE8DANBgkqhkiG9w0BAQsFAAOCAQEAU+8RF/0/hn2a+LbzMLjv
-YRcUHMGBA4DwzeLKaF0iqcsQxzJHBQRSGbAeQ9n5l1U5V0Pos92V7eqEJqtC52l6sK5T4YE6zAxf
+64kF+j6PQRqlKZALFHDso6helwtquBWSf+Veu1PZ0tEgwCwUF0v+KYtDW+5tdwUsPMg/HXsbpSJw
-49RKyo00qVFCbcGMHnRy0F/AkEhz+qhan1R3Dm7Ty6UtgAaeF6emD35EIKXziCvqS1nBt+nniYYB
+x4ZiEjwcE9FG7E0U3ckb+eP2FgJbVJnjoy4Fq7VRpjO/asxoYSoWsnCC6b0aUkLs+QlQ4O6SKC3d
-0O2UntrJ3lYucuLun7TeYou/kPMTnZItzSmvCmG181e5IpSB3qGwBnIgkmB+Ge0kGIFAoV9+MucT
+rTHGeyK1D4fTlk3Dmuf6dA6Q0SgkG91sNzHscw3FtE47+GtvHtM4Qr6LHqKlYPV8VZ09zvherpih
-4YOffum8yC0oF7aMtTL9whm5gb+Udj+lBrHYYw8VPNpcvBmRlXEKEJLbWQrGtJi6+URReWqO52UP
+tSTr035sJezP9VYtKQwTXyUTCVVC6WQQdT/040WvMqkPVGtDEWzStZWflXK1IeAXnOLXyCYEBBG6
-fGHB0r4r575H4Y1QkA==
+aE08iD5MOCZmldDOFg==
 -----END CERTIFICATE-----

mcwl-communityCenter/pom.xml

@@ -31,6 +31,12 @@
             <groupId>com.mcwl</groupId>
             <artifactId>mcwl-system</artifactId>
         </dependency>
+        <dependency>
+            <groupId>com.mcwl</groupId>
+            <artifactId>mcwl-myInvitation</artifactId>
+            <version>3.8.8</version>
+            <scope>compile</scope>
+        </dependency>
 
         <!-- https://mvnrepository.com/artifact/com.alibaba/dashscope-sdk-java -->
 <!--        <dependency>-->

mcwl-communityCenter/src/main/java/com/mcwl/communityCenter/domain/dto/PublishRemoveRes.java

@@ -7,11 +7,17 @@ import lombok.Data;
 import javax.validation.constraints.NotNull;
 
 /**
- * 点赞/取消点赞请求参数
+ * 删除发布请求参数
  */
 @Data
-@ApiModel(value = "点赞/取消点赞请求参数")
+@ApiModel(value = "删除发布请求参数")
 public class PublishRemoveRes {
+    /**
+     * 租户id
+     */
+    @ApiModelProperty(value = "租户id", required = true)
+    @NotNull(message = "租户id不能为空")
+    private Long tenantId;
 
     /**
      * 社区id

mcwl-communityCenter/src/main/java/com/mcwl/communityCenter/domain/dto/QuestionRes.java

@@ -53,7 +53,6 @@ public class QuestionRes {
      * 是否匿名 0 否 1 是
      */
     @ApiModelProperty(value = "是否匿名", position = 5)
-    @NotNull(message = "是否匿名不能为空")
     private Integer isAnonymous = 0;
 
 

mcwl-communityCenter/src/main/java/com/mcwl/communityCenter/domain/vo/CommunityVo.java

@@ -87,12 +87,6 @@ public class CommunityVo {
     @ApiModelProperty(value = "加入人数")
     private Integer joinNum;
 
-    /**
-     * 发布数量
-     */
-    @ApiModelProperty(value = "发布数量")
-    private Integer publishNum;
-
     /**
      * 是否加入
      */

mcwl-communityCenter/src/main/java/com/mcwl/communityCenter/domain/vo/PersonHomeVo.java

@@ -124,6 +124,11 @@ public class PersonHomeVo {
     @ApiModelProperty(value = "付费金额 当提问类型为付费时必填")
     private Double amount;
 
+    /**
+     * 状态 0未解决 1已解决
+     */
+    private Integer status;
+
     /**
      * 创建时间
      */

mcwl-communityCenter/src/main/java/com/mcwl/communityCenter/domain/vo/QuestionVo.java

@@ -92,6 +92,12 @@ public class QuestionVo {
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
     private Date createTime;
 
+    /**
+     * 状态 0未解决 1已解决
+     */
+    @ApiModelProperty(value = "状态 0未解决 1已解决")
+    private Integer status;
+
 
 
 }

mcwl-communityCenter/src/main/java/com/mcwl/communityCenter/mapper/PublishMapper.java

@@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.mcwl.communityCenter.domain.Publish;
 import com.mcwl.communityCenter.domain.dto.MyPublishPageRes;
 import com.mcwl.communityCenter.domain.dto.PublishPageRes;
+import com.mcwl.communityCenter.domain.dto.PublishRemoveRes;
 import com.mcwl.communityCenter.domain.vo.PublishVo;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
@@ -43,7 +44,7 @@ public interface PublishMapper extends BaseMapper<Publish> {
                                                                    @Param("communityId")
                                                                    Long communityId);
 
-    void elitePublish(@Param("communityId") Long communityId, @Param("publishId") Long publishId);
+    void elitePublish(@Param("tenantId") Long tenantId, @Param("communityId") Long communityId, @Param("publishId") Long publishId);
 
     @InterceptorIgnore(tenantLine = "true")
     List<PublishVo> publishList(Page<Publish> page, @Param("publishPageRes") PublishPageRes publishPageRes);
@@ -58,4 +59,10 @@ public interface PublishMapper extends BaseMapper<Publish> {
 
     @InterceptorIgnore(tenantLine = "true")
     Publish getLastPublish(@Param("tenantId") Long tenantId, @Param("communityId") Long communityId);
+
+    @InterceptorIgnore(tenantLine = "true")
+    void removePublish(@Param("publishRemoveRes") PublishRemoveRes publishRemoveRes);
+
+    @InterceptorIgnore(tenantLine = "true")
+    void updateLikeNum(@Param("publish") Publish publish);
 }

mcwl-communityCenter/src/main/java/com/mcwl/communityCenter/service/PublishService.java

@@ -31,7 +31,7 @@ public interface PublishService extends IService<Publish> {
 
     TableDataInfo publishFile(@Valid PublishPageRes publishPageRes);
 
-    void elitePublish(Long communityId, Long publishId);
+    R<Object> elitePublish(Long tenantId, Long communityId, Long publishId);
 
     TableDataInfo publishList(PublishPageRes publishPageRes);
 
@@ -44,4 +44,6 @@ public interface PublishService extends IService<Publish> {
     void reportPublish(@Valid PublishReportRes publishReportRes);
 
     Publish getLastPublish(Long tenantId, Long communityId);
+
+    R<Object> removePublish(@Valid PublishRemoveRes publishRemoveRes);
 }

mcwl-communityCenter/src/main/java/com/mcwl/communityCenter/service/impl/CommunityServiceImpl.java

@@ -26,6 +26,8 @@ import com.mcwl.communityCenter.mapper.CommunityMapper;
 import com.mcwl.communityCenter.mapper.CommunityUserMapper;
 import com.mcwl.communityCenter.service.CommunityService;
 import com.mcwl.communityCenter.service.PublishService;
+import com.mcwl.myInvitation.domain.Consume;
+import com.mcwl.myInvitation.mapper.ConsumeMapper;
 import com.mcwl.system.service.ISysUserService;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
@@ -54,6 +56,9 @@ public class CommunityServiceImpl extends ServiceImpl<CommunityMapper, Community
 
     private final PublishService publishService;
 
+    private final ConsumeMapper consumeMapper;
+
+
 
     @Override
     public TableDataInfo listByPage(CommunityListPageRes communityListPageRes) {
@@ -93,6 +98,7 @@ public class CommunityServiceImpl extends ServiceImpl<CommunityMapper, Community
                     .userId(SecurityUtils.getUserId())
                     .userType(2)
                     .build());
+            redisCache.deleteObject("communityJoinNumMap");
 
         } catch (Exception e) {
             throw new ServiceException(e.getMessage(), HttpStatus.SHOW_ERROR_MSG);
@@ -112,7 +118,7 @@ public class CommunityServiceImpl extends ServiceImpl<CommunityMapper, Community
         Long communityId = joinCommunityRes.getCommunityId();
         Community community = baseMapper.getByTenantIdAndCommunityId(tenantId, communityId);
         if (Objects.isNull(community)) {
-            return R.fail("社区不存在，请重新加入");
+            return R.fail(HttpStatus.SHOW_ERROR_MSG,"社区不存在，请重新加入");
         }
 
         CommunityUser communityUser = communityUserMapper.selectByTenantIdAndCommunityIdAndUserId(tenantId,
@@ -120,14 +126,14 @@ public class CommunityServiceImpl extends ServiceImpl<CommunityMapper, Community
                 SecurityUtils.getUserId());
 
         if (Objects.nonNull(communityUser)) {
-            return R.fail("您已加入该社区,不能重复加入");
+            return R.fail(HttpStatus.SHOW_ERROR_MSG,"您已加入该社区,不能重复加入");
         }
 
-        SysUser user = SecurityUtils.getLoginUser().getUser();
+        SysUser user = sysUserService.selectUserById(SecurityUtils.getUserId());
         Double wallet = user.getWallet();
         Double price = community.getPrice();
         if (wallet < price) {
-            return R.fail("钱包余额不足，请充值");
+            return R.fail(HttpStatus.SHOW_ERROR_MSG,"钱包余额不足，请充值");
         }
         // 扣费
         BigDecimal priceBigDecimal = new BigDecimal(price.toString());
@@ -167,6 +173,25 @@ public class CommunityServiceImpl extends ServiceImpl<CommunityMapper, Community
                 SecurityUtils.getLoginUser().getUser().getNickName(), community.getCommunityName(), price));
         communityAdviceMapper.insert(communityAdvice);
 
+        Consume consume = new Consume();
+        consume.setUserId(SecurityUtils.getUserId());
+        consume.setAmount(-price);
+        consume.setProductId(communityId);
+        consume.setType(3);
+        consume.setWallet(user.getWallet());
+        consumeMapper.insert(consume);
+
+        consume = new Consume();
+        consume.setUserId(community.getTenantId());
+        consume.setAmount(price);
+        consume.setProductId(communityId);
+        consume.setType(3);
+        consume.setWallet(sysUserService.selectUserById(community.getTenantId()).getWallet());
+        consumeMapper.insert(consume);
+
+        redisCache.deleteObject("communityJoinNumMap");
+
+
         return R.ok("加入成功");
     }
 
@@ -213,6 +238,8 @@ public class CommunityServiceImpl extends ServiceImpl<CommunityMapper, Community
 
         if (communityJoinNum == 1) {
             baseMapper.deleteCommunity(tenantId, communityId);
+        } else {
+            redisCache.deleteObject("communityJoinNumMap");
         }
 
         return R.ok();
@@ -299,7 +326,7 @@ public class CommunityServiceImpl extends ServiceImpl<CommunityMapper, Community
             communityVo.setNickName(sysUser.getNickName());
             communityVo.setCreateDay(daysBetween);
             communityVo.setJoinNum(this.getCommunityJoinNum(community.getId()));
-            communityVo.setPublishNum(this.getCommunityPublishNum(community.getId()));
+//            communityVo.setPublishNum(this.getCommunityPublishNum(community.getId()));
             if (myJoinCommunityMap.get(community.getId()) != null) {
                 communityVo.setIsJoin(1);
             } else {

mcwl-communityCenter/src/main/java/com/mcwl/communityCenter/service/impl/PublishCollectServiceImpl.java

@@ -34,7 +34,6 @@ public class PublishCollectServiceImpl extends ServiceImpl<PublishCollectMapper,
     private final PublishLikeMapper publishLikeMapper;
 
 
-
     @Override
     public TableDataInfo myCollectList(MyPublishCollectPageRes myPublishCollectPageRes) {
         Page<PublishCollect> page = initPage(myPublishCollectPageRes);
@@ -45,6 +44,23 @@ public class PublishCollectServiceImpl extends ServiceImpl<PublishCollectMapper,
         for (PublishVo publishVo : publishVoList) {
             PersonHomeVo personHomeVo = BeanUtil.toBean(publishVo, PersonHomeVo.class);
 
+            PublishLikeRes publishLikeRes = new PublishLikeRes();
+            publishLikeRes.setTenantId(myPublishCollectPageRes.getTenantId());
+            publishLikeRes.setCommunityId(myPublishCollectPageRes.getCommunityId());
+            publishLikeRes.setPublishId(publishVo.getId());
+            PublishLike publishLike = publishLikeMapper.selectPublishLike(publishLikeRes, SecurityUtils.getUserId());
+            if (Objects.nonNull(publishLike)) {
+                String delFlag = publishLike.getDelFlag();
+                if ("0".equals(delFlag)) {
+                    publishVo.setIsLike(1);
+                } else {
+                    publishVo.setIsLike(0);
+                }
+            } else {
+                publishVo.setIsLike(0);
+            }
+
+
             CommentDetailRes commentDetailRes = new CommentDetailRes();
             commentDetailRes.setTenantId(myPublishCollectPageRes.getTenantId());
             commentDetailRes.setCommunityId(myPublishCollectPageRes.getCommunityId());

mcwl-communityCenter/src/main/java/com/mcwl/communityCenter/service/impl/PublishLikeServiceImpl.java

@@ -71,12 +71,12 @@ public class PublishLikeServiceImpl extends ServiceImpl<PublishLikeMapper, Publi
             baseMapper.insert(publishLike);
 
             publish.setLikeNum(publish.getLikeNum() + 1);
-            publishMapper.updateById(publish);
+            publishMapper.updateLikeNum(publish);
             this.addLikeAdvice(publish);
             return;
         }
 
-        if (Objects.equals(publishLike.getDelFlag(), "0")) {
+        if ("0".equals(publishLike.getDelFlag())) {
             publishLike.setDelFlag("2");
             int likeNum = publish.getLikeNum() - 1;
             likeNum = Math.max(likeNum, 0);
@@ -88,7 +88,7 @@ public class PublishLikeServiceImpl extends ServiceImpl<PublishLikeMapper, Publi
         }
 
         baseMapper.updateDelFlagById(publishLike);
-        publishMapper.updateById(publish);
+        publishMapper.updateLikeNum(publish);
 
     }
 

mcwl-communityCenter/src/main/java/com/mcwl/communityCenter/service/impl/PublishServiceImpl.java

@@ -12,6 +12,7 @@ import com.mcwl.common.core.domain.R;
 import com.mcwl.common.core.domain.entity.SysUser;
 import com.mcwl.common.core.page.PageDomain;
 import com.mcwl.common.core.page.TableDataInfo;
+import com.mcwl.common.core.redis.RedisCache;
 import com.mcwl.common.exception.BusinessException;
 import com.mcwl.common.exception.ServiceException;
 import com.mcwl.common.utils.SecurityUtils;
@@ -60,6 +61,8 @@ public class PublishServiceImpl extends ServiceImpl<PublishMapper, Publish> impl
 
     private final PublishReportMapper publishReportMapper;
 
+    private final RedisCache redisCache;
+
 
     @Override
     public PublishVo getDetail(PublishDetailRes publishDetailRes) {
@@ -111,6 +114,8 @@ public class PublishServiceImpl extends ServiceImpl<PublishMapper, Publish> impl
             publish.setPublishTime(new Date());
         }
         baseMapper.insertPublish(publish);
+        redisCache.deleteObject("communityPublishNumMap");
+
         return R.ok();
     }
 
@@ -208,8 +213,20 @@ public class PublishServiceImpl extends ServiceImpl<PublishMapper, Publish> impl
     }
 
     @Override
-    public void elitePublish(Long communityId, Long publishId) {
+    public R<Object> elitePublish(Long tenantId, Long communityId, Long publishId) {
-        baseMapper.elitePublish(communityId, publishId);
+
+        CommunityUser communityUser = communityUserMapper.selectCommunityUser(tenantId, communityId, SecurityUtils.getUserId());
+        if (Objects.isNull(communityUser)) {
+            return R.fail(HttpStatus.SHOW_ERROR_MSG, "您不是该社区成员");
+        }
+        if ("1".equals(communityUser.getIsBlack())) {
+            return R.fail(HttpStatus.SHOW_ERROR_MSG, "您已被拉黑");
+        }
+        if (communityUser.getUserType() != 2) {
+            return R.fail(HttpStatus.SHOW_ERROR_MSG, "您不是群主");
+        }
+        baseMapper.elitePublish(tenantId, communityId, publishId);
+        return R.ok();
     }
 
     @Override
@@ -326,7 +343,7 @@ public class PublishServiceImpl extends ServiceImpl<PublishMapper, Publish> impl
             return;
         }
 
-        if (publishCollect.getDelFlag().equals("0")) {
+        if ("0".equals(publishCollect.getDelFlag())) {
             publishCollect.setDelFlag("2");
         } else {
             publishCollect.setDelFlag("0");
@@ -397,6 +414,31 @@ public class PublishServiceImpl extends ServiceImpl<PublishMapper, Publish> impl
         return baseMapper.getLastPublish(tenantId, communityId);
     }
 
+    @Override
+    public R<Object> removePublish(PublishRemoveRes publishRemoveRes) {
+        Long tenantId = publishRemoveRes.getTenantId();
+        Long communityId = publishRemoveRes.getCommunityId();
+        Long publishId = publishRemoveRes.getPublishId();
+
+        Long currentUserId = SecurityUtils.getUserId();
+        CommunityUser communityUser = communityUserMapper.selectCommunityUser(tenantId, communityId, currentUserId);
+        if (Objects.isNull(communityUser)) {
+            return R.fail(HttpStatus.SHOW_ERROR_MSG, "您不是该社区成员");
+        }
+
+        Publish publish = publishMapper.selectByIdAndTenantIdAndCommunityId(publishId, tenantId, communityId);
+        if (Objects.isNull(publish)) {
+            return R.fail(HttpStatus.SHOW_ERROR_MSG, "该内容不存在");
+        }
+
+        if (publish.getUserId().equals(currentUserId) || publish.getUserId().equals(tenantId)) {
+            publishMapper.removePublish(publishRemoveRes);
+        } else {
+            return R.fail(HttpStatus.SHOW_ERROR_MSG, "您没有权限删除该内容");
+        }
+        return R.ok(HttpStatus.SHOW_ERROR_MSG, "删除成功");
+    }
+
     private Page<Publish> initPage(PageDomain pageDomain) {
         return new Page<>(pageDomain.getPageNum(), pageDomain.getPageSize());
     }

mcwl-communityCenter/src/main/java/com/mcwl/communityCenter/service/impl/QuestionCommentServiceImpl.java

@@ -19,6 +19,8 @@ import com.mcwl.communityCenter.domain.vo.QuestionVo;
 import com.mcwl.communityCenter.mapper.*;
 import com.mcwl.communityCenter.service.QuestionCommentService;
 import com.mcwl.communityCenter.service.QuestionService;
+import com.mcwl.myInvitation.domain.Consume;
+import com.mcwl.myInvitation.mapper.ConsumeMapper;
 import com.mcwl.system.service.ISysUserService;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
@@ -42,6 +44,8 @@ public class QuestionCommentServiceImpl extends ServiceImpl<QuestionCommentMappe
 
     private final CommunityUserMapper communityUserMapper;
 
+    private final ConsumeMapper consumeMapper;
+
     @Override
     @Transactional(rollbackFor = Exception.class)
     public R<Object> comment(QuestionCommentRes questionCommentRes) {
@@ -162,6 +166,14 @@ public class QuestionCommentServiceImpl extends ServiceImpl<QuestionCommentMappe
         sysUserService.updateUser(sysUser);
 
 
+        Consume consume = new Consume();
+        consume.setUserId(SecurityUtils.getUserId());
+        consume.setAmount(question.getAmount());
+        consume.setType(4);
+        consume.setWallet(sysUser.getWallet());
+        consumeMapper.insert(consume);
+
+
         return R.ok();
     }
 

mcwl-communityCenter/src/main/java/com/mcwl/communityCenter/service/impl/QuestionServiceImpl.java

@@ -24,6 +24,8 @@ import com.mcwl.communityCenter.mapper.*;
 import com.mcwl.communityCenter.service.CommunityService;
 import com.mcwl.communityCenter.service.QuestionCommentService;
 import com.mcwl.communityCenter.service.QuestionService;
+import com.mcwl.myInvitation.domain.Consume;
+import com.mcwl.myInvitation.mapper.ConsumeMapper;
 import com.mcwl.system.service.ISysUserService;
 import lombok.RequiredArgsConstructor;
 import org.springframework.context.annotation.Bean;
@@ -53,6 +55,9 @@ public class QuestionServiceImpl extends ServiceImpl<QuestionMapper, Question> i
 
     private final QuestionCommentService questionCommentService;
 
+    private final ConsumeMapper consumeMapper;
+
+
     /**
      * 添加问题
      *
@@ -102,6 +107,14 @@ public class QuestionServiceImpl extends ServiceImpl<QuestionMapper, Question> i
         sysUserService.updateUser(sysUser);
 
 
+        Consume consume = new Consume();
+        consume.setUserId(SecurityUtils.getUserId());
+        consume.setAmount(-questionRes.getAmount());
+        consume.setType(4);
+        consume.setWallet(sysUser.getWallet());
+        consumeMapper.insert(consume);
+
+
 //        CommunityAdvice communityAdvice = new CommunityAdvice();
 //        communityAdvice.setTenantId(tenantId);
 //        communityAdvice.setCommunityId(communityId);
@@ -248,8 +261,14 @@ public class QuestionServiceImpl extends ServiceImpl<QuestionMapper, Question> i
             personHomeVo.setAvatar(questionUserAvatar);
             personHomeVo.setImageUrl(questionUrl);
 
+            QuestionDetailRes questionDetailRes = new QuestionDetailRes();
+            questionDetailRes.setTenantId(questionVo.getTenantId());
+            questionDetailRes.setCommunityId(questionVo.getCommunityId());
+            questionDetailRes.setQuestionId(questionVo.getId());
 
-            List<QuestionCommentVo> questionCommentList = questionVo.getCommentList();
+            List<QuestionCommentVo> questionCommentList = questionCommentService.getComment(questionDetailRes);
+
+//            List<QuestionCommentVo> questionCommentList = questionVo.getCommentList();
 
             List<CommentVo> commentList = BeanUtil.copyToList(questionCommentList, CommentVo.class);
 

mcwl-communityCenter/src/main/resources/mapper/communityCenter/CommunityMapper.xml

@@ -95,8 +95,8 @@
         where cu.user_id = #{userId}
         and c.del_flag = '0'
         and cu.del_flag = '0'
-        <if test="joinCommunityListPageRes.isMyCreate == 1">
+        <if test="joinCommunityListPageRes.isMyCreate != 1">
-            and c.tenant_id = #{userId}
+            and c.tenant_id != #{userId}
         </if>
         <if test="joinCommunityListPageRes.searchContent != null and joinCommunityListPageRes.searchContent != ''">
             and (c.community_name like concat('%', #{joinCommunityListPageRes.searchContent}, '%')

mcwl-communityCenter/src/main/resources/mapper/communityCenter/CommunityUserMapper.xml

@@ -104,6 +104,7 @@
           and ((CONVERT_TZ(NOW(), 'SYSTEM', '+08:00') >= start_time
             AND CONVERT_TZ(NOW(), 'SYSTEM', '+08:00') <= end_time) or (start_time is null and end_time is null))
           and (black_end_time is null or NOW() >= black_end_time)
+          and del_flag = '0';
     </select>
     <select id="getAllCommunityUser" resultType="com.mcwl.communityCenter.domain.CommunityUser">
         select id,
@@ -131,6 +132,7 @@
           and user_id = #{userId}
           and ((CONVERT_TZ(NOW(), 'SYSTEM', '+08:00') &gt;= start_time
             AND CONVERT_TZ(NOW(), 'SYSTEM', '+08:00') &lt;= end_time) or (start_time is null and end_time is null))
+          and del_flag = '0';
     </select>
     <select id="getCommunityUserAvatar" resultType="java.lang.String">
         select u.avatar
@@ -141,6 +143,7 @@
           and ((CONVERT_TZ(NOW(), 'SYSTEM', '+08:00') &gt;= cu.start_time
             AND CONVERT_TZ(NOW(), 'SYSTEM', '+08:00') &lt;= cu.end_time) or
                (cu.start_time is null and cu.end_time is null))
+          and cu.del_flag = '0'
         order by cu.create_time desc
         limit 5
     </select>

mcwl-communityCenter/src/main/resources/mapper/communityCenter/PublishCollectMapper.xml

@@ -17,23 +17,22 @@
     </update>
 
     <select id="myCollectList" resultType="com.mcwl.communityCenter.domain.vo.PublishVo">
-        select p.*, 1 as is_collect,u.user_id, u.avatar, u.nick_name as user_name,
+        select p.*,
-        IF(pl.del_flag = '0', 1, 0) as is_like
+               1           as is_collect,
-        from cc_publish p left join cc_publish_collect pc
+               u.user_id,
-        on p.id = pc.publish_id
+               u.avatar,
-        and p.tenant_id = pc.tenant_id
+               u.nick_name as user_name
-        and p.community_id = pc.community_id
+        from cc_publish p
-        left join cc_publish_like pl
+                 left join cc_publish_collect pc
-        on p.id = pl.publish_id
+                           on p.id = pc.publish_id
-        and p.tenant_id = pl.tenant_id
+                               and p.tenant_id = pc.tenant_id
-        and p.community_id = pl.community_id
+                               and p.community_id = pc.community_id
-        left join sys_user u on p.user_id = u.user_id
+                 left join sys_user u on p.user_id = u.user_id
-        <where>
+        where pc.tenant_id = #{myPublishCollectPageRes.tenantId}
-            and pc.tenant_id = #{myPublishCollectPageRes.tenantId}
+          and pc.community_id = #{myPublishCollectPageRes.communityId}
-            and pc.community_id = #{myPublishCollectPageRes.communityId}
+          and pc.user_id = #{userId}
-            and pc.user_id = #{userId}
+          and pc.del_flag = '0'
-            and pc.del_flag = '0'
+          and p.del_flag = '0'
-        </where>
     </select>
     <select id="getPublishCollect" resultType="com.mcwl.communityCenter.domain.PublishCollect">
         select *

mcwl-communityCenter/src/main/resources/mapper/communityCenter/PublishMapper.xml

@@ -14,6 +14,24 @@
         set is_elite = !is_elite
         where community_id = #{communityId}
           and id = #{publishId}
+          and tenant_id = #{tenantId}
+          and del_flag = '0'
+    </update>
+    <update id="removePublish">
+        update cc_publish
+        set del_flag = '2'
+        where tenant_id = #{publishRemoveRes.tenantId}
+          and community_id = #{publishRemoveRes.communityId}
+          and id = #{publishRemoveRes.publishId}
+          and del_flag = '0'
+    </update>
+    <update id="updateLikeNum">
+        update cc_publish
+        set like_num = #{publish.likeNum}
+        where tenant_id = #{publish.tenantId}
+          and community_id = #{publish.communityId}
+          and id = #{publish.id}
+          and del_flag = '0'
     </update>
     <select id="selectByTenantIdAndCommunityIdPage" resultType="com.mcwl.communityCenter.domain.Publish">
         select id,
@@ -100,10 +118,6 @@
         select p.*, u.nick_name as user_name, u.avatar
         from cc_publish p
         left join sys_user u on p.user_id = u.user_id
-        left join cc_publish_like pl on pl.tenant_id = p.tenant_id and pl.community_id = p.community_id and p.id =
-        pl.publish_id
-        left join cc_publish_collect pc on p.id = pc.publish_id and p.tenant_id = pc.tenant_id and
-        p.community_id = pc.community_id
         <where>
             and p.tenant_id = #{publishPageRes.tenantId}
             and p.community_id = #{publishPageRes.communityId}

mcwl-communityCenter/src/main/resources/mapper/communityCenter/QuestionCommentMapper.xml

@@ -33,6 +33,7 @@
           and qm.community_id = #{questionDetailRes.communityId}
           and qm.question_id = #{questionDetailRes.questionId}
           and qm.del_flag = '0'
-        order by qm.create_time desc
+        order by qm.is_accept desc, qm.create_time desc
+
     </select>
 </mapper>

mcwl-myInvitation/src/main/java/com/mcwl/myInvitation/domain/Consume.java

@@ -29,12 +29,11 @@ public class Consume extends BaseEntity {
     // 商品id
     private Long productId;
 
-    // 商品类型 0模型 1工作流 2图片
+    /**
+     * 商品类型 0模型 1工作流 2图片 3社区 4社区提问 5金币 6提现
+     */
     private Integer type;
 
     // 剩余金币
     private Double wallet;
-
-    // 消费时间
-    private Date consumeDate;
 }

mcwl-myInvitation/src/main/java/com/mcwl/myInvitation/domain/vo/ConsumeVo.java

@@ -40,5 +40,5 @@ public class ConsumeVo {
     // 消费时间
     @ApiModelProperty(value = "消费时间")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    private Date consumeDate;
+    private Date createTime;
 }

mcwl-myInvitation/src/main/java/com/mcwl/myInvitation/service/impl/ConsumeServiceImpl.java

@@ -62,7 +62,7 @@ public class ConsumeServiceImpl extends ServiceImpl<ConsumeMapper, Consume> impl
         Long userId = SecurityUtils.getUserId();
 
         LambdaQueryWrapper<Consume> lqw = new LambdaQueryWrapper<>();
-        lqw.eq(Consume::getUserId, userId);
+        lqw.eq(Consume::getUserId, userId).orderByDesc(Consume::getCreateTime);
 
         consumeMapper.selectPage(page, lqw);
 
@@ -81,6 +81,18 @@ public class ConsumeServiceImpl extends ServiceImpl<ConsumeMapper, Consume> impl
                 case 2:
                     consumeVo.setProductName("图片");
                     break;
+                case 3:
+                    consumeVo.setProductName("社区");
+                    break;
+                case 4:
+                    consumeVo.setProductName("社区提问");
+                    break;
+                case 5:
+                    consumeVo.setProductName("金币");
+                    break;
+                case 6:
+                    consumeVo.setProductName("提现");
+                    break;
             }
             consumeVoList.add(consumeVo);
 

mcwl-pay/src/main/java/com/mcwl/pay/service/impl/AliPayServiceImpl.java

@@ -35,6 +35,8 @@ import com.mcwl.common.utils.ShareCodeUtils;
 import com.mcwl.common.utils.StringUtils;
 import com.mcwl.memberCenter.domain.MemberLevel;
 import com.mcwl.memberCenter.service.MemberLevelService;
+import com.mcwl.myInvitation.domain.Consume;
+import com.mcwl.myInvitation.mapper.ConsumeMapper;
 import com.mcwl.pay.config.AliConfig;
 import com.mcwl.pay.domain.OrderTrade;
 import com.mcwl.pay.domain.OrderTradeDto;
@@ -92,6 +94,9 @@ public class AliPayServiceImpl implements AliPayService {
     @Autowired
     private OrderTradeService orderTradeService;
 
+    @Autowired
+    private ConsumeMapper consumeMapper;
+
     @Autowired
     private ThreadPoolTaskExecutor threadPoolTaskExecutor;
 
@@ -535,6 +540,13 @@ public class AliPayServiceImpl implements AliPayService {
         sysUser.setWallet(wallet.subtract(amountBigDecimal).setScale(2, RoundingMode.HALF_UP).doubleValue());
         sysUserService.updateUser(sysUser);
 
+        Consume consume = new Consume();
+        consume.setUserId(SecurityUtils.getUserId());
+        consume.setAmount(-Double.parseDouble(amount));
+        consume.setType(6);
+        consume.setWallet(sysUser.getWallet());
+        consumeMapper.insert(consume);
+
         // 添加记录
         SysUserPayAccountLog sysUserPayAccountLog = new SysUserPayAccountLog();
         sysUserPayAccountLog.setUserId(sysUser.getUserId());

mcwl-pay/src/main/java/com/mcwl/pay/service/impl/OrderTradeServiceImpl.java

@@ -26,6 +26,7 @@ import com.mcwl.memberCenter.service.RechargeRecordService;
 import com.mcwl.myInvitation.domain.Commission;
 import com.mcwl.myInvitation.domain.CommissionRatio;
 import com.mcwl.myInvitation.domain.Consume;
+import com.mcwl.myInvitation.mapper.ConsumeMapper;
 import com.mcwl.myInvitation.service.CommissionRatioService;
 import com.mcwl.myInvitation.service.CommissionService;
 import com.mcwl.myInvitation.service.ConsumeService;
@@ -111,6 +112,9 @@ public class OrderTradeServiceImpl extends ServiceImpl<OrderTradeMapper, OrderTr
     @Autowired
     private RedisCache redisCache;
 
+    @Autowired
+    private ConsumeMapper consumeMapper;
+
     private static final Cache<String, Object> USER_LOCKS = CacheBuilder.newBuilder()
             .expireAfterAccess(3, TimeUnit.MINUTES)
             .build();
@@ -170,7 +174,6 @@ public class OrderTradeServiceImpl extends ServiceImpl<OrderTradeMapper, OrderTr
         consume.setProductId(productId);
         consume.setType(productType);
         consume.setWallet(sysUser.getWallet());
-        consume.setConsumeDate(new Date());
         consumeService.save(consume);
 
         //添加购买记录表
@@ -514,6 +517,13 @@ public class OrderTradeServiceImpl extends ServiceImpl<OrderTradeMapper, OrderTr
         user.setWallet(walletDecimal.doubleValue());
         sysUserService.updateUser(user);
 
+        Consume consume = new Consume();
+        consume.setUserId(SecurityUtils.getUserId());
+        consume.setAmount(Double.parseDouble(amount));
+        consume.setType(5);
+        consume.setWallet(user.getWallet());
+        consumeMapper.insert(consume);
+
         // 添加充值记录
 //        RechargeRecord rechargeRecord = new RechargeRecord();
 //        rechargeRecord.setUserId(userId);