Merge branch 'develop'

kustomization/overlays/dev/kustomization.yaml

@@ -18,4 +18,4 @@ patches:
 images:
 - name: REGISTRY/NAMESPACE/IMAGE:TAG
   newName: mmc-registry.cn-shenzhen.cr.aliyuncs.com/sharefly-dev/ims
-  newTag: 77b23eebda554fc3bb58b646ffd8774af8280172
+  newTag: 0d5d11331f20612aa466ac95e33d59a139c81fc9

release-service/src/main/java/com/mmc/csf/release/controller/RequirementsController.java

@@ -445,7 +445,7 @@ public class RequirementsController extends BaseController {
     public ResultBody adminAgreeOrder(HttpServletRequest request,
             @ApiParam(value = "派单id") @RequestParam Integer requireId,
             @ApiParam(value = "确认状态：1同意，2不同意") @RequestParam Integer status) {
-        return requirementsService.orderConfirmationByTeam(requireId,status,this.getUserLoginInfoFromRedis(request).getToken());
+        return requirementsService. orderConfirmationByTeam(requireId,status,this.getUserLoginInfoFromRedis(request).getToken());
     }
 }
 

release-service/src/main/java/com/mmc/csf/release/dao/DynamicDao.java

@@ -196,6 +196,7 @@ public interface DynamicDao {
 
     void insertforumFirstLevelReview(ForumFirstLevelReviewDO forumFirstLevelReviewDO);
 
+    ForumFirstLevelReviewDO selectForumFirstLevelReview(Integer id);
 
     void updateLikeCountAdd(Integer id);
 

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

@@ -12,6 +12,8 @@ import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 
 import com.mmc.csf.common.util.redis.RedisConstant;
+import com.mmc.csf.infomation.dto.UserBaseInfoDTO;
+import com.mmc.csf.release.util.SmsUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -275,6 +277,13 @@ public class DynamicServiceImpl implements DynamicService {
             dynamicDao.insertforumFirstLevelReview(forumFirstLevelReviewDO);
             // 修改评论数量
             dynamicDao.updateDynamicCommentCount(commentVO.getDynamicId(), forumDynamicDO.getVersion());
+            UserBaseInfoDTO user1 = userAppApi.feignGetUserBaseInfo(forumDynamicDO.getUserAccountId());
+            if(forumFirstLevelReviewDO.getReviewId() != 0){
+                ForumFirstLevelReviewDO forumFirstLevelReviewDO1 = dynamicDao.selectForumFirstLevelReview(forumFirstLevelReviewDO.getReviewId());
+                UserBaseInfoDTO user2 = userAppApi.feignGetUserBaseInfo(forumFirstLevelReviewDO1.getUserAccountId());
+                SmsUtil.sendCommentDynamic(user2.getPhoneNum());
+            }
+            SmsUtil.sendCommentDynamic(user1.getPhoneNum());
             return ResultBody.success();
         } else {
             return resultBody;

release-service/src/main/java/com/mmc/csf/release/util/SmsUtil.java

@@ -35,6 +35,8 @@ public class SmsUtil {
     private static String COOPERATION_TEMPLATE_PASS_CODE_10="SMS_464371178";
     private static String COOPERATION_TEMPLATE_PASS_CODE_11="SMS_464371179";
     private static String COOPERATION_TEMPLATE_PASS_CODE_12="SMS_464321248";
+    private static String COOPERATION_TEMPLATE_PASS_CODE_13="SMS_465375237";
+
     //短信验证码模板
     private static String VERIFYCODE="SMS_211825548";
 
@@ -82,6 +84,10 @@ public class SmsUtil {
         return send(CLOUD_JOIN_WEBSITE, COOPERATION_TEMPLATE_PASS_CODE_12, null, phone);
     }
 
+    //评论动态短信提醒
+    public static String sendCommentDynamic(String phone) {
+        return send(CLOUD_JOIN_WEBSITE, COOPERATION_TEMPLATE_PASS_CODE_12, null, phone);
+    }
     public static String send(String TemplateCode, String param, String phone) {
         return send(CLOUD_JOIN_WEBSITE, TemplateCode, param, phone);
     }

release-service/src/main/resources/mapper/forum/DynamicMapper.xml

@@ -415,8 +415,6 @@
         </if>
     </select>
     <select id="dynamicList" resultType="com.mmc.csf.release.entity.forum.ForumDynamicDO">
-
-
         WITH ranked_data AS (
         SELECT
         fd.id,
@@ -439,13 +437,13 @@
         AND fd.check_status = 1
         AND gambit_id NOT IN (1001,1002)
         <if test="id!=null" >
-            and id=#{id}
+            and fd.id=#{id}
         </if>
         <if test="userAccountIds!=null">
-            and user_account_id=#{userAccountIds}
+            and fd.user_account_id=#{userAccountIds}
         </if>
         <if test="description!=null and description!='' ">
-            and description like concat('%',#{description},'%')
+            and fd.description like concat('%',#{description},'%')
         </if>
         )
         SELECT *
@@ -608,4 +606,8 @@
         from forum_dynamic_gambit
         where gambit_id = #{gambitId}
     </select>
+    <select id="selectForumFirstLevelReview"
+            resultType="com.mmc.csf.release.entity.forum.ForumFirstLevelReviewDO">
+        select user_account_id,dynamic_id,content,review_id,pid from forum_review where id = #{id}
+    </select>
 </mapper>