点赞评论数返回

vehicle-client/pom.xml

@@ -17,6 +17,7 @@
 
     <properties>
         <user-client.version>1.0.0-SNAPSHOT</user-client.version>
+        <framework-wechat.version>1.0.0-RELEASE</framework-wechat.version>
     </properties>
 
     <dependencies>
@@ -30,5 +31,10 @@
             <artifactId>mybatis-plus-annotation</artifactId>
             <version>3.4.2</version>
         </dependency>
+        <dependency>
+            <groupId>com.chelvc.framework</groupId>
+            <artifactId>framework-wechat</artifactId>
+            <version>${framework-wechat.version}</version>
+        </dependency>
     </dependencies>
-</project>
+</project>

vehicle-client/src/main/java/com/chelvc/cloud/vehicle/client/DynamicCommentClient.java

@@ -41,7 +41,7 @@ public interface DynamicCommentClient {
      * 修改动态评论
      */
     @PostMapping("/dynamicComment/insertByBo")
-    void insertByBo(@RequestBody AddDynamicCommentParam param, @RequestParam("userId") Long userId);
+    Long insertByBo(@RequestBody AddDynamicCommentParam param, @RequestParam("userId") Long userId);
 
     /**
      * 给评论添加点赞/踩

vehicle-client/src/main/java/com/chelvc/cloud/vehicle/client/DynamicContentClient.java

@@ -1,7 +1,5 @@
 package com.chelvc.cloud.vehicle.client;
 
-import java.util.Map;
-
 import com.chelvc.cloud.vehicle.client.constant.ExamineType;
 import com.chelvc.cloud.vehicle.client.dto.DynamicContentDTO;
 import com.chelvc.cloud.vehicle.client.param.AddDynamicContentParam;
@@ -10,11 +8,9 @@ import com.chelvc.cloud.vehicle.client.param.QueryDynamicContentParam;
 import com.chelvc.framework.common.model.Pagination;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.cloud.openfeign.SpringQueryMap;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Map;
 
 /**
  * 动态信息Service接口
@@ -59,7 +55,7 @@ public interface DynamicContentClient {
      * 修改动态信息
      */
     @PostMapping("/dynamicContent/insertByBo")
-    void insertByBo(@RequestBody AddDynamicContentParam dto, @RequestParam("userId") Long userId);
+    Long insertByBo(@RequestBody AddDynamicContentParam dto, @RequestParam("userId") Long userId);
 
     /**
      * 校验并批量删除动态信息信息

vehicle-client/src/main/java/com/chelvc/cloud/vehicle/client/DynamicEvaluateRecordClient.java

@@ -21,7 +21,7 @@ public interface DynamicEvaluateRecordClient {
      * 修改内容评价(点赞/踩)列
      */
     @PostMapping("/dynamicEvaluateRecord/updateRecord")
-    Boolean updateRecord(@RequestBody AddDynamicEvaluateRecordParam param, @RequestParam("userId") Long userId);
+    Long updateRecord(@RequestBody AddDynamicEvaluateRecordParam param, @RequestParam("userId") Long userId);
 
     @GetMapping("/dynamicEvaluateRecord/queryOperaterType")
     DynamicEvaluateRecordDTO queryOperaterType(@RequestParam("id") Long id, @RequestParam("userId") Long userId,

vehicle-client/src/main/java/com/chelvc/cloud/vehicle/client/OmsOrderClient.java

@@ -1,20 +1,17 @@
 package com.chelvc.cloud.vehicle.client;
 
-import java.util.Map;
-
 import com.chelvc.cloud.vehicle.client.dto.ConfirmOrderResultDTO;
 import com.chelvc.cloud.vehicle.client.dto.OmsOrderDTO;
 import com.chelvc.cloud.vehicle.client.dto.OmsOrderDetailDTO;
 import com.chelvc.cloud.vehicle.client.param.OmsOrderModifyParam;
 import com.chelvc.cloud.vehicle.client.param.OrderPagingParam;
 import com.chelvc.framework.common.model.Pagination;
+import com.chelvc.framework.wechat.WechatUnifiedOrder;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.cloud.openfeign.SpringQueryMap;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Map;
 
 /**
  * 订单Service接口
@@ -37,7 +34,7 @@ public interface OmsOrderClient {
      * 根据提交信息生成订单
      */
     @PostMapping("/omsOrder/generateOrder")
-    Map<String, Object> generateOrder(@RequestBody OmsOrderModifyParam orderParam);
+    WechatUnifiedOrder generateOrder(@RequestBody OmsOrderModifyParam orderParam);
 
     /**
      * 支付成功后的回调

vehicle-server/src/main/java/com/chelvc/cloud/vehicle/server/controller/DynamicCommentController.java

@@ -50,8 +50,8 @@ public class DynamicCommentController {
      * 修改动态评论
      */
     @PostMapping("/dynamicComment/insertByBo")
-    public void insertByBo(@RequestBody AddDynamicCommentParam param, @RequestParam("userId") Long userId) {
-        dynamicCommentService.insertByBo(param, userId);
+    public Long insertByBo(@RequestBody AddDynamicCommentParam param, @RequestParam("userId") Long userId) {
+        return dynamicCommentService.insertByBo(param, userId);
     }
 
     /**
@@ -61,9 +61,9 @@ public class DynamicCommentController {
      * @param contentId
      */
     @PostMapping("/dynamicComment/addNum")
-    public void addNum(@RequestParam("dynamicStatus") Integer dynamicStatus,
+    public Long addNum(@RequestParam("dynamicStatus") Integer dynamicStatus,
                        @RequestParam("contentId") Long contentId) {
-        dynamicCommentService.addNum(dynamicStatus, contentId);
+        return dynamicCommentService.addNum(dynamicStatus, contentId);
     }
 
     /**
@@ -73,9 +73,9 @@ public class DynamicCommentController {
      * @param contentId
      */
     @PostMapping("/dynamicComment/reduceNum")
-    public void reduceNum(@RequestParam("dynamicStatus") Integer dynamicStatus,
+    public Long reduceNum(@RequestParam("dynamicStatus") Integer dynamicStatus,
                           @RequestParam("contentId") Long contentId) {
-        dynamicCommentService.reduceNum(dynamicStatus, contentId);
+        return dynamicCommentService.reduceNum(dynamicStatus, contentId);
     }
 
     /**

vehicle-server/src/main/java/com/chelvc/cloud/vehicle/server/controller/DynamicContentController.java

@@ -1,7 +1,5 @@
 package com.chelvc.cloud.vehicle.server.controller;
 
-import java.util.Map;
-
 import com.chelvc.cloud.vehicle.client.constant.ExamineType;
 import com.chelvc.cloud.vehicle.client.dto.DynamicContentDTO;
 import com.chelvc.cloud.vehicle.client.param.AddDynamicContentParam;
@@ -12,12 +10,9 @@ import com.chelvc.framework.common.model.Pagination;
 import lombok.RequiredArgsConstructor;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.cloud.openfeign.SpringQueryMap;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Map;
 
 /**
  * 动态信息Service接口
@@ -91,8 +86,8 @@ public class DynamicContentController {
      * @param dynamicId
      */
     @PostMapping("/dynamicContent/addComment")
-    public void addComment(@RequestParam("dynamicId") Long dynamicId) {
-        dynamicContentService.addComment(dynamicId);
+    public Long addComment(@RequestParam("dynamicId") Long dynamicId) {
+        return dynamicContentService.addComment(dynamicId);
     }
 
     /**
@@ -101,8 +96,8 @@ public class DynamicContentController {
      * @param dynamicId
      */
     @PostMapping("/dynamicContent/reduceComment")
-    public void reduceComment(@RequestParam("dynamicId") Long dynamicId, @RequestParam("num") int num) {
-        dynamicContentService.reduceComment(dynamicId, num);
+    public Long reduceComment(@RequestParam("dynamicId") Long dynamicId, @RequestParam("num") int num) {
+        return dynamicContentService.reduceComment(dynamicId, num);
     }
 
     /**
@@ -112,9 +107,9 @@ public class DynamicContentController {
      * @param contentId
      */
     @PostMapping("/dynamicContent/addNum")
-    public void addNum(@RequestParam("dynamicStatus") Integer dynamicStatus,
+    public Long addNum(@RequestParam("dynamicStatus") Integer dynamicStatus,
                        @RequestParam("contentId") Long contentId) {
-        dynamicContentService.addNum(dynamicStatus, contentId);
+        return dynamicContentService.addNum(dynamicStatus, contentId);
     }
 
     /**
@@ -124,9 +119,9 @@ public class DynamicContentController {
      * @param contentId
      */
     @PostMapping("/dynamicContent/reduceNum")
-    public void reduceNum(@RequestParam("dynamicStatus") Integer dynamicStatus,
+    public Long reduceNum(@RequestParam("dynamicStatus") Integer dynamicStatus,
                           @RequestParam("contentId") Long contentId) {
-        dynamicContentService.reduceNum(dynamicStatus, contentId);
+        return dynamicContentService.reduceNum(dynamicStatus, contentId);
     }
 
     /**

vehicle-server/src/main/java/com/chelvc/cloud/vehicle/server/controller/DynamicEvaluateRecordController.java

@@ -27,7 +27,7 @@ public class DynamicEvaluateRecordController {
      * 修改内容评价(点赞/踩)列
      */
     @PostMapping("/dynamicEvaluateRecord/updateRecord")
-    public Boolean updateRecord(@RequestBody AddDynamicEvaluateRecordParam param, @RequestParam("userId") Long userId) {
+    public Long updateRecord(@RequestBody AddDynamicEvaluateRecordParam param, @RequestParam("userId") Long userId) {
         return dynamicEvaluateRecordService.updateRecord(param, userId);
     }
 

vehicle-server/src/main/java/com/chelvc/cloud/vehicle/server/controller/OmsOrderController.java

@@ -9,6 +9,7 @@ import com.chelvc.cloud.vehicle.client.param.OmsOrderModifyParam;
 import com.chelvc.cloud.vehicle.client.param.OrderPagingParam;
 import com.chelvc.cloud.vehicle.server.service.OmsOrderService;
 import com.chelvc.framework.common.model.Pagination;
+import com.chelvc.framework.wechat.WechatUnifiedOrder;
 import lombok.RequiredArgsConstructor;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.DeleteMapping;
@@ -43,7 +44,7 @@ public class OmsOrderController {
      * 根据提交信息生成订单
      */
     @PostMapping("/omsOrder/generateOrder")
-    public Map<String, Object> generateOrder(@RequestBody OmsOrderModifyParam orderParam) {
+    public WechatUnifiedOrder generateOrder(@RequestBody OmsOrderModifyParam orderParam) {
         return omsOrderService.generateOrder(orderParam);
     }
 

vehicle-server/src/main/java/com/chelvc/cloud/vehicle/server/dao/DynamicCommentMapper.java

@@ -10,6 +10,7 @@ import com.chelvc.cloud.vehicle.client.dto.EvaluateDTO;
 import com.chelvc.cloud.vehicle.server.entity.DynamicComment;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
 import org.apache.ibatis.annotations.Update;
 import org.springframework.stereotype.Repository;
 
@@ -50,4 +51,10 @@ public interface DynamicCommentMapper extends BaseMapper<DynamicComment> {
     Long selectTotalByUserId(@Param("userId") Long userId);
 
     List<EvaluateDTO> selectEvaluateListByUserId(@Param("userId")Long userId, @Param("number")int number, @Param("size")int size);
+
+    @Select("select bad_num from dynamic_comment where id = #{contentId}")
+    Long queryBadNum(Long contentId);
+
+    @Select("select good_num from dynamic_comment where id = #{contentId}")
+    Long queryGoodNum(Long contentId);
 }

vehicle-server/src/main/java/com/chelvc/cloud/vehicle/server/dao/DynamicContentMapper.java

@@ -9,6 +9,7 @@ import com.chelvc.cloud.vehicle.client.dto.DynamicContentDTO;
 import com.chelvc.cloud.vehicle.server.entity.DynamicContent;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
 import org.apache.ibatis.annotations.Update;
 import org.springframework.stereotype.Repository;
 
@@ -58,4 +59,12 @@ public interface DynamicContentMapper extends BaseMapper<DynamicContent> {
 
   IPage<DynamicContentDTO> queryRandom(@Param("page") Page<DynamicContentDTO> page, @Param(Constants.WRAPPER) QueryWrapper<DynamicContent> queryWrapper);
 
+  @Select("select good_num from dynamic_content where id = #{contentId}")
+  Long queryGoodNum(Long contentId);
+
+  @Select("select bad_num from dynamic_content where id = #{contentId}")
+  Long queryBadNum(Long contentId);
+
+  @Select("select comment_num from dynamic_content where id = #{dynamicId}")
+  Long queryCommentNum(Long dynamicId);
 }

vehicle-server/src/main/java/com/chelvc/cloud/vehicle/server/service/DynamicCommentService.java

@@ -26,21 +26,21 @@ public interface DynamicCommentService {
     /**
      * 修改动态评论
      */
-    void insertByBo(AddDynamicCommentParam param, Long userId);
+    Long insertByBo(AddDynamicCommentParam param, Long userId);
 
     /**
      * 给评论添加点赞/踩
      * @param dynamicStatus
      * @param contentId
      */
-    void addNum(Integer dynamicStatus, Long contentId);
+    Long addNum(Integer dynamicStatus, Long contentId);
 
     /**
      * 取消评论点赞/踩
      * @param dynamicStatus
      * @param contentId
      */
-    void reduceNum(Integer dynamicStatus, Long contentId);
+    Long reduceNum(Integer dynamicStatus, Long contentId);
 
     /**
      * 评论手动审核

vehicle-server/src/main/java/com/chelvc/cloud/vehicle/server/service/DynamicContentService.java

@@ -48,14 +48,14 @@ public interface DynamicContentService {
    *
    * @param dynamicId
    */
-  void addComment(Long dynamicId);
+  Long addComment(Long dynamicId);
 
   /**
    * 减少评论数
    *
    * @param dynamicId
    */
-  void reduceComment(Long dynamicId, int num);
+  Long reduceComment(Long dynamicId, int num);
 
   /**
    * 给评论添加点赞/踩
@@ -63,7 +63,7 @@ public interface DynamicContentService {
    * @param dynamicStatus
    * @param contentId
    */
-  void addNum(Integer dynamicStatus, Long contentId);
+  Long addNum(Integer dynamicStatus, Long contentId);
 
   /**
    * 取消评论点赞/踩
@@ -71,7 +71,7 @@ public interface DynamicContentService {
    * @param dynamicStatus
    * @param contentId
    */
-  void reduceNum(Integer dynamicStatus, Long contentId);
+  Long reduceNum(Integer dynamicStatus, Long contentId);
 
   /**
    * 屏蔽/恢复某条动态信息

vehicle-server/src/main/java/com/chelvc/cloud/vehicle/server/service/DynamicEvaluateRecordService.java

@@ -31,5 +31,5 @@ public interface DynamicEvaluateRecordService {
     /**
      * 修改内容评价(点赞/踩)列
      */
-    Boolean updateRecord(AddDynamicEvaluateRecordParam param, Long userId);
+    Long updateRecord(AddDynamicEvaluateRecordParam param, Long userId);
 }

vehicle-server/src/main/java/com/chelvc/cloud/vehicle/server/service/OmsOrderService.java

@@ -6,6 +6,7 @@ import com.chelvc.cloud.vehicle.client.param.OmsOrderModifyParam;
 import com.chelvc.cloud.vehicle.client.param.OrderPagingParam;
 import com.chelvc.cloud.vehicle.server.entity.OmsOrder;
 import com.chelvc.framework.common.model.Pagination;
+import com.chelvc.framework.wechat.WechatUnifiedOrder;
 
 import java.math.BigDecimal;
 import java.util.Map;
@@ -34,7 +35,7 @@ public interface OmsOrderService extends IService<OmsOrder>
     /**
      * 根据提交信息生成订单
      */
-    Map<String, Object> generateOrder(OmsOrderModifyParam orderParam);
+    WechatUnifiedOrder generateOrder(OmsOrderModifyParam orderParam);
 
     /**
      * 支付成功后的回调

vehicle-server/src/main/java/com/chelvc/cloud/vehicle/server/service/impl/DynamicCommentServiceImpl.java

@@ -159,7 +159,7 @@ public class DynamicCommentServiceImpl implements DynamicCommentService {
      * 新增动态评论
      */
     @Override
-    public void insertByBo(AddDynamicCommentParam param, Long userId) {
+    public Long insertByBo(AddDynamicCommentParam param, Long userId) {
         DynamicComment add = ObjectUtils.copying(param, DynamicComment.class);
         add.setUserId(userId);
         add.setCreateTime(new Date());
@@ -172,7 +172,7 @@ public class DynamicCommentServiceImpl implements DynamicCommentService {
         //contentAuditHelper.asyncCommentHandle(add);
         //暂时不审核
         addParentComment(param.getParentId());
-        dynamicContentService.addComment(param.getDynamicId());
+        return dynamicContentService.addComment(param.getDynamicId());
     }
 
     private void addParentComment(Long parentId) {
@@ -192,34 +192,40 @@ public class DynamicCommentServiceImpl implements DynamicCommentService {
 
     @Override
     @Lock4j(keys = {"#contentId"})
-    public void addNum(Integer dynamicStatus, Long contentId) {
+    public Long addNum(Integer dynamicStatus, Long contentId) {
         if (Objects.equals(DynamicStatusType.GOOD.getValue(), dynamicStatus)) {
             int i = baseMapper.addGoodNum(contentId);
             if (i != 1) {
                 throw new ResourceUnavailableException("点赞失败");
             }
+            return baseMapper.queryGoodNum(contentId);
         } else if (Objects.equals(DynamicStatusType.BAD.getValue(), dynamicStatus)) {
             int i = baseMapper.addBadNum(contentId);
             if (i != 1) {
                 throw new ResourceUnavailableException("D踩一踩失败");
             }
+            return baseMapper.queryBadNum(contentId);
         }
+        return 0L;
     }
 
     @Override
     @Lock4j(keys = {"#contentId"})
-    public void reduceNum(Integer dynamicStatus, Long contentId) {
+    public Long reduceNum(Integer dynamicStatus, Long contentId) {
         if (Objects.equals(DynamicStatusType.GOOD.getValue(), dynamicStatus)) {
             int i = baseMapper.reduceGoodNum(contentId);
             if (i != 1) {
                 throw new ResourceUnavailableException("取消点赞失败");
             }
+            return baseMapper.queryGoodNum(contentId);
         } else if (Objects.equals(DynamicStatusType.BAD.getValue(), dynamicStatus)) {
             int i = baseMapper.reduceBadNum(contentId);
             if (i != 1) {
                 throw new ResourceUnavailableException("取消踩一踩失败");
             }
+            return baseMapper.queryGoodNum(contentId);
         }
+        return 0L;
     }
 
     @Override

vehicle-server/src/main/java/com/chelvc/cloud/vehicle/server/service/impl/DynamicContentServiceImpl.java

@@ -323,49 +323,57 @@ public class DynamicContentServiceImpl implements DynamicContentService{
   }
 
   @Override
-  public void addComment(Long dynamicId) {
+  public Long addComment(Long dynamicId) {
     int i = baseMapper.addComment(dynamicId);
     if (i != 1) {
       throw new ResourceUnavailableException("新增评论数失败");
     }
+    return baseMapper.queryCommentNum(dynamicId);
   }
 
   @Override
-  public void reduceComment(Long dynamicId, int num) {
+  public Long reduceComment(Long dynamicId, int num) {
     int i = baseMapper.reduceComment(dynamicId, num);
     if (i != 1) {
       throw new ResourceUnavailableException("删除评论数失败");
     }
+    return baseMapper.queryCommentNum(dynamicId);
   }
 
   @Override
-  public void addNum(Integer dynamicStatus, Long contentId) {
+  public Long addNum(Integer dynamicStatus, Long contentId) {
     if (Objects.equals(DynamicStatusType.GOOD.getValue(), dynamicStatus)) {
       int i = baseMapper.addGoodNum(contentId);
       if(i != 1){
         throw new ResourceUnavailableException("点赞失败");
       }
+      return baseMapper.queryGoodNum(contentId);
     } else if (Objects.equals(DynamicStatusType.BAD.getValue(), dynamicStatus)) {
       int i = baseMapper.addBadNum(contentId);
       if(i != 1){
         throw new ResourceUnavailableException("踩一踩失败");
       }
+      return baseMapper.queryBadNum(contentId);
     }
+    return 0L;
   }
 
   @Override
-  public void reduceNum(Integer dynamicStatus, Long contentId) {
+  public Long reduceNum(Integer dynamicStatus, Long contentId) {
     if (Objects.equals(DynamicStatusType.GOOD.getValue(), dynamicStatus)) {
       int i = baseMapper.reduceGoodNum(contentId);
       if(i != 1){
         throw new ResourceUnavailableException("取消点赞失败");
       }
+      return baseMapper.queryGoodNum(contentId);
     } else if (Objects.equals(DynamicStatusType.BAD.getValue(), dynamicStatus)) {
       int i = baseMapper.reduceBadNum(contentId);
       if(i != 1){
         throw new ResourceUnavailableException("取消踩一踩失败");
       }
+      return baseMapper.queryBadNum(contentId);
     }
+    return 0L;
   }
 
   @Override

vehicle-server/src/main/java/com/chelvc/cloud/vehicle/server/service/impl/DynamicEvaluateRecordServiceImpl.java

@@ -14,7 +14,6 @@ import com.chelvc.cloud.vehicle.server.service.DynamicCommentService;
 import com.chelvc.cloud.vehicle.server.service.DynamicContentService;
 import com.chelvc.cloud.vehicle.server.service.DynamicEvaluateRecordService;
 import com.chelvc.framework.common.exception.ResourceUnavailableException;
-import com.chelvc.framework.common.function.Executor;
 import com.chelvc.framework.common.util.ObjectUtils;
 import com.chelvc.framework.database.context.DatabaseContextHolder;
 import lombok.RequiredArgsConstructor;
@@ -26,6 +25,7 @@ import org.springframework.stereotype.Service;
 import java.util.Date;
 import java.util.List;
 import java.util.Objects;
+import java.util.function.Supplier;
 
 /**
  * @PACKAGE_NAME: net.yeeu.collision.dynamic.service.impl
@@ -54,33 +54,35 @@ public class DynamicEvaluateRecordServiceImpl extends ServiceImpl<DynamicEvaluat
      * 新增内容评价(点赞/踩)列
      */
     @Override
-    public Boolean updateRecord(AddDynamicEvaluateRecordParam param, Long userId) {
+    public Long updateRecord(AddDynamicEvaluateRecordParam param, Long userId) {
         Integer actionType = param.getActionType().getValue();
         Integer recordType = param.getRecordType().getValue();
         Integer dynamicStatusType = param.getDynamicStatusType().getValue();
         LambdaQueryWrapper<DynamicEvaluateRecord> lqw =
                 buildAddWrapper(param.getContentId(), userId);
-        DatabaseContextHolder.transactional((Executor) () -> {
+        DatabaseContextHolder.transactional((Supplier<Long>) () -> {
+            Long num = 0L;
             if (Objects.equals(ActionType.ADD.getValue(), actionType)) {
                 //判断该用户是否有点赞/踩记录，点击新增记录，取消删除记录
                 executeWrapper(lqw, param, true, userId);
                 if (Objects.equals(RecordType.COMMENT.getValue(), recordType)) {
-                    iDynamicCommentService.addNum(dynamicStatusType, param.getContentId());
+                    num = iDynamicCommentService.addNum(dynamicStatusType, param.getContentId());
                 } else if (Objects.equals(RecordType.DYNAMIC.getValue(), recordType)) {
-                    iDynamicContentService.addNum(dynamicStatusType, param.getContentId());
+                    num = iDynamicContentService.addNum(dynamicStatusType, param.getContentId());
                 }
             } else if (Objects.equals(ActionType.CANCEL.getValue(), actionType)) {
                 lqw.eq(DynamicEvaluateRecord::getOperaterType, dynamicStatusType);
                 //判断该用户是否有点赞/踩记录，点击新增记录，取消删除记录
                 executeWrapper(lqw, param, false, userId);
                 if (Objects.equals(RecordType.COMMENT.getValue(), recordType)) {
-                    iDynamicCommentService.reduceNum(dynamicStatusType, param.getContentId());
+                    num = iDynamicCommentService.reduceNum(dynamicStatusType, param.getContentId());
                 } else if (Objects.equals(RecordType.DYNAMIC.getValue(), recordType)) {
-                    iDynamicContentService.reduceNum(dynamicStatusType, param.getContentId());
+                    num = iDynamicContentService.reduceNum(dynamicStatusType, param.getContentId());
                 }
             }
+            return num;
         });
-        return true;
+        return 0L;
     }
 
     @Override

vehicle-server/src/main/java/com/chelvc/cloud/vehicle/server/service/impl/OmsOrderServiceImpl.java

@@ -118,7 +118,7 @@ public class OmsOrderServiceImpl extends ServiceImpl<OmsOrderMapper, OmsOrder> i
     }
 
     @Override
-    public Map<String, Object> generateOrder(OmsOrderModifyParam orderParam) {
+    public WechatUnifiedOrder generateOrder(OmsOrderModifyParam orderParam) {
         List<OmsOrderItem> orderItemList = new ArrayList<>();
         //获取购物车及优惠信息
         Long userId = SessionContextHolder.getId();
@@ -301,17 +301,7 @@ public class OmsOrderServiceImpl extends ServiceImpl<OmsOrderMapper, OmsOrder> i
         }
         request.setOpenid(openid);
         //WechatPaymentHandler wechatPaymentHandler = applicationContext.getBean(WechatPaymentHandler.class);
-        WechatUnifiedOrder wechatUnifiedOrder = this.wechatPaymentHandler.unifiedorder("applet", request);
-        Map<String, Object> result = new HashMap<>();
-        result.put("mode", wechatUnifiedOrder.getMode().name());
-        result.put("appid", wechatUnifiedOrder.getAppid());
-        result.put("sign", wechatUnifiedOrder.getSign());
-        result.put("timeStamp", wechatUnifiedOrder.getTimestamp());
-        result.put("nonce", wechatUnifiedOrder.getNonce());
-        result.put("prepayid", wechatUnifiedOrder.getPrepayid());
-        result.put("signType", wechatUnifiedOrder.getAlgorithm());
-        result.put("pack", wechatUnifiedOrder.getPack());
-        return result;
+        return this.wechatPaymentHandler.unifiedorder("applet", request);
     }
 
     @Override