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

xx-activity/xx-activity-api/src/main/java/com/xxfc/platform/activity/feign/ActivityFeign.java

@@ -80,5 +80,5 @@ public interface ActivityFeign {
 
     @ApiOperation("获取所用优惠卷")
     @GetMapping("/coupon/coupons")
-    Map<Integer, Coupon> coupons();
+    Map<String, Coupon> coupons();
 }

xx-activity/xx-activity-server/src/main/java/com/xxfc/platform/activity/biz/CouponBiz.java

 package com.xxfc.platform.activity.biz;
 
+import cn.hutool.core.collection.CollectionUtil;
 import com.github.wxiaoqi.security.admin.feign.dto.UserDTO;
 import com.github.wxiaoqi.security.common.vo.PageDataVO;
 import com.google.common.collect.Lists;
@@ -124,8 +125,14 @@ public class CouponBiz extends BaseBiz<CouponMapper, Coupon> {
         return  mapper.selectTitles();
     }
 
-    public Map<Integer, Coupon> getCoupons() {
-        Map<Integer, Coupon> coupons = mapper.getCoupons();
-        return coupons ;
+    public Map<String, Coupon> getCoupons() {
+        HashMap<String, Coupon> map = Maps.newHashMap();
+        List<Coupon> coupons = mapper.getCoupons();
+        if (CollectionUtil.isNotEmpty(coupons)) {
+            for (Coupon coupon : coupons) {
+                map.put(coupon.getId().toString(),coupon);
+            }
+        }
+        return map;
     }
 }
\ No newline at end of file

xx-activity/xx-activity-server/src/main/java/com/xxfc/platform/activity/mapper/CouponMapper.java

@@ -19,7 +19,7 @@ public interface CouponMapper extends Mapper<Coupon> {
 
     List<CouponTitleVo> selectTitles();
 
-    Map<Integer, Coupon> getCoupons();
+    List<Coupon> getCoupons();
 
 
 }

xx-activity/xx-activity-server/src/main/java/com/xxfc/platform/activity/rest/CouponController.java

@@ -17,7 +17,7 @@ public class CouponController extends BaseController<CouponBiz, Coupon> {
 
     @ApiOperation("获取所用优惠卷")
     @RequestMapping("/coupons")
-    public Map<Integer, Coupon> coupons() {
+    public Map<String, Coupon> coupons() {
         return baseBiz.getCoupons();
     }
 

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

@@ -39,4 +39,10 @@ public class OrderVehicleCrosstownDto extends OrderVehicleCrosstown {
 
     List<DepositRefundRecord> depositRefundRecord;
 
+    private String deliveryName;
+
+    private String deliveryPhone;
+
+    private Long deliveryTime;
+
 }

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

@@ -175,8 +175,11 @@ public class BackStageOrderController extends CommonBaseController implements Us
                     }
                 }
             }
+            Map<String, Coupon> coupons=null;
+            if (dto.getType()==1) {
+              coupons = activityFeign.coupons();
+            }
 
-            Map<Integer, Coupon> coupons = activityFeign.coupons();
             for (OrderListVo orderPageVO : list) {
                 AppUserVo appUserVo = appvoMap.get(orderPageVO.getUserId());
                 if (appUserVo != null) {
@@ -187,22 +190,24 @@ public class BackStageOrderController extends CommonBaseController implements Us
                     orderPageVO.setMemberName(appUserVo.getMemberName());
                 }
 
-                ArrayList<Coupon> couponList = Lists.newArrayList();
-                ArrayList<Coupon> backCouponList = Lists.newArrayList();
-                if (StringUtils.isNotBlank(orderPageVO.getCouponTickerNos())) {
-                    String[] couponIds = orderPageVO.getCouponTickerNos().split(",");
-                    for (String couponId : couponIds) {
-                        couponList.add(coupons.get(couponId));
+                if (dto.getType()==1&&coupons!=null) {
+                    ArrayList<Coupon> couponList = Lists.newArrayList();
+                    ArrayList<Coupon> backCouponList = Lists.newArrayList();
+                    if (StringUtils.isNotBlank(orderPageVO.getCouponTickerNos())) {
+                        String[] couponIds = orderPageVO.getCouponTickerNos().split(",");
+                        for (String couponId : couponIds) {
+                            couponList.add(coupons.get(couponId));
+                        }
                     }
-                }
-                if (StringUtils.isNotBlank(orderPageVO.getBackCoupon())) {
-                    String[] backCouponIds = orderPageVO.getBackCoupon().split(",");
-                    for (String backCouponId : backCouponIds) {
-                        backCouponList.add(coupons.get(backCouponId));
+                    if (StringUtils.isNotBlank(orderPageVO.getBackCoupon())) {
+                        String[] backCouponIds = orderPageVO.getBackCoupon().split(",");
+                        for (String backCouponId : backCouponIds) {
+                            backCouponList.add(coupons.get(backCouponId));
+                        }
                     }
+                    orderPageVO.setCouponList(couponList);
+                    orderPageVO.setBackCouponList(backCouponList);
                 }
-                orderPageVO.setCouponList(couponList);
-                orderPageVO.setBackCouponList(backCouponList);
 //                String carArticlesJson = orderPageVO.getCarArticlesJson();
 //                if (StringUtils.isNotBlank(carArticlesJson)){
 //                    List<OrderAccompanyDTO> orderAccompanyDTOS = JSONObject.parseArray(carArticlesJson, OrderAccompanyDTO.class);

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

@@ -36,8 +36,10 @@
                      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
+        select o.*, o.violate_amount_detail violateDetail,r.delivery_name as deliveryName,r.delivery_phone as deliveryPhone ,r.delivery_time as deliveryTime
         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}