Merge branch 'master' into dev

# Conflicts:
#	ace-modules/ace-admin-api/src/main/java/com/github/wxiaoqi/security/admin/dto/AppUserManageDTO.java
#	ace-modules/ace-admin-api/src/main/java/com/github/wxiaoqi/security/admin/feign/UserFeign.java
#	ace-modules/ace-admin/src/main/resources/mapper/AppUserDetailMapper.xml
#	xx-order/xx-order-api/src/main/java/com/xxfc/platform/order/pojo/order/OrderVehicleCrosstownDto.java
#	xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/biz/BaseOrderBiz.java
#	xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/biz/BranchCompanyBiz.java

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/rest/BaseOrderController.java

@@ -16,15 +16,14 @@ import com.github.wxiaoqi.security.common.util.ClientUtil;
 import com.github.wxiaoqi.security.common.util.Query;
 import com.github.wxiaoqi.security.common.util.process.ResultCode;
 import com.github.wxiaoqi.security.common.vo.PageDataVO;
-import com.xxfc.platform.order.biz.BaseOrderBiz;
-import com.xxfc.platform.order.biz.OrderItemBiz;
-import com.xxfc.platform.order.biz.OrderMemberDetailBiz;
-import com.xxfc.platform.order.biz.OrderUserLicenseBiz;
+import com.xxfc.platform.order.biz.*;
 import com.xxfc.platform.order.biz.inner.OrderCancelBiz;
-import com.xxfc.platform.order.contant.enumerate.OrderStatusEnum;
-import com.xxfc.platform.order.entity.BaseOrder;
-import com.xxfc.platform.order.entity.OrderItem;
+import com.xxfc.platform.order.biz.inner.OrderMsgBiz;
+import com.xxfc.platform.order.contant.enumerate.*;
+import com.xxfc.platform.order.entity.*;
 import com.xxfc.platform.order.mqhandler.RabbitProduct;
+import com.xxfc.platform.order.pojo.account.OrderAccountDeduction;
+import com.xxfc.platform.order.pojo.account.OrderAccountDetail;
 import com.xxfc.platform.order.pojo.order.CancelOrderDTO;
 import com.xxfc.platform.order.pojo.order.OrderAboutParamDTO;
 import com.xxfc.platform.order.pojo.order.OrderPageVO;
@@ -57,6 +56,8 @@ import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
 
+import static com.github.wxiaoqi.security.common.constant.CommonConstants.SYS_FALSE;
+import static com.github.wxiaoqi.security.common.constant.CommonConstants.SYS_TRUE;
 import static com.xxfc.platform.universal.constant.DictionaryKey.APP_ORDER;
 
 @Controller
@@ -90,6 +91,24 @@ public class BaseOrderController extends CommonBaseController implements UserRes
     @Autowired
     OrderItemBiz orderItemBiz;
 
+    @Autowired
+    OrderRentVehicleBiz orderRentVehicleBiz;
+
+    @Autowired
+    OrderVehicleCrosstownBiz crosstownBiz;
+
+    @Autowired
+    OrderViolationBiz orderViolationBiz;
+
+    @Autowired
+    OrderAccountBiz orderAccountBiz;
+
+    @Autowired
+    OrderMsgBiz orderMsgBiz;
+
+    @Autowired
+    OrderDepositRefundRecordBiz orderDepositRefundRecordBiz;
+
     @Override
     public UserFeign getUserFeign() {
         return userFeign;
@@ -382,4 +401,61 @@ public class BaseOrderController extends CommonBaseController implements UserRes
         return ObjectRestResponse.succ(result);
     }
 
+    @RequestMapping(value = "/app/unauth/refundDeposit/{no}", method = RequestMethod.POST)
+    @ResponseBody
+    @ApiOperation(value = "退款违章保证金")
+    @IgnoreClientToken
+    @IgnoreUserToken
+    public ObjectRestResponse refundDepositAmount(@PathVariable("no") String no) {
+        BaseOrder baseOrder = baseOrderBiz.selectOne(new BaseOrder(){{
+            setNo(no);
+        }});
+
+        OrderRentVehicleDetail orvd = orderRentVehicleBiz.selectOne(new OrderRentVehicleDetail() {{
+            setOrderId(baseOrder.getId());
+        }});
+
+        Integer crosstownTypeEnum;
+        //判断是否定损过
+        if(SYS_TRUE.equals(orvd.getFixedLossStatus())) {
+            crosstownTypeEnum = CrosstownTypeEnum.FIXED_LOSS.getCode();
+        }else {
+            crosstownTypeEnum = CrosstownTypeEnum.ARRIVE.getCode();
+        }
+        OrderVehicleCrosstown crosstown = crosstownBiz.selectOne(new OrderVehicleCrosstown(){{
+            setOrderId(baseOrder.getId());
+            setType(crosstownTypeEnum);
+        }});
+
+        OrderViolation orderViolation = orderViolationBiz.selectOne(new OrderViolation(){{
+            setDetailId(orvd.getId());
+            setIsDel(SYS_FALSE);
+        }});
+
+        OrderAccountDetail oad = new OrderAccountDetail();
+
+        String refundDesc = "退还违章押金：";
+        BigDecimal refundAmont;
+        if(null != orderViolation) {
+            //设置扣款项
+            oad.getDeductions().add(
+                    orderAccountBiz.initDeduction(orderViolation.getPrice(), DeductionTypeEnum.VIOLATE_TRAFFIC_DEDUCT.getDesc(), DeductionTypeEnum.VIOLATE_TRAFFIC_DEDUCT, OrderAccountDeduction.ORIGIN_DEPOSIT)
+            );
+
+            //还车扣除款 剩余的 钱，再减去违章预备金
+            refundAmont = orvd.getReturnPayResidue().subtract(orderViolation.getPrice());
+            refundDesc += refundAmont.toString();
+        }else {
+            refundAmont = orvd.getReturnPayResidue();
+            refundDesc += refundAmont.toString();
+        }
+        oad.setOriginDepositAmount(orvd.getReturnPayResidue());
+        oad.setDepositAmount(refundAmont);
+        orderAccountBiz.refundTrigger(baseOrder, orvd, BigDecimal.ZERO, orvd.getReturnPayResidue(), refundAmont, refundDesc, RefundStatusEnum.REFUND_DEPOSIT.getCode(), AccountTypeEnum.OUT_RESIDUE_DEPOSIT, oad);
+        orderDepositRefundRecordBiz.completeRecordStatus(crosstown.getId(), DepositRefundStatus.VIOLATIONARRIVAL);
+        orderMsgBiz.handelMsgDeposit(orvd, baseOrder, userFeign.userDetailById(baseOrder.getUserId()).getData());
+
+        return ObjectRestResponse.succ();
+    }
+
 }

xx-universal/xx-universal-server/src/main/java/com/xxfc/platform/universal/biz/OrderPayBiz.java

@@ -189,7 +189,8 @@ public class OrderPayBiz extends BaseBiz<OrderPayMapper, OrderPay>{
             if (StringUtils.isNotBlank(pay.getNotifyUrl())) {
                 String url = pay.getNotifyUrl();
                 Integer type = pay.getType() == null ? 1 : pay.getType();
-                url += "&tradeNo=" + orderNo + "&type=" + type;
+                Integer payWay = pay.getPayWay();
+                url += "&tradeNo=" + orderNo + "&type=" + type+"&payWay="+payWay;
                 log.error("---支付回调处理---orderNo=======" + orderNo + "----notifyUrl====" + url);
                 String result = "";
                 if (url.contains("https") || url.contains("HTTPS")) {

xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/biz/BranchCompanyBiz.java

@@ -431,4 +431,5 @@ public class BranchCompanyBiz extends BaseBiz<BranchCompanyMapper, BranchCompany
         updateSelectiveByIdRe(branchCompany);
         return ObjectRestResponse.succ();
     }
+
 }