Merge branch 'holiday-price' into dev

# Conflicts:
#	ace-modules/ace-admin-api/src/main/java/com/github/wxiaoqi/security/admin/feign/UserFeign.java
#	xx-order/xx-order-api/src/main/java/com/xxfc/platform/order/pojo/order/OrderVehicleCrosstownDto.java
#	xx-universal/xx-universal-server/src/main/java/com/xxfc/platform/universal/biz/OrderPayBiz.java
#	xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/feign/VehicleFeign.java

ace-modules/ace-admin-api/src/main/java/com/github/wxiaoqi/security/admin/feign/UserFeign.java

@@ -140,6 +140,15 @@ public interface UserFeign {
     @GetMapping("/public/getUsersByUserIds")
      ObjectRestResponse<List<AppUserVo>> getUsersByUserIds(@RequestParam("ids") List<Integer> ids);
 
+
+	@GetMapping(value = "/app/user/users")
+	List<Integer> findAppUserIds(@RequestParam(value = "phone",required = false) String phone,
+								 @RequestParam(value = "leaderPhone",required = false) String leaderPhone,
+								 @RequestParam(value = "name",required = false) String name);
+
+	@PostMapping(value = "/app/user/users/info")
+	List<UserBo> findUserDetailByUserBo(@RequestBody(required = false) List<UserBo> userBos);
+
     @GetMapping("/member/user")
     BaseUserMember findBaseUserMemberByUserId(@RequestParam(value = "userId") Integer userId);
 
@@ -149,14 +158,4 @@ public interface UserFeign {
                                                     @RequestParam(value = "cono",required = false) String cono,
                                                     @RequestParam(value = "reason",required = false) String reason,
                                                     @RequestParam(value = "isSuccess") Boolean isSuccess);
-
-
-    @GetMapping(value = "/app/user/users")
-    List<Integer> findAppUserIds(@RequestParam(value = "phone",required = false) String phone,
-                                 @RequestParam(value = "leaderPhone",required = false) String leaderPhone,
-                                 @RequestParam(value = "name",required = false) String name);
-
-    @PostMapping(value = "/app/user/users/info")
-    List<UserBo> findUserDetailByUserBo(@RequestBody(required = false) List<UserBo> userBos);
-
 }

xx-order/xx-order-api/src/main/java/com/xxfc/platform/order/pojo/order/OrderVehicleCrosstownDto.java

@@ -6,6 +6,8 @@ import com.xxfc.platform.order.entity.OrderVehicleCrosstown;
 import com.xxfc.platform.order.pojo.DedDetailDTO;
 import lombok.Data;
 
+import java.util.Date;
+import java.math.BigDecimal;
 import java.util.Date;
 import java.util.List;
 
@@ -81,4 +83,19 @@ public class OrderVehicleCrosstownDto extends OrderVehicleCrosstown {
 
     private Integer showType;
 
+    /**
+     * 实际退还的部分押金
+     */
+    private String actualDeposit;
+
+    /**
+     * 实际退还剩余押金
+     */
+    private BigDecimal refundOfRemainingDeposit;
+
+    /**
+     * 违章扣款
+     */
+    private BigDecimal violationOfCharges;
+
 }
\ No newline at end of file

xx-order/xx-order-api/src/main/java/com/xxfc/platform/order/pojo/order/VehicleItemDTO.java

@@ -113,8 +113,11 @@ public class VehicleItemDTO extends OrderItem {
         }
 
         BigDecimal usedAmount = BigDecimal.ZERO;
-        for(VMCalendarPriceCostDTO vmcpcd : vmcpds) {
-            usedAmount.add(vmcpcd.getPrice());
+//        for(VMCalendarPriceCostDTO vmcpcd : vmcpds) {
+//            usedAmount.add(vmcpcd.getPrice());
+//        }
+        for(int i = 0; i < useDays; i++) {
+            usedAmount = usedAmount.add(vmcpds.get(i).getPrice());
         }
         return usedAmount;
     }
@@ -133,11 +136,11 @@ public class VehicleItemDTO extends OrderItem {
         BigDecimal freeAmount = BigDecimal.ZERO;
         if(null != offsetDay) {
             for(int i = 0; i < offsetDay; i++) {
-                freeAmount.add(vmcpds.get(i).getFreeAmount());
+                freeAmount = freeAmount.add(vmcpds.get(i).getFreeAmount());
             }
         }else {
             for(VMCalendarPriceCostDTO vmcpcd : vmcpds) {
-                freeAmount.add(vmcpcd.getFreeAmount());
+                freeAmount = freeAmount.add(vmcpcd.getFreeAmount());
             }
         }
         return freeAmount;

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

@@ -17,12 +17,15 @@ import com.github.wxiaoqi.security.common.util.process.ResultCode;
 import com.xxfc.platform.activity.entity.Coupon;
 import com.xxfc.platform.activity.user.UserInfoBiz;
 import com.xxfc.platform.order.biz.inner.OrderMsgBiz;
+import com.xxfc.platform.order.contant.enumerate.AccountTypeEnum;
 import com.xxfc.platform.order.contant.enumerate.CrosstownTypeEnum;
 import com.xxfc.platform.order.contant.enumerate.DepositRefundStatus;
 import com.xxfc.platform.order.contant.enumerate.OrderStatusEnum;
 import com.xxfc.platform.order.entity.*;
 import com.xxfc.platform.order.mapper.OrderVehicaleCrosstownMapper;
 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.mq.OrderMQDTO;
 import com.xxfc.platform.order.pojo.order.CheckUserInfoDto;
 import com.xxfc.platform.order.pojo.order.OrderPageVO;
@@ -37,6 +40,7 @@ import com.xxfc.platform.vehicle.feign.VehicleFeign;
 import com.xxfc.platform.vehicle.pojo.CompanyDetail;
 import com.xxfc.platform.vehicle.pojo.VehicleArrivalVo;
 import com.xxfc.platform.vehicle.pojo.VehicleDepartureVo;
+import jodd.util.StringUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.collections4.map.HashedMap;
@@ -84,6 +88,9 @@ public class OrderVehicleCrosstownBiz extends BaseBiz<OrderVehicaleCrosstownMapp
     OrderItemBiz orderItemBiz;
     @Autowired
     OrderMsgBiz orderMsgBiz;
+    @Autowired
+    OrderAccountBiz orderAccountBiz;
+
 
     public OrderVehicleCrosstown get(Integer id) {
         return selectById(id);
@@ -107,31 +114,47 @@ public class OrderVehicleCrosstownBiz extends BaseBiz<OrderVehicaleCrosstownMapp
                     }
                 }
             }
+
             if (value.getType() == 2 || value.getType() == 3) {
                 List<Coupon> c = baseOrderBiz.getReturnCouponByOrderId(value.getOrderId());
                 value.setBackCoupons(c);
+                if (StringUtils.isNotBlank(value.getDedDetail())) {
+                    List<DedDetailDTO> dddList = JSONUtil.toList(JSONUtil.parseArray(value.getDedDetail()), DedDetailDTO.class);
+                    value.setDedDetailDTOList(dddList);
+                }
+                if (StringUtils.isNotBlank(value.getViolateDetail())) {
+                    List<DedDetailDTO> dddList = JSONUtil.toList(JSONUtil.parseArray(value.getViolateDetail()), DedDetailDTO.class);
+                    value.setViolateDetailList(dddList);
+                }
 
             }
-            if (StringUtils.isNotBlank(value.getDedDetail())) {
-                List<DedDetailDTO> dddList = JSONUtil.toList(JSONUtil.parseArray(value.getDedDetail()), DedDetailDTO.class);
-                value.setDedDetailDTOList(dddList);
-            }
-            if (StringUtils.isNotBlank(value.getViolateDetail())) {
-                List<DedDetailDTO> dddList = JSONUtil.toList(JSONUtil.parseArray(value.getViolateDetail()), DedDetailDTO.class);
-                value.setViolateDetailList(dddList);
+            if (value.getType()!=1){
+                Example example = new Example(OrderAccount.class);
+                //获取退还部分押金和剩余押金的记录
+                example.createCriteria().andEqualTo("orderId",value.getOrderId()).andIn("accountType",Lists.newArrayList(AccountTypeEnum.OUT_PART_DEPOSIT.getCode(),AccountTypeEnum.OUT_RESIDUE_DEPOSIT.getCode()));
+                List<OrderAccount> orderAccounts = orderAccountBiz.selectByExample(example);
+                if (CollectionUtil.isEmpty(orderAccounts)) {
+                    value.setActualDeposit("定损中");
+                }
+                for (OrderAccount orderAccount : orderAccounts) {
+                    if (AccountTypeEnum.OUT_PART_DEPOSIT.getCode().equals(orderAccount.getAccountType())) {
+                        OrderAccountDetail orderAccountDetail = JSONUtil.toBean(orderAccount.getAccountDetail(), OrderAccountDetail.class);
+                        value.setActualDeposit(orderAccountDetail.getDepositAmount().toString());
+                    }
+                    if (AccountTypeEnum.OUT_RESIDUE_DEPOSIT.getCode().equals(orderAccount.getAccountType())) {
+                        value.setRefundOfRemainingDeposit(orderAccount.getOriginalAmount());
+                        value.setViolationOfCharges(orderAccount.getDeductAmount());
+                    }
+                }
+
             }
+
             updateCrossRecord(value);
             List<DepositRefundRecord> depositRefundRecords = orderDepositRefundRecordBiz.selectByCrossId(value.getId());
             if ( orderVehicleCrosstownDto.getAddress()!=null&&
                     1 == orderVehicleCrosstownDto.getAddress() && CollectionUtil.isNotEmpty(depositRefundRecords)) {
                 depositRefundRecords = depositRefundRecords.parallelStream().filter(e -> {
-                    if (e.getStatus() == 1) {
-                        value.setShowType(1);
-                        return false;
-                    }
-
-                    if (e.getStatus() == 4||e.getStatus() == 5) {
-                        value.setShowType(2);
+                    if (e.getStatus() == 4||e.getStatus() == 5||e.getStatus() == 1) {
                         return false;
                     }
                     return true;

xx-order/xx-order-server/src/main/resources/mapper/OrderVehicaleCrosstownMapper.xml

@@ -38,6 +38,7 @@
     <select id="selectByOrderId" parameterType="com.xxfc.platform.order.pojo.order.OrderVehicleCrosstownDto" resultType="com.xxfc.platform.order.pojo.order.OrderVehicleCrosstownDto">
         select o.*, o.violate_amount_detail violateDetail
         from order_vehicle_crosstown o
+
         <where>
             <if test="status != null">
                 and o.status = #{status}
@@ -48,6 +49,9 @@
             <if test="orderId != null">
                 and o.order_id = #{orderId}
             </if>
+            <if test="address != null and address== 1">
+                and o.type != 1
+            </if>
             <if test="orderNo != null">
                 and o.order_no = #{orderNo}
             </if>
@@ -65,4 +69,5 @@
         where order_no = #{no} and type = #{type}
     </select>
 
+
 </mapper>
\ No newline at end of file

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

@@ -558,7 +558,7 @@ public class OrderPayBiz extends BaseBiz<OrderPayMapper, OrderPay>{
         model.setTotalAmount(realAmount.toString()); // 结算支付金额
         model.setSellerId(SystemConfig.ALIPAY_PID); // 填写卖家支付宝账户pid
         model.setBuyerId(SystemConfig.ALIPAY_APPID); // 填写预授权用户uid，通过预授权冻结接口返回的payer_user_id字段获取
-        if (StringUtils.isNotBlank(subject)) {
+        if (StringUtils.isNotBlank(refundReason)) {
             model.setBody(refundReason); // 可填写备注信息
         } else {
             model.setBody("订单费用");