DemandRelease(update)

src/main/java/com/mmc/oms/common/ResultEnum.java

@@ -405,6 +405,7 @@ public enum ResultEnum implements BaseErrorInfoInterface {
     THERE_IS_NO_SUCH_ORDER("2017", "没有当前订单,请输入正确的订单编号"),
     THE_TOKEN_CANNOT_BE_NULL("2018", "token不能为null"),
     THE_CURRENT_ACCOUNT_CANNOT_PLACE_ORDERS("2019", "后台管理账号不能下单"),
+    NO_PAYMENT_REQUIRED("20021","自己发布的需求无需支付"),
     THIRD_PARTY_ERRORS("2020","第三方接口错误或者第三接口正在更新");
 
     /**

src/main/java/com/mmc/oms/service/demand/Impl/DemandReleaseOrderServiceImpl.java

@@ -48,7 +48,7 @@ public class DemandReleaseOrderServiceImpl implements DemandReleaseOrderService
     @Override
     public ResultBody orderPayment(CommonPaymentVO commonPaymentVO, HttpServletRequest request, Integer userAccountId) {
         String token = request.getHeader("token");
-        ResultBody resultBody=null;
+
         if ("3".equals(commonPaymentVO.getOrderPort().toString())){
             DemandReleaseOrderDO demandReleaseOrderDO = releaseOrderDao.orderPayment(commonPaymentVO.getOrderNumber());
             BigDecimal paramMoney = demandReleaseOrderDO.getParamMoney();
@@ -56,14 +56,13 @@ public class DemandReleaseOrderServiceImpl implements DemandReleaseOrderService
             int i = multiply.intValue();
             OrderRequestParamsVO orderRequestParamsVO = demandReleaseOrderDO.buildOrderRequestParamsVO();
             orderRequestParamsVO.setAmount(i);
-             resultBody = releaseOrder(orderRequestParamsVO, token);
-            if (!resultBody.getCode().equals("200")){
-             return  resultBody;
+            if (i!=0){
+              return releaseOrder(orderRequestParamsVO, token);
+            }else if(i==0){
+             return  ResultBody.error(ResultEnum.NO_PAYMENT_REQUIRED);
             }
         }
-
-
-        return resultBody;
+        return ResultBody.success();
     }
 
     public ResultBody releaseOrder(OrderRequestParamsVO orderRequestParamsVO, String token) {
@@ -76,7 +75,6 @@ public class DemandReleaseOrderServiceImpl implements DemandReleaseOrderService
         try {
             exchange = restTemplate.exchange(paymentUrl + "wechat/pay", HttpMethod.POST, entity, Object.class);
         map.put("Ok", exchange.getBody());
-
         } catch (RestClientException e) {
             return ResultBody.error(ResultEnum.THIRD_PARTY_ERRORS);
         }