新增押金退回状态

cms-common/cms-common-model/src/main/java/com/mmc/iuav/user/model/vo/wallet/PayUavWalletVO.java

@@ -29,7 +29,7 @@ public class PayUavWalletVO implements Serializable {
     @ApiModelProperty(value = "佣金")
     private BigDecimal salaryAmount;
 
-    @ApiModelProperty(value = "订单状态 100：订单支付  1400:商城订单退款 1500:订单提成 999:确认收货", required = true)
+    @ApiModelProperty(value = "订单状态 100：订单支付  1400:商城订单退款 1500:订单提成 999:确认收货 1600：租赁押金退回", required = true)
     private Integer orderStatus;
 
     @ApiModelProperty(value = "订单备注")

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

@@ -18,7 +18,8 @@ public enum PayMethodEnums {
     FLYING_HAND_CONFIRM_LT(1000, "飞手确认修改金额小于原订单状态"),
     USER_TOP_UP(1100, "充值"),
     PAY_UAV_ORDER_REFUND(1400, "商城订单退款"),
-    ORDER_INCOME(1500, "订单收益");
+    ORDER_INCOME(1500, "订单收益"),
+    GIVE_BACK_PLEDGE(1600, "租赁押金退回");
 
     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

@@ -620,12 +620,27 @@ public class PayWalletServiceImpl implements PayWalletService {
             return handleOrderRefund(payUavWalletVO, userWalletInfo, payLogDO, payWalletDO);
         } else if (orderStatus.equals(PayMethodEnums.ORDER_INCOME.getCode())) {
             return handleOrderIncome(payUavWalletVO, userWalletInfo, payLogDO, payWalletDO);
+        } else if (orderStatus.equals(PayMethodEnums.GIVE_BACK_PLEDGE.getCode())) {
+            return handleGiveBackPledge(payUavWalletVO, userWalletInfo, payLogDO, payWalletDO);
         } else {
             return handleConfirmReceipt(payUavWalletVO, userWalletInfo, payLogDO, payWalletDO);
         }
     }
 
     @Transactional(rollbackFor = Exception.class)
+    ResultBody handleGiveBackPledge(PayUavWalletVO payUavWalletVO, PayWalletDO userWalletInfo, PayLogDO payLogDO, PayWalletDO payWalletDO) {
+        payLogDO.setPayMethod(payUavWalletVO.getOrderStatus());
+        payLogDO.setCashAmtPaid(payUavWalletVO.getCashAmount());
+        payLogDO.setSalaryAmtPaid(payUavWalletVO.getSalaryAmount());
+        // 如果是1600 回滚解冻金额
+        payWalletDO.setCashAmt(userWalletInfo.getCashAmt().add(payUavWalletVO.getCashAmount()));
+        payWalletDO.setSalaryAmt(userWalletInfo.getSalaryAmt().add(payUavWalletVO.getSalaryAmount()));
+        payWalletDao.insertPayLogDO(payLogDO);
+        payWalletDao.updatePayWallet(payWalletDO);
+        return ResultBody.success();
+    }
+
+    @Transactional(rollbackFor = Exception.class)
     public ResultBody handlePublishOrder(PayUavWalletVO payUavWalletVO, PayWalletDO userWalletInfo, PayLogDO payLogDO, PayWalletDO payWalletDO) {
         // 获取下单金额是否大于该用户钱包金额
         if (userWalletInfo.getCashAmt().compareTo(payUavWalletVO.getCashAmount()) < 0) {