Merge branch 'develop'

csf-common/csf-common-util/src/main/java/com/mmc/csf/common/util/web/ResultEnum.java

@@ -418,7 +418,9 @@ public enum ResultEnum implements BaseErrorInfoInterface {
     YOU_CANNOT_CANCEL_THE_ORDER_AT_THIS_TIME("70000", "当前不能取消订单流程"),
     PAYMENT_SUCCESS("70001", "你支付的保证金全额扣除成功"),
     THE_AMOUNT_OF_THE_MISSION_WILL_BE_RETURNED("70002", "任务佣金原路退回成功"),
-    REFUND_PERCENTAGE("7003", "任务佣金百分之七十原路退回成功");
+    REFUND_PERCENTAGE("7003", "任务佣金百分之七十原路退回成功"),
+
+    ORDER_AMOUNT_ERROR("8001", "发布需求订单金额不能低于100");
 
     /**
      * 错误码

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: b66a192b6f14830f98a864d16fb88080728546cb
+  newTag: fbbe8e2ca2c2b7564b2f2e5521885f82ce39ed40

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

@@ -86,6 +86,9 @@ public class DynamicServiceImpl implements DynamicService {
         log.info("用户：{}发布动态:{}",userAccountId, dynamicVO);
         // 获取用户openid
         UserAccountSimpleDTO userAccountSimpleDTO = userAppApi.feignGetUserSimpleInfo(userAccountId, request.getHeader(TokenConstant.TOKEN));
+        if(userAccountSimpleDTO.getPhoneNum()==null || "".equals(userAccountSimpleDTO.getPhoneNum())){
+            return ResultBody.error("请先绑定手机号");
+        }
         // 插入动态基本信息
         ForumDynamicDO forumDynamicDO = new ForumDynamicDO(dynamicVO);
         forumDynamicDO.setRootPath(null);

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

@@ -2550,6 +2550,12 @@ public class RequirementsServiceImpl implements RequirementsService {
     @Override
     public ResultBody publishService(ServiceRequirementsVO serviceRequirementsVO, HttpServletRequest request) {
 
+        BigDecimal amount = serviceRequirementsVO.getOrderAmount();
+        int result = amount.compareTo(new BigDecimal("100"));
+        if(result<0){
+            return ResultBody.error(ResultEnum.ORDER_AMOUNT_ERROR);
+        }
+
         //这个是几个人的订单
         Integer sum = serviceRequirementsVO.getRequireNum();
         //获取用户基本信息