Merge branch 'dev-chw' of http://113.105.137.151:22280/youjj/cloud-platform into dev-chw

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

@@ -59,7 +59,7 @@ public class ActivityBiz extends BaseBiz<ActivityMapper, Activity> {
             Map<Integer, AppUserVo> userMap = new HashMap<>();
             if (CollectionUtils.isNotEmpty(appUserVos)){
                 for (AppUserVo appUserVo:appUserVos){
-                    userMap.put(appUserVo.getId(),appUserVo);
+                    userMap.put(appUserVo.getUserid(),appUserVo);
                 }
             }
             for(ActivityVo activityVo : list){

xx-order/xx-order-api/src/main/java/com/xxfc/platform/order/entity/SpecialRent.java

@@ -231,6 +231,10 @@ public class SpecialRent implements Serializable {
 	@ApiModelProperty(value = "商品信息json")
 	private String goodsJson;
 
+	public void setGoodsJson(String goodsJson) {
+		this.goodsJson = goodsJson;
+	}
+
 	@Column(name = "brand_name")
 	@ApiModelProperty("品牌名称")
 	private String brandName;

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

@@ -26,11 +26,15 @@ import com.xxfc.platform.order.pojo.order.add.AddRentVehicleDTO;
 import com.xxfc.platform.order.service.OrderRentVehicleService;
 import com.xxfc.platform.vehicle.entity.Vehicle;
 import com.xxfc.platform.vehicle.feign.VehicleFeign;
+import com.xxfc.platform.vehicle.pojo.vo.VehicleVO;
+import io.swagger.annotations.ApiModelProperty;
 import io.swagger.annotations.ApiOperation;
 import lombok.Data;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import javax.persistence.Column;
+
 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.order.entity.SpecialRent.*;
@@ -117,6 +121,12 @@ public class SpecialRentController extends BaseController<SpecialRentBiz, Specia
         Query query = new Query(dto);
         PageDataVO<SpecialRentVO> pages = PageDataVO.pageInfo(query, () -> baseBiz.selectByWeekend(w -> {
             w.andIn(SpecialRent::getStatus, CollUtil.newArrayList(STATUS_CRT, STATUS_AUTOCNL_ORDER, STATUS_AUTOCNL_TOPAY, STATUS_AUTOCNL_PAYED));
+            if(null != dto.getStartCityCode()) {
+                w.andEqualTo(SpecialRent::getStartCityCode, dto.getStartCityCode());
+            }
+            if(null != dto.getEndCityCode()) {
+                w.andEqualTo(SpecialRent::getEndCityCode, dto.getEndCityCode());
+            }
             return w;
         }, " crt_time desc "), SpecialRentVO.class);
 
@@ -212,12 +222,12 @@ public class SpecialRentController extends BaseController<SpecialRentBiz, Specia
 
     @Data
     public static class SpecialRentVO extends SpecialRent{
-        Vehicle vehicle;
+        VehicleVO vehicle;
         @Override
         public void setGoodsJson(String goodsJson) {
             super.setGoodsJson(goodsJson);
             if(StrUtil.isNotBlank(goodsJson)) {
-                setVehicle(JSONUtil.toBean(goodsJson, Vehicle.class));
+                setVehicle(JSONUtil.toBean(goodsJson, VehicleVO.class));
                 super.setGoodsJson(null);
             }
         }
@@ -226,8 +236,18 @@ public class SpecialRentController extends BaseController<SpecialRentBiz, Specia
     @Data
     public static class QueryDTO extends PageParam {
         Integer userId;
+        /**
+         * 开始城市编码
+         */
+        @ApiModelProperty(value = "开始城市编码")
+        private Integer startCityCode;
+
+        /**
+         * 结束城市编码
+         */
+        @ApiModelProperty(value = "结束城市编码")
+        private Integer endCityCode;
     }
-
     @Data
     public static class SpecialOrderDTO extends AddRentVehicleDTO {
         Integer specialId;