fix

 package com.yohoufo.dal.order.model;
 package com.yohoufo.dal.order.model;
 
 
-<<<<<<< HEAD
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-import java.math.BigDecimal;
-@Data
-@Builder
-@AllArgsConstructor
-@NoArgsConstructor
-=======
 import lombok.*;
 import lombok.*;
 
 
 import java.math.BigDecimal;
 import java.math.BigDecimal;
 
 
+
 @ToString
 @ToString
 @Builder
 @Builder
 @NoArgsConstructor
 @NoArgsConstructor
 @AllArgsConstructor
 @AllArgsConstructor
 @Data
 @Data
->>>>>>> 29a6b426327bd250bc44215372289fe1e345c46e
 public class DepositOrder {
 public class DepositOrder {
     private Integer id;
     private Integer id;
 
 
@@ -31,11 +19,7 @@ public class DepositOrder {
 
 
     private String depositCode;
     private String depositCode;
 
 
-<<<<<<< HEAD
     private BigDecimal amount;
     private BigDecimal amount;
-=======
-    private BigDecimal amount;   // 总费用
->>>>>>> 29a6b426327bd250bc44215372289fe1e345c46e
 
 
     private Integer payment;
     private Integer payment;
 
 
@@ -49,13 +33,9 @@ public class DepositOrder {
 
 
     private Integer updateTime;
     private Integer updateTime;
 
 
-<<<<<<< HEAD
-
-=======
-    private BigDecimal contractFee;  //违约费用
+    private BigDecimal contractFee;
 
 
-    private BigDecimal shipFee;  //运费
+    private BigDecimal shipFee;
 
 
-    private Integer initStatus;  // 修改状态之前应该的状态
->>>>>>> 29a6b426327bd250bc44215372289fe1e345c46e
+    private Integer initStatus;
 }
 }

@@ -113,7 +113,9 @@ public class DepositOrderService {
         DepositOrderComputeResp.PriceInfo priceInfo = getFeeInfo(orderCode);
         DepositOrderComputeResp.PriceInfo priceInfo = getFeeInfo(orderCode);
 
 
         DepositOrder depositOrder = DepositOrder.builder().uid(uid).amount(priceInfo.getAmount())
         DepositOrder depositOrder = DepositOrder.builder().uid(uid).amount(priceInfo.getAmount())
-                .contractFee(priceInfo.getContractFee()).shipFee(priceInfo.getShipFee()).createTime(now).depositCode(req.getDepositCode())
+                .contractFee(priceInfo.getContractFee())
+                .shipFee(priceInfo.getShipFee())
+                .createTime(now).depositCode(req.getDepositCode())
                 .eventType(DepositEventTypeEnum.DEPOSIT_RECALL_FEE.getCode()).orderCode(orderCode).payment(0).status(0).updateTime(now).build();
                 .eventType(DepositEventTypeEnum.DEPOSIT_RECALL_FEE.getCode()).orderCode(orderCode).payment(0).status(0).updateTime(now).build();
 
 
         LOG.info("enter publishDepositOrder begin save depositOrder {} ",depositOrder);
         LOG.info("enter publishDepositOrder begin save depositOrder {} ",depositOrder);

@@ -21,7 +21,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.stereotype.Service;
 
 
 @Service
 @Service
-public class DeposiOrderPaymentService extends AbstractOrderPaymentService {
+public class DepositOrderPaymentService extends AbstractOrderPaymentService {
     private final Logger logger = LoggerFactory.getLogger(getClass());
     private final Logger logger = LoggerFactory.getLogger(getClass());
 
 
     @Autowired
     @Autowired

@@ -103,7 +103,7 @@ public class PaymentServiceImpl implements IPaymentService {
     MerchantOrderPaymentService merchantOrderPaymentService;
     MerchantOrderPaymentService merchantOrderPaymentService;
 
 
     @Autowired
     @Autowired
-    private DeposiOrderPaymentService deposiOrderPaymentService;
+    private DepositOrderPaymentService deposiOrderPaymentService;
 
 
     @Autowired
     @Autowired
     OrderCodeGenerator orderCodeGenerator;
     OrderCodeGenerator orderCodeGenerator;