Merge branch 'base-modify' of http://113.105.137.151:22280/youjj/cloud-platform into base-modify

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

@@ -6,6 +6,9 @@ import com.xxfc.platform.order.entity.OrderTourDetail;
 import com.xxfc.platform.order.mapper.OrderTourDetailMapper;
 import com.github.wxiaoqi.security.common.biz.BaseBiz;
 
+import java.util.List;
+import java.util.Map;
+
 /**
  * 旅游订单详情
  *
@@ -15,4 +18,10 @@ import com.github.wxiaoqi.security.common.biz.BaseBiz;
  */
 @Service
 public class OrderTourDetailBiz extends BaseBiz<OrderTourDetailMapper,OrderTourDetail> {
+    private static Map<Integer, List<Integer>> ChargeOffAble;
+
+
+    public void ChargeOff() {
+
+    }
 }
\ No newline at end of file

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

@@ -73,8 +73,25 @@ public class BaseOrderController extends CommonBaseController {
         return new ObjectRestResponse<>().data(PageDataVO.pageInfo(query, () -> baseOrderBiz.pageByParm(query.getSuper())));
     }
 
-    @ApiOperation("订单详情")
-    @RequestMapping(value = "/{no}",method = RequestMethod.GET)
+//    @ApiOperation("订单详情")
+//    @RequestMapping(value = "/{no}",method = RequestMethod.GET)
+//    @IgnoreClientToken
+//    @ResponseBody
+//    public ObjectRestResponse<OrderPageVO> get(@PathVariable String no){
+//        //查询列表数据
+//        if(StringUtils.isBlank(BaseContextHandler.getUserID())) {
+//            throw new BaseException(ResultCode.AJAX_WECHAT_NOTEXIST_CODE);
+//        }
+//        Query query = initQuery(no);
+//        PageDataVO<OrderPageVO> page = PageDataVO.pageInfo(query, () -> baseOrderBiz.pageByParm(query.getSuper()));
+//        if(page.getData().isEmpty()) {
+//            throw new BaseException(ResultCode.NOTEXIST_CODE);
+//        }
+//        return new ObjectRestResponse<>().data(page.getData().get(0));
+//    }
+
+    @ApiOperation("根据订单详情处理信息")
+    @RequestMapping(value = "/handle/{no}",method = RequestMethod.GET)
     @IgnoreClientToken
     @ResponseBody
     public ObjectRestResponse<OrderPageVO> get(@PathVariable String no){

xx-tour/xx-tour-server/src/main/java/com/xxfc/platform/tour/rest/admin/TourTagAdminController.java

@@ -140,10 +140,4 @@ public class TourTagAdminController extends TourBaseController<TourTagBiz> {
         List<TourTag> tourTags = getBaseBiz().findTourTagNameAndIdsByStatus(0);
         return ObjectRestResponse.succ(tourTags);
     }
-
-    @GetMapping
-    public void AssertException(){
-
-        Assert.isNull(TourTag.builder().build(),"Assert测试成功了");
-    }
 }
\ No newline at end of file

xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/entity/VehicleModel.java

@@ -63,11 +63,6 @@ public class VehicleModel implements Serializable {
 	@ApiModelProperty(value = "价格")
 	private BigDecimal price;
 
-	//会员价格
-	@Column(name = "vip_price")
-	@ApiModelProperty(value = "会员价格")
-	private BigDecimal vipPrice;
-
 	//总押金
 	@Column(name = "deposit")
 	@ApiModelProperty(value = "总押金")
@@ -138,4 +133,16 @@ public class VehicleModel implements Serializable {
     @ApiModelProperty(value = "车辆")
     private  Vehicle vehicle;
 
+	@Column(name = "rent_discount_status")
+	@ApiModelProperty(value = "租车优惠状态 0--没有优惠;1--会员折扣;2--固定值")
+	private Integer rentDiscountStatus;
+
+	@Column(name = "rent_discount_price")
+	@ApiModelProperty(value = "租车优惠价格")
+	private  BigDecimal RentDiscountPrice;
+
+	@Column(name = "buy_price")
+	@ApiModelProperty(value = "购买价格")
+	private  BigDecimal buyPrice;
+
 }