获得赔偿

csm-service/cms-service-user/src/main/java/com/mmc/iuav/user/enums/PayMethodEnums.java

@@ -20,7 +20,9 @@ public enum PayMethodEnums {
     PAY_UAV_ORDER_REFUND(1400, "商城订单退款"),
     ORDER_INCOME(1500, "订单收益"),
     GIVE_BACK_PLEDGE(1600, "租赁押金退回"),
-    LEASE_ORDER_REFUND(1700, "租赁订单退款");
+    LEASE_ORDER_REFUND(1700, "租赁订单退款"),
+    COMPENSATION(1800, "押金赔损"),
+    ;
 
     PayMethodEnums(Integer code, String method) {
         this.code = code;

csm-service/cms-service-user/src/main/java/com/mmc/iuav/user/service/wallet/impl/PayWalletServiceImpl.java

@@ -618,7 +618,7 @@ public class PayWalletServiceImpl implements PayWalletService {
             return handlePublishOrder(payUavWalletVO, userWalletInfo, payLogDO, payWalletDO);
         } else if (orderStatus.equals(PayMethodEnums.PAY_UAV_ORDER_REFUND.getCode())) {
             return handleOrderRefund(payUavWalletVO, userWalletInfo, payLogDO, payWalletDO);
-        } else if (orderStatus.equals(PayMethodEnums.ORDER_INCOME.getCode())) {
+        } else if (orderStatus.equals(PayMethodEnums.ORDER_INCOME.getCode()) || orderStatus.equals(PayMethodEnums.COMPENSATION.getCode())) {
             return handleOrderIncome(payUavWalletVO, userWalletInfo, payLogDO, payWalletDO);
         } else if (orderStatus.equals(PayMethodEnums.GIVE_BACK_PLEDGE.getCode())) {
             return handleGiveBackPledge(payUavWalletVO, userWalletInfo, payLogDO, payWalletDO);
@@ -702,6 +702,7 @@ public class PayWalletServiceImpl implements PayWalletService {
     @Transactional(rollbackFor = Exception.class)
     public ResultBody handleOrderIncome(PayUavWalletVO payUavWalletVO, PayWalletDO userWalletInfo, PayLogDO payLogDO, PayWalletDO payWalletDO) {
         payLogDO.setPayMethod(payUavWalletVO.getOrderStatus());
+        payLogDO.setRemark(payUavWalletVO.getRemark());
         payLogDO.setCashAmtPaid(BigDecimal.ZERO);
         payLogDO.setSalaryAmtPaid(payUavWalletVO.getSalaryAmount());
         // 订单收益