返回押金

src/main/java/com/mmc/oms/dao/lease/LeaseOrderDao.java

@@ -8,7 +8,6 @@ import com.mmc.oms.entity.uav.UavOrderDO;
 import com.mmc.oms.model.qo.uav.UavOrderQO;
 import org.apache.ibatis.annotations.Mapper;
 
-import java.math.BigDecimal;
 import java.util.List;
 
 /**
@@ -50,5 +49,4 @@ public interface LeaseOrderDao {
 
     LeaseRefundOrderDO selectGiveBackByOrderId(Integer id, Integer type);
 
-    void updateLeaseOrderDeposit(Integer orderId, BigDecimal deposit);
 }

src/main/java/com/mmc/oms/entity/lease/LeaseRefundOrderDO.java

@@ -7,6 +7,7 @@ import lombok.Data;
 import lombok.NoArgsConstructor;
 
 import java.io.Serializable;
+import java.math.BigDecimal;
 import java.util.Date;
 
 /**
@@ -49,17 +50,20 @@ public class LeaseRefundOrderDO implements Serializable {
 
     private Integer type;
 
+    private BigDecimal modifiedDeposit;
+
     public LeaseRefundOrderDO(LeaseOrderRefundVO leaseOrderRefundVO) {
         this.leaseOrderId = leaseOrderRefundVO.getOrderId();
         this.status = leaseOrderRefundVO.getStatus();
         this.file = leaseOrderRefundVO.getFile();
         this.reason = leaseOrderRefundVO.getReason();
+        this.modifiedDeposit = leaseOrderRefundVO.getDeductionAmount();
     }
 
     public LeaseRefundOrderDTO buildLeaseRefundOrderDTO() {
         return LeaseRefundOrderDTO.builder().id(this.id).leaseOrderId(this.leaseOrderId)
                 .status(this.status).file(this.file).reason(this.reason)
-                .createTime(this.createTime).build();
+                .createTime(this.createTime).modifiedDeposit(modifiedDeposit).build();
     }
 }
 

src/main/java/com/mmc/oms/model/dto/lease/LeaseRefundOrderDTO.java

@@ -7,6 +7,7 @@ import lombok.Data;
 import lombok.NoArgsConstructor;
 
 import java.io.Serializable;
+import java.math.BigDecimal;
 import java.util.Date;
 
 /**
@@ -33,6 +34,8 @@ public class LeaseRefundOrderDTO implements Serializable {
     private String file;
     @ApiModelProperty("退款原因")
     private String reason;
+    @ApiModelProperty("修改后的押金")
+    private BigDecimal modifiedDeposit;
     @ApiModelProperty("创建时间")
     private Date createTime;
 

src/main/java/com/mmc/oms/service/lease/impl/LeaseOrderServiceImpl.java

@@ -770,8 +770,6 @@ public class LeaseOrderServiceImpl implements LeaseOrderService {
                 leaseRefundOrderDO.setStatus(1);
                 leaseRefundOrderDO.setType(OrderType.PFREC.getCode());
                 leaseOrderDao.addLeaseRefundOrder(leaseRefundOrderDO);
-                // 记录修改后的押金退回
-                leaseOrderDao.updateLeaseOrderDeposit(param.getOrderId(), param.getDeductionAmount());
                 // 修改订单状态
                 this.updateLeaseOrderStatus(param.getOrderId(), LeaseOrderStatus.MODIFIED_DEPOSIT_TO_BE_CONFIRMED);
             }

src/main/resources/mapper/lease/LeaseOrderDao.xml

@@ -43,8 +43,9 @@
     </insert>
     <insert id="addLeaseRefundOrder" parameterType="com.mmc.oms.entity.lease.LeaseRefundOrderDO" useGeneratedKeys="true"
             keyProperty="id">
-        insert into lease_refund_order(lease_order_id, status, file, reason, type, lease_order_express_id)
-        values (#{leaseOrderId}, #{status}, #{file}, #{reason}, #{type}, #{leaseOrderExpressId})
+        insert into lease_refund_order(lease_order_id, status, file, reason, type, lease_order_express_id,
+                                       #{modified_deposit})
+        values (#{leaseOrderId}, #{status}, #{file}, #{reason}, #{type}, #{leaseOrderExpressId}, #{modifiedDeposit})
     </insert>
     <update id="updateLeaseOrderStatus">
         update lease_order
@@ -110,11 +111,6 @@
         set proportion = #{proportion}
         where id = #{id}
     </update>
-    <update id="updateLeaseOrderDeposit">
-        update lease_order
-        set modified_deposit = #{deposit}
-        where id = #{orderId}
-    </update>
 
     <sql id="lease_order_column">
         id
@@ -203,7 +199,7 @@ share_cash_pledge,salary_cash_pledge,other_pledge
     </select>
     <sql id="lease_refund_order_column">
         id
-        ,lease_order_express_id,lease_order_id,status,type,file,reason,create_time
+        ,lease_order_express_id,lease_order_id,status,type,file,reason,create_time,modified_deposit
     </sql>
     <select id="getLeaseRefundOrder" resultType="com.mmc.oms.entity.lease.LeaseRefundOrderDO">
         select