Merge branch 'master' into develop

csf-common/csf-common-util/src/main/java/com/mmc/csf/common/util/redis/RedisConstant.java

@@ -110,6 +110,8 @@ public class RedisConstant {
     public final static String UAV_DUMMY_DATA="UAV_DUMMY_DATA_KEY";
 
     public final static String VOTE = "VOTE";
+// 点赞
+    public static final String USER_LIKE_DYNAMIC = "user_like_dynamic";
     /**
      * tagInfoAllot表的缓存key
      */

kustomization/overlays/prod/kustomization.yaml

@@ -18,4 +18,4 @@ patches:
 images:
 - name: REGISTRY/NAMESPACE/IMAGE:TAG
   newName: mmc-registry.cn-shenzhen.cr.aliyuncs.com/sharefly/ims
-  newTag: 7064818a4b785409a691208dac214465b161e849
+  newTag: fb68823598f8c074562d994f1835290fcebd7040

release-service/src/main/java/com/mmc/csf/release/service/impl/DynamicServiceImpl.java

@@ -205,8 +205,12 @@ public class DynamicServiceImpl implements DynamicService {
             likeDAO.insertLike(userId, dynamicId);
             dynamicDao.updateDynamicLikeCount(dynamicId, forumDynamicDO.getVersion());
             dynamicDao.forumCount(forumDynamicDO.getUserAccountId());
-
+            String s = stringRedisTemplate.opsForValue().get(RedisConstant.USER_LIKE_DYNAMIC + dynamicId + ":" + userId);
+            if (s == null) {
+                stringRedisTemplate.opsForValue().set(RedisConstant.USER_LIKE_DYNAMIC + dynamicId + ":" + userId, "1");
                 userAppApi.changeUserPoints(request.getHeader(TokenConstant.TOKEN),request, 4);
+            }
+
         } else {
             likeDAO.deleteLike(userId, dynamicId);
             dynamicDao.updateSubDynamicLikeCount(dynamicId, forumDynamicDO.getVersion());

release-service/src/main/resources/mapper/requirements/BackRequirementsDao.xml

@@ -85,9 +85,9 @@
                 and (
                 <choose>
                     <when test="isPilotOrder == 0">
---                     当时发单的时候要是看到的是总订单
-                        ri.father_require_id = 0
-                        and ri.user_account_id IN
+-- --                     当时发单的时候要是看到的是总订单
+--                         ri.father_require_id = 0
+                        ri.user_account_id IN
                     </when>
                     <when test="isPilotOrder == 1">
 --                     接单接的是子订单就只能看到子订单
@@ -99,10 +99,10 @@
                 </foreach>
                 )
             </when>
-            <otherwise>
-                <!-- 剩下就是admin用户就是要查出所用接单发单就行 只要主订单-->
-                and ri.father_require_id = 0
-            </otherwise>
+<!--            <otherwise>-->
+<!--                &lt;!&ndash; 剩下就是admin用户就是要查出所用接单发单就行 只要主订单&ndash;&gt;-->
+<!--                and ri.father_require_id = 0-->
+<!--            </otherwise>-->
         </choose>
           <if test="orderStatus != null and orderStatus!='' ">
             and sf.order_status = #{orderStatus}
@@ -139,9 +139,9 @@
                 and (
                 <choose>
                     <when test="isPilotOrder == 0">
-                        --                     当时发单的时候要是看到的是总订单
-                        ri.father_require_id = 0
-                        and ri.user_account_id IN
+--                         --                     当时发单的时候要是看到的是总订单
+--                         ri.father_require_id = 0
+                        ri.user_account_id IN
                     </when>
                     <when test="isPilotOrder == 1">
                         --                     接单接的是子订单就只能看到子订单
@@ -153,10 +153,10 @@
                 </foreach>
                 )
             </when>
-            <otherwise>
-                <!-- 剩下就是admin用户就是要查出所用接单发单就行 只要主订单-->
-                and ri.father_require_id = 0
-            </otherwise>
+<!--            <otherwise>-->
+<!--                &lt;!&ndash; 剩下就是admin用户就是要查出所用接单发单就行 只要主订单&ndash;&gt;-->
+<!--                and ri.father_require_id = 0-->
+<!--            </otherwise>-->
         </choose>
         <if test="orderStatus != null and orderStatus!='' ">
             and sf.order_status = #{orderStatus}