Merge branch 'master-modify-background-bug-hf' into base-modify

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

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

 package com.xxfc.platform.order.pojo.order;
 
+import com.xxfc.platform.activity.entity.Coupon;
 import com.xxfc.platform.order.entity.DepositRefundRecord;
 import com.xxfc.platform.order.entity.OrderVehicleCrosstown;
 import lombok.Data;
 
+import java.util.Date;
 import java.util.List;
 
 @Data
@@ -35,23 +37,31 @@ public class OrderVehicleCrosstownDto extends OrderVehicleCrosstown {
 
     private String vehicleNumberPlat;
 
+    /**
+     * 操作人昵称
+     */
     private String username;
 
     List<DepositRefundRecord> depositRefundRecord;
 
     /**
-     * 交付人名称
+     * 操作人
+     */
+    private String operatorName;
+
+    /**
+     * 操作人手机
      */
-    private String deliveryName;
+    private String operatorPhone;
 
     /**
-     * 交付人手机号
+     * 操作时间
      */
-    private String deliveryPhone;
+    private Long operatorTime;
 
     /**
-     * 交付时间
+     * 退还优惠卷
      */
-    private Long deliveryTime;
+    private List<Coupon> backCoupons;
 
-}
+}
\ No newline at end of file

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

@@ -18,6 +18,7 @@ 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.google.common.collect.Lists;
+import com.xxfc.platform.activity.entity.Coupon;
 import com.xxfc.platform.activity.feign.ActivityFeign;
 import com.xxfc.platform.order.biz.inner.OrderCalculateBiz;
 import com.xxfc.platform.order.biz.inner.OrderMsgBiz;
@@ -706,8 +707,6 @@ public class BaseOrderBiz extends BaseBiz<BaseOrderMapper, BaseOrder> implements
         }
     }
 
-
-
 //    /**
 //     * 更新（不成功抛异常）
 //     * @param baseOrder
@@ -780,8 +779,6 @@ public class BaseOrderBiz extends BaseBiz<BaseOrderMapper, BaseOrder> implements
         return userFeign;
     }
 
-
-
     /**
      * 订单查询类
      */
@@ -789,4 +786,19 @@ public class BaseOrderBiz extends BaseBiz<BaseOrderMapper, BaseOrder> implements
     public static class QueryOrderDetailDTO extends QueryOrderDTO {
         private String no;
     }
+
+    /**
+     * 获取退还优惠卷
+     * @param orderId
+     */
+    public List<Coupon> getReturnCouponByOrderId(Integer orderId) {
+        BaseOrder baseOrder = mapper.selectByPrimaryKey(orderId);
+        String backCoupon = baseOrder.getBackCoupon();
+        if (StringUtils.isNotBlank(backCoupon)) {
+            String[] couponArray = backCoupon.split(",");
+            return activityFeign.couponsByTickerNoList(Lists.newArrayList(couponArray));
+        }
+        return Lists.newArrayList();
+    }
+
 }
\ No newline at end of file

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

@@ -2,6 +2,7 @@ package com.xxfc.platform.order.biz;
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.bean.copier.CopyOptions;
+import cn.hutool.core.collection.CollectionUtil;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.github.wxiaoqi.security.admin.feign.UserFeign;
@@ -11,6 +12,7 @@ import com.github.wxiaoqi.security.common.biz.BaseBiz;
 import com.github.wxiaoqi.security.common.exception.BaseException;
 import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
 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.CrosstownTypeEnum;
@@ -32,6 +34,7 @@ import com.xxfc.platform.vehicle.pojo.CompanyDetail;
 import com.xxfc.platform.vehicle.pojo.VehicleArrivalVo;
 import com.xxfc.platform.vehicle.pojo.VehicleDepartureVo;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.collections4.map.HashedMap;
 import org.apache.commons.lang3.StringUtils;
 import org.joda.time.format.DateTimeFormat;
@@ -39,6 +42,7 @@ import org.joda.time.format.DateTimeFormatter;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import tk.mybatis.mapper.entity.Example;
 
 import java.math.BigDecimal;
 import java.util.List;
@@ -94,6 +98,11 @@ public class OrderVehicleCrosstownBiz extends BaseBiz<OrderVehicaleCrosstownMapp
                     }
                 }
             }
+            if (value.getType()==2||value.getType()==3){
+                List<Coupon> c = baseOrderBiz.getReturnCouponByOrderId(value.getOrderId());
+                value.setBackCoupons(c);
+
+            }
             updateCrossRecord(value);
             List<DepositRefundRecord> depositRefundRecords = orderDepositRefundRecordBiz.selectByCrossId(value.getId());
             value.setDepositRefundRecord(depositRefundRecords == null || depositRefundRecords.size() <= 0 ? null : depositRefundRecords);
@@ -110,7 +119,11 @@ public class OrderVehicleCrosstownBiz extends BaseBiz<OrderVehicaleCrosstownMapp
         if (value.getOrperaterId() != null) {
             ObjectRestResponse<AppUserDTO> objectRestResponse = userFeign.userDetailById(value.getOrperaterId());
             if (objectRestResponse.getData() != null) {
-                value.setUsername(objectRestResponse.getData().getNickname());
+                AppUserDTO data = objectRestResponse.getData();
+                value.setUsername(data.getNickname());
+                value.setOperatorName(data.getRealname());
+                value.setOperatorPhone(data.getUsername());
+                value.setOperatorTime(value.getCrtTime());
             }
         }
         if (value.getUserLicenseId() != null) {

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

@@ -36,10 +36,8 @@
                      javaType="com.xxfc.platform.order.entity.DepositRefundRecord"/>
     </resultMap>
     <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,r.delivery_name as deliveryName,r.delivery_phone as deliveryPhone ,r.delivery_time as deliveryTime
+        select o.*, o.violate_amount_detail violateDetail
         from order_vehicle_crosstown o
-        left join order_rent_vehicle_detail r
-        on o.order_id=r.order_id
         <where>
             <if test="status != null">
                 and o.status = #{status}