修改代码

xx-order/xx-order-api/src/main/java/com/xxfc/platform/order/contant/enumerate/AccountTypeEnum.java

@@ -6,7 +6,7 @@ import java.util.Map;
 public enum AccountTypeEnum {
     //账款类型 1*--入账；2*--出账
     //账款类型 记帐类型 101--订单支付；201--取消订单退款；202--全部押金退款；203--部分押金退款；204--剩余押金退款
-    In_ORDER_PAY(101, "订单支付"),
+    IN_ORDER_PAY(101, "订单支付"),
     OUT_ORDER_FUND(201, "订单款"),
     OUT_DEPOSIT(202, "所有押金"),
     OUT_PART_DEPOSIT(203, "部分押金（扣除该扣除的 + 保留违章预备金）"),

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/biz/BaseOrderBiz.java

@@ -6,7 +6,6 @@ import com.github.wxiaoqi.security.admin.dto.UserMemberDTO;
 import com.github.wxiaoqi.security.admin.feign.UserFeign;
 import com.github.wxiaoqi.security.admin.feign.dto.AppUserDTO;
 import com.github.wxiaoqi.security.admin.feign.dto.UserDTO;
-import com.github.wxiaoqi.security.admin.vo.AppUserVo;
 import com.github.wxiaoqi.security.common.biz.BaseBiz;
 import com.github.wxiaoqi.security.common.context.BaseContextHandler;
 import com.github.wxiaoqi.security.common.exception.BaseException;
@@ -16,16 +15,17 @@ import com.github.wxiaoqi.security.common.util.process.ResultCode;
 import com.google.common.collect.Lists;
 import com.xxfc.platform.activity.feign.ActivityFeign;
 import com.xxfc.platform.order.biz.inner.OrderMsgBiz;
+import com.xxfc.platform.order.contant.enumerate.AccountTypeEnum;
 import com.xxfc.platform.order.contant.enumerate.OrderStatusEnum;
 import com.xxfc.platform.order.contant.enumerate.OrderTypeEnum;
 import com.xxfc.platform.order.entity.*;
 import com.xxfc.platform.order.mapper.BaseOrderMapper;
+import com.xxfc.platform.order.pojo.account.OrderAccountDetail;
 import com.xxfc.platform.order.pojo.mq.OrderMQDTO;
 import com.xxfc.platform.order.pojo.order.OrderListVo;
 import com.xxfc.platform.order.pojo.order.OrderPageVO;
 import com.xxfc.platform.order.pojo.order.OrderVehicleCrosstownDto;
 import com.xxfc.platform.order.pojo.order.QueryOrderDTO;
-import com.xxfc.platform.order.rest.BaseOrderController;
 import com.xxfc.platform.tour.entity.TourUser;
 import com.xxfc.platform.tour.feign.TourFeign;
 import com.xxfc.platform.universal.constant.DictionaryKey;
@@ -89,6 +89,9 @@ public class BaseOrderBiz extends BaseBiz<BaseOrderMapper, BaseOrder> {
     @Autowired
     OrderItemBiz orderItemBiz;
 
+    @Autowired
+    OrderAccountBiz orderAccountBiz;
+
     @Autowired
     VehicleFeign vehicleFeign;
 
@@ -302,6 +305,11 @@ public class BaseOrderBiz extends BaseBiz<BaseOrderMapper, BaseOrder> {
                 setVersion(baseOrder.getVersion());
             }};
 
+            //订单账款类
+            OrderAccountDetail oad = new OrderAccountDetail();
+            oad.setOriginOrderAmount(baseOrder.getRealAmount());
+            oad.setOrderAmount(baseOrder.getRealAmount());
+
             //如果是会员订单，则触发会员效益
             if (OrderTypeEnum.MEMBER.getCode().equals(baseOrder.getType())) {
                 //直接设置订单完成
@@ -327,6 +335,11 @@ public class BaseOrderBiz extends BaseBiz<BaseOrderMapper, BaseOrder> {
                 orvd = orderRentVehicleBiz.selectOne(new OrderRentVehicleDetail() {{
                     setOrderId(baseOrder.getId());
                 }});
+
+                //账款设置押金
+                oad.setOriginDepositAmount(orvd.getDeposit());
+                oad.setDepositAmount(orvd.getDeposit());
+
                 //车辆预定审核通过
                 RestResponse<Integer> result = vehicleFeign.rentProveVehicleBooking(orvd.getBookRecordId());
 
@@ -344,8 +357,11 @@ public class BaseOrderBiz extends BaseBiz<BaseOrderMapper, BaseOrder> {
                 //站点总人数添加
                 tourFeign.updateTourGoodPersonNum(otd.getVerificationId(), TourFeign.TOTAL_PERSON, otd.getTotalNumber());
             }
+
             try {
                 this.updateSelectiveByIdRe(updateOrder);
+                //记录订单账款记录
+                Integer flag = orderAccountBiz.addOrderAccount(baseOrder.getId(), "订单支付", oad.getOriginOrderAmount().add(oad.getOriginDepositAmount()), oad.getOrderAmount().add(oad.getDepositAmount()), tradeNo, AccountTypeEnum.IN_ORDER_PAY.getCode(), JSONUtil.toJsonStr(oad));
             } finally {
                 AppUserDTO appUserDTO = userFeign.userDetailById(baseOrder.getUserId()).getData();
 

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/biz/OrderAccountBiz.java

@@ -15,7 +15,6 @@ import com.xxfc.platform.order.entity.*;
 import com.xxfc.platform.order.pojo.DedDetailDTO;
 import com.xxfc.platform.order.pojo.account.OrderAccountDeduction;
 import com.xxfc.platform.order.pojo.account.OrderAccountDetail;
-import com.xxfc.platform.order.pojo.calculate.InProgressVO;
 import com.xxfc.platform.order.pojo.mq.OrderMQDTO;
 import com.xxfc.platform.universal.constant.DictionaryKey;
 import com.xxfc.platform.universal.entity.Dictionary;
@@ -117,7 +116,7 @@ public class OrderAccountBiz extends BaseBiz<OrderAccountMapper,OrderAccount> {
         refundAmount = refundAmount.add(refundAmountDeposit);
 
         //退款子流程: 订单基础，退款描述, 款金额
-        refundSubProcess(baseOrder, refundDescBuilder.toString(), originalRefundAmount, refundAmount, RefundTypeEnum.ORDER_FUND.getCode(), RefundStatusEnum.ALL.getCode(), oad);
+        refundSubProcess(baseOrder, refundDescBuilder.toString(), originalRefundAmount, refundAmount, AccountTypeEnum.OUT_ORDER_FUND.getCode(), RefundStatusEnum.ALL.getCode(), oad);
         return refundAmount;
     }
 
@@ -146,7 +145,7 @@ public class OrderAccountBiz extends BaseBiz<OrderAccountMapper,OrderAccount> {
         }
 
         //记录订单退款记录
-        Integer flag = addOrderRefund(baseOrder.getId(), refundDesc, originalRefundAmount, refundAmount, refundTradeNo, refundType, JSONUtil.toJsonStr(oad));
+        Integer flag = addOrderAccount(baseOrder.getId(), refundDesc, originalRefundAmount, refundAmount, refundTradeNo, refundType, JSONUtil.toJsonStr(oad));
 
         //更新订单的退款状态和退款时间
         BaseOrder updateBaseOrder = new BaseOrder();
@@ -218,7 +217,7 @@ public class OrderAccountBiz extends BaseBiz<OrderAccountMapper,OrderAccount> {
      * @param accountAmount
      * @param tradeNo
      */
-    private Integer addOrderRefund(Integer orderId, String accountDesc, BigDecimal originalAmount, BigDecimal accountAmount, String tradeNo, Integer accountType, String detail) {
+    public Integer addOrderAccount(Integer orderId, String accountDesc, BigDecimal originalAmount, BigDecimal accountAmount, String tradeNo, Integer accountType, String detail) {
         //如果返回的流水为空，则当做失败
         Integer refundStatus = SYS_TRUE;
         if(StrUtil.isBlank(tradeNo)) {
@@ -244,9 +243,9 @@ public class OrderAccountBiz extends BaseBiz<OrderAccountMapper,OrderAccount> {
         return refundStatus;
     }
 
-    public void refundTrigger(BaseOrder baseOrder, OrderRentVehicleDetail orvd, BigDecimal residueAmount, BigDecimal originalRefundAmount, BigDecimal refundAmont, String refundDesc, Integer refundStatus, RefundTypeEnum refundTypeEnum, OrderAccountDetail oad) {
+    public void refundTrigger(BaseOrder baseOrder, OrderRentVehicleDetail orvd, BigDecimal residueAmount, BigDecimal originalRefundAmount, BigDecimal refundAmont, String refundDesc, Integer refundStatus, AccountTypeEnum accountTypeEnum, OrderAccountDetail oad) {
         //退款子流程: 订单基础，退款描述，退款金额
-        refundSubProcess(baseOrder, refundDesc, originalRefundAmount, refundAmont, refundTypeEnum.getCode(), refundStatus, oad);
+        refundSubProcess(baseOrder, refundDesc, originalRefundAmount, refundAmont, accountTypeEnum.getCode(), refundStatus, oad);
         //设置剩余没有返还的钱
         orderRentVehicleBiz.updateSelectiveById(new OrderRentVehicleDetail(){{
             setId(orvd.getId());
@@ -311,7 +310,7 @@ public class OrderAccountBiz extends BaseBiz<OrderAccountMapper,OrderAccount> {
             String refundDesc = "退还押金："+ refundAmont.toString()+ "(已扣除 违章预备金："+ illegalReserve.toString();
             refundDesc = handleDed(crosstown, refundDesc);
             refundDesc += ")";
-            refundTrigger(orderMQDTO, orderMQDTO.getOrderRentVehicleDetail(), illegalReserve, originalRefundAmount, refundAmont, refundDesc, RefundStatusEnum.RESIDUE_ILLEGAL.getCode(), RefundTypeEnum.PART_DEPOSIT, oad);
+            refundTrigger(orderMQDTO, orderMQDTO.getOrderRentVehicleDetail(), illegalReserve, originalRefundAmount, refundAmont, refundDesc, RefundStatusEnum.RESIDUE_ILLEGAL.getCode(), AccountTypeEnum.OUT_PART_DEPOSIT, oad);
 
             orderDepositRefundRecordBiz.completeRecordStatus(crosstown.getId(), depositRefundRecordStatus);
             orderMsgBiz.handelMsgDeposit(orderMQDTO.getOrderRentVehicleDetail(), orderMQDTO, userFeign.userDetailById(orderMQDTO.getUserId()).getData());

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/biz/inner/OrderCancelBiz.java

 package com.xxfc.platform.order.biz.inner;
 
+import cn.hutool.core.convert.Convert;
 import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.util.StrUtil;
 import com.github.wxiaoqi.security.admin.feign.UserFeign;
 import com.github.wxiaoqi.security.admin.feign.dto.AppUserDTO;
 import com.github.wxiaoqi.security.common.exception.BaseException;
@@ -148,7 +150,7 @@ public class OrderCancelBiz {
                         inProgressVO = orderCalculateBiz.calculateOrderComplete(baseOrder, orvd, oad, orderItem, useDays);
                         //结合
                         //退款子流程: 订单基础，退款描述，退款金额
-                        orderAccountBiz.refundSubProcess(baseOrder, "", baseOrder.getRealAmount().subtract(orvd.getDeposit()), oad.getDepositAmount().add(oad.getOrderAmount()), RefundTypeEnum.ORDER_FUND.getCode(), RefundStatusEnum.ALL.getCode(), oad);
+                        orderAccountBiz.refundSubProcess(baseOrder, "", baseOrder.getRealAmount().subtract(orvd.getDeposit()), oad.getDepositAmount().add(oad.getOrderAmount()), AccountTypeEnum.OUT_ORDER_FUND.getCode(), RefundStatusEnum.ALL.getCode(), oad);
 
                     }else {
                         //没到出车时间
@@ -162,19 +164,10 @@ public class OrderCancelBiz {
                                 freeDayAmount = freeDayAmount;
                             }
                         }
-
+                        //退款流程
                         orderAccountBiz.rentRefundProcessCancel(hasUpdateOrder, orderItem.getRealAmount(), timeLag, APP_ORDER+ "_"+ RENT_REFUND, orvd.getDeposit(), freeDayAmount);
                     }
 
-                    //退款流程
-                        //退订单款
-//                    orderRefundBiz.rentRefundProcess(hasUpdateOrder, timeLag, APP_ORDER+ "_"+ RENT_REFUND);
-//
-//                      //退押金
-//                    orderRefundBiz.rentRefundDepositProcess(hasUpdateOrder, orvd.getDeposit(), timeLag, APP_ORDER+ "_"+ RENT_REFUND, freeDayAmount);
-//
-//                    orderAccountBiz.rentRefundProcessCancel(hasUpdateOrder, orderItem, timeLag, APP_ORDER+ "_"+ RENT_REFUND, orvd.getDeposit(), freeDayAmount);freeDayAmount
-
                     //已付款的取消订单发送消息
                     try {
                         AppUserDTO appUserDTO = userFeign.userDetailById(baseOrder.getUserId()).getData();
@@ -237,6 +230,14 @@ public class OrderCancelBiz {
                         throw new BaseException(ResultCode.FAILED_CODE);
                     }
                 }
+
+                //返还优惠券
+                if(StrUtil.isNotBlank(baseOrder.getCouponTickerNos())) {
+                    List<String> backCoupons = (null == inProgressVO)? inProgressVO.getBackCoupons(): Convert.convert(List.class, baseOrder.getCouponTickerNos().split(","));
+                    for(String backCoupon : backCoupons) {
+                        activityFeign.cancelUse(backCoupon);
+                    }
+                }
             }else if(OrderTypeEnum.TOUR.getCode().equals(baseOrder.getType())) {
                 otd = orderTourDetailBiz.selectOne(new OrderTourDetail(){{
                     setOrderId(baseOrder.getId());

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/jobhandler/RentDepositJobHandler.java

@@ -125,7 +125,7 @@ public class RentDepositJobHandler extends IJobHandler {
                         refundDesc += refundAmont.toString();
                     }
                     OrderAccountDetail oad = new OrderAccountDetail();
-                    orderAccountBiz.refundTrigger(baseOrder, orvd, BigDecimal.ZERO, orvd.getReturnPayResidue(), refundAmont, refundDesc, RefundStatusEnum.REFUND_DEPOSIT.getCode(), RefundTypeEnum.RESIDUE_DEPOSIT, oad);
+                    orderAccountBiz.refundTrigger(baseOrder, orvd, BigDecimal.ZERO, orvd.getReturnPayResidue(), refundAmont, refundDesc, RefundStatusEnum.REFUND_DEPOSIT.getCode(), AccountTypeEnum.OUT_RESIDUE_DEPOSIT, oad);
                     //orderRefundBiz.refundTrigger(baseOrder, orvd, BigDecimal.ZERO, orvd.getReturnPayResidue(), refundAmont, refundDesc, RefundStatusEnum.REFUND_DEPOSIT.getCode(), RefundTypeEnum.RESIDUE_DEPOSIT);
                     orderDepositRefundRecordBiz.completeRecordStatus(crosstown.getId(), DepositRefundStatus.VIOLATIONARRIVAL);
                     orderMsgBiz.handelMsgDeposit(orvd, baseOrder, userFeign.userDetailById(baseOrder.getUserId()).getData());