Merge branch 'develop'

kustomization/overlays/dev/kustomization.yaml

@@ -14,4 +14,4 @@ patches:
 images:
 - name: REGISTRY/NAMESPACE/IMAGE:TAG
   newName: mmc-registry.cn-shenzhen.cr.aliyuncs.com/sharefly-dev/oms
-  newTag: 763af0b2be2ed042524dc1890a96ec14cf8f4621
+  newTag: 8a35b3727088b77c7a5eb826d26367cc8d133558

src/main/java/com/mmc/oms/model/vo/demand/CommonPaymentVO.java

@@ -30,6 +30,4 @@ public class CommonPaymentVO {
     @ApiModelProperty(value = "金额：单位（分）")
     private Integer amount;
 
-    @ApiModelProperty(value = "聊天包类型id")
-    private Integer chatType;
 }

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

@@ -128,7 +128,7 @@ public class DemandReleaseOrderServiceImpl implements DemandReleaseOrderService
         orderRequestParamsVO.setAmount(commonPaymentVO.getAmount());
         orderRequestParamsVO.setAttach("CHAT_ORDER");
         orderRequestParamsVO.setOrderPort(commonPaymentVO.getOrderPort());
-        orderRequestParamsVO.setChatType(commonPaymentVO.getChatType());
+        orderRequestParamsVO.setChatType(commonPaymentVO.getAmount());
         orderRequestParamsVO.setDescription("聊天订单" + commonPaymentVO.getOrderNumber());
         ResultBody resultBody = releaseOrder(orderRequestParamsVO, token);
         return resultBody;