Merge branch 'develop' of ssh://git.mmcuav.cn:8222/iuav/ims into 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: 9662a16b5e00c37e8ad531069afff3dcc58668b2
+  newTag: 738ea64e6923d76225a4316cbf26cea6fe56c94a

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

@@ -105,7 +105,7 @@ public interface RequirementsDao {
      * @return {@link RequirementsInfoDO}
      */
     RequirementsInfoDO selectDetailRefusePilotInfo(Integer id);
-    void addPublishService(ServiceRequirementsDO requirementsInfoDO);
+    int addPublishService(ServiceRequirementsDO requirementsInfoDO);
 
 
     void addPublishServiceSon(ServiceRequirementsSonDO serviceRequirementsSonDO);

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

@@ -220,7 +220,7 @@ public class BackstageForumServiceImpl implements BackstageForumService {
             userAppApi.changeUserPoint(changePoint, token);
             // 微信公众号发送通知
             WxMsgVO ws = new WxMsgVO();
-            ws.setDataObject(spellMsg("帖子审核","审核通过"));
+            ws.setDataObject(spellMsg("发布帖子","审核通过"));
             ws.setUserAccountId(dynamicDO.getUserAccountId());
             ws.setTemplateId("9qvgBhfW9yoQJY91iMfhrog8y5eZUPSbo9PLvQzS_vk");
             userAppApi.feignSendWxMsg(token, ws);

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

@@ -2335,7 +2335,7 @@ public class RequirementsServiceImpl implements RequirementsService {
                 flyerCancel(wo, request.getHeader("token"));
             }
 
-            return ResultBody.success();
+            return ResultBody.success(requirementsEditVO.getRequirementsInfoId());
         } else {
             //云享金和佣金扣除完成，但是还不足支付订单金额，并且没有选择微信支付，所以支付不合法
             return ResultBody.success("下单失败");
@@ -2822,6 +2822,7 @@ public class RequirementsServiceImpl implements RequirementsService {
             // sum是1说明订单只需一个人 sum>1 说明是多人需要创建子订单
             requirementsInfoDO.setRepertory(requirementsInfoDO.getRequireNum());
             requirementsDao.addPublishService(requirementsInfoDO);
+            int orderId = requirementsInfoDO.getId();
             RequirementsAmountDO requirementsAmountDO = new RequirementsAmountDO(requirementsInfoDO);
             requirementsDao.addAmount(requirementsAmountDO);
             if (sum == 1) {
@@ -2858,7 +2859,7 @@ public class RequirementsServiceImpl implements RequirementsService {
                     || requirementsAmountDO.getLevelSalaryAmount().compareTo(BigDecimal.ZERO) != 0) {
                 feignWalletFlow(publisherWalletFlowVO, request.getHeader("token"));
             }
-            return ResultBody.success();
+            return ResultBody.success(orderId);
         } else {
             //云享金和佣金扣除完成，但是还不足支付订单金额，并且没有选择微信支付，所以支付不合法
             return ResultBody.success("下单失败");