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

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

 package com.github.wxiaoqi.security.admin.feign.dto;
 
+import com.github.wxiaoqi.security.admin.entity.User;
 import lombok.Data;
 import org.apache.commons.lang3.StringUtils;
 
@@ -10,61 +11,13 @@ import java.util.List;
 import java.util.stream.Collectors;
 
 @Data
-public class UserDTO {
-    private Integer id;
-
-    private String username;
-
-    private String password;
-
-    private String name;
-
-    private String birthday;
-
-    private String address;
-
-    private String mobilePhone;
-
-    private String telPhone;
-
-    private String email;
-
-    private String sex;
-
-    private String type;
-
-    private Integer status;
-
-    private String description;
-
-    private Date crtTime;
-
-    private String crtUser;
-
-    private String crtName;
-
-    private String crtHost;
-
-    private Date updTime;
-
-    private String updUser;
-
-    private String updName;
-
-    private String updHost;
-
-    private Integer dataAll;
-
-    private String dataZone;
-
-    private String dataCompany;
-
+public class UserDTO extends User {
     public List<Integer> dataZone2List() {
-        return str2List(this.dataZone);
+        return str2List(getDataZone());
     }
 
     public List<Integer> dataCompany2List() {
-        return str2List(this.dataCompany);
+        return str2List(getDataCompany());
     }
 
     private List<Integer> str2List(String str) {

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

@@ -120,6 +120,16 @@ public class OrderTourDetail implements Serializable {
 	@ApiModelProperty(value = "总人数")
 	private Integer totalNumber;
 
+	//成人人数
+	@Column(name = "adult_num")
+	@ApiModelProperty(value = "成人人数")
+	private Integer adultNum;
+
+	//儿童人数
+	@Column(name = "child_num")
+	@ApiModelProperty(value = "儿童人数")
+	private Integer childNum;
+
 	//出发城市编号
 	@Column(name = "start_city")
 	@ApiModelProperty(value = "出发城市编号")

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

@@ -18,7 +18,5 @@ public class TourBO extends OrderTourDetail implements OrderDetail {
     private BaseOrder order;
     TourGood tourGood;
     List<TourUser> tourUsers;
-    Integer number;
-    Integer childNumber;
     AppUserDTO appUserDTO;
 }

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

@@ -4,6 +4,8 @@ import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.json.JSONUtil;
 import com.github.pagehelper.PageHelper;
+import com.github.wxiaoqi.security.admin.feign.UserFeign;
+import com.github.wxiaoqi.security.admin.feign.dto.UserDTO;
 import com.github.wxiaoqi.security.auth.client.annotation.IgnoreClientToken;
 import com.github.wxiaoqi.security.auth.client.annotation.IgnoreUserToken;
 import com.github.wxiaoqi.security.common.context.BaseContextHandler;
@@ -34,6 +36,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.*;
+import springfox.documentation.annotations.ApiIgnore;
 
 import java.math.BigDecimal;
 
@@ -49,6 +52,9 @@ public class BaseOrderController extends CommonBaseController {
     @Autowired
     ThirdFeign thirdFeign;
 
+    @Autowired
+    UserFeign userFeign;
+
     @Value("${gateway.host}")
     String host;
 
@@ -73,25 +79,22 @@ public class BaseOrderController extends CommonBaseController {
         return new ObjectRestResponse<>().data(PageDataVO.pageInfo(query, () -> baseOrderBiz.pageByParm(query.getSuper())));
     }
 
-//    @ApiOperation("订单详情")
-//    @RequestMapping(value = "/{no}",method = RequestMethod.GET)
-//    @IgnoreClientToken
+//    @RequestMapping(value = "/company/page",method = RequestMethod.GET)
 //    @ResponseBody
-//    public ObjectRestResponse<OrderPageVO> get(@PathVariable String no){
+//    @ApiOperation(value = "结合后台人员所属公司查询订单列表")
+//    @IgnoreClientToken
+//    public ObjectRestResponse<PageDataVO<OrderPageVO>> companyList(QueryOrderDTO dto){
 //        //查询列表数据
 //        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));
+//        dto.setCrtCompanyId(userFeign.userinfoByToken(BaseContextHandler.getToken()).getData().getCompanyId());
+//        Query query = new Query(dto);
+//        return new ObjectRestResponse<>().data(PageDataVO.pageInfo(query, () -> baseOrderBiz.pageByParm(query.getSuper())));
 //    }
 
-    @ApiOperation("根据订单详情处理信息")
-    @RequestMapping(value = "/handle/{no}",method = RequestMethod.GET)
+    @ApiOperation("订单详情")
+    @RequestMapping(value = "/{no}",method = RequestMethod.GET)
     @IgnoreClientToken
     @ResponseBody
     public ObjectRestResponse<OrderPageVO> get(@PathVariable String no){
@@ -99,6 +102,7 @@ public class BaseOrderController extends CommonBaseController {
         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()) {
@@ -107,6 +111,41 @@ public class BaseOrderController extends CommonBaseController {
         return new ObjectRestResponse<>().data(page.getData().get(0));
     }
 
+    @ApiOperation("结合后台人员所属公司查询订单详情")
+    @RequestMapping(value = "/company/{no}",method = RequestMethod.GET)
+    @IgnoreClientToken
+    @ResponseBody
+    public ObjectRestResponse<OrderPageVO> companyGet(@PathVariable String no){
+        //查询列表数据
+        if(StringUtils.isBlank(BaseContextHandler.getUserID())) {
+            throw new BaseException(ResultCode.AJAX_WECHAT_NOTEXIST_CODE);
+        }
+
+        Query query = initCompanyQuery(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){
+//        //查询列表数据
+//        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));
+//    }
+
     private Query initQuery(String no) {
         QueryOrderDetailDTO qodd = new QueryOrderDetailDTO();
         qodd.setCrtUser(Integer.valueOf(BaseContextHandler.getUserID()));
@@ -117,6 +156,18 @@ public class BaseOrderController extends CommonBaseController {
         return query;
     }
 
+    private Query initCompanyQuery(String no) {
+        QueryOrderDetailDTO qodd = new QueryOrderDetailDTO();
+        //查询公司id
+        UserDTO userDto = userFeign.userinfoByToken(BaseContextHandler.getToken()).getData();
+        qodd.setCrtCompanyId(userDto.getCompanyId());
+        qodd.setNo(no);
+        qodd.setLimit(1);
+        qodd.setPage(1);
+        Query query = new Query(qodd);
+        return query;
+    }
+
     @RequestMapping(value = "/pay",method = RequestMethod.POST)
     @ResponseBody
     @ApiOperation(value = "订单支付")
@@ -197,10 +248,13 @@ public class BaseOrderController extends CommonBaseController {
      * 订单查询类
      */
     @Data
-    public class QueryOrderDTO extends PageParam {
+    public class    QueryOrderDTO extends PageParam {
         @ApiModelProperty(hidden = false)
         private Integer crtUser;
 
+        @ApiModelProperty(hidden = false)
+        private Integer crtCompanyId;
+
         @ApiModelProperty(value = "订单状态\n" +
                 "0--删除\n" +
                 "1--创建订单\n" +

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

@@ -5,6 +5,7 @@ import com.xxfc.platform.order.biz.OrderCostDetailBiz;
 import com.xxfc.platform.order.entity.OrderCostDetail;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
+import springfox.documentation.annotations.ApiIgnore;
 
 @Controller
 @RequestMapping("orderCostDetail")

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

@@ -21,6 +21,7 @@ import lombok.Data;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.*;
+import springfox.documentation.annotations.ApiIgnore;
 
 @Controller
 @RequestMapping("orderRentVehicle")

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

@@ -5,6 +5,7 @@ import com.xxfc.platform.order.biz.OrderTemplateBiz;
 import com.xxfc.platform.order.entity.OrderTemplate;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
+import springfox.documentation.annotations.ApiIgnore;
 
 @Controller
 @RequestMapping("orderTemplate")

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

@@ -28,6 +28,7 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.ResponseBody;
+import springfox.documentation.annotations.ApiIgnore;
 
 @Controller
 @RequestMapping("orderTour")
@@ -67,6 +68,8 @@ public class OrderTourController extends BaseController<OrderTourDetailBiz,Order
     public ObjectRestResponse<TourPriceVO> calculatePrice(CalculatePriceVO vo){
         TourBO bo = BeanUtil.toBean(vo, TourBO.class);
         bo.setAppUserDTO(getUserInfo());
+        bo.setAdultNum(vo.getNumber());
+        bo.setChildNum(vo.getChildNumber());
         return ObjectRestResponse.succ(orderTourService.calculatePrice(bo));
     }
 

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/service/OrderTourService.java

@@ -145,18 +145,18 @@ public class OrderTourService extends AbstractOrderHandle<OrderTourDetailBiz, To
                 return IS_CHILD.equals(tourUser.getIsChild());
             }).collect(Collectors.toList());
 
-            detail.setNumber(childs.size());
-            detail.setChildNumber(notChilds.size());
+            detail.setAdultNum(notChilds.size());
+            detail.setChildNum(childs.size());
             detail.setTotalNumber(users.size());
         }else{
-            detail.setTotalNumber(detail.getNumber() + detail.getChildNumber());
+            detail.setTotalNumber(detail.getAdultNum() + detail.getChildNum());
         }
 
 
         //计算旅游价格
         ObjectRestResponse<TourSpePriceVo> objectRestResponse = tourFeign.refund(new TourSpePriceDTO(){{
-            setChildNumber(detail.getChildNumber());
-            setNumber(detail.getNumber());
+            setChildNumber(detail.getChildNum());
+            setNumber(detail.getAdultNum());
             setLevel(LEVEL_DEFAULT);
             setSpeId(detail.getSpePriceId());
             setUserId(detail.getAppUserDTO().getUserid());
@@ -178,8 +178,8 @@ public class OrderTourService extends AbstractOrderHandle<OrderTourDetailBiz, To
         tpv.setOrderAmount(orderAmount);
         tpv.setGoodsAmount(goodsAmount);
         tpv.setRealAmount(realAmount);
-        tpv.setNumber(detail.getNumber());
-        tpv.setChildNumber(detail.getChildNumber());
+        tpv.setNumber(detail.getAdultNum());
+        tpv.setChildNumber(detail.getChildNum());
 
         //设置收费明细
         costDetail(tpv, handlechildren(detail));
@@ -188,10 +188,10 @@ public class OrderTourService extends AbstractOrderHandle<OrderTourDetailBiz, To
 
     private String handlechildren(TourBO detail) {
         StringBuffer childrenStr = new StringBuffer("");
-        if(NUMBER_ZERO < detail.getNumber()) {
+        if(NUMBER_ZERO < detail.getAdultNum()) {
             childrenStr.append(",${tem_0201}");
         }
-        if(NUMBER_ZERO < detail.getChildNumber()) {
+        if(NUMBER_ZERO < detail.getChildNum()) {
             childrenStr.append(",${tem_0202}");
         }
 

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

@@ -29,7 +29,7 @@
         <result javaType="Integer" column="type" property="type"></result>
         <discriminator javaType="Integer" column="type">
             <case value="1" resultType="com.xxfc.platform.order.pojo.order.OrderPageVO">
-                <association column="detail_id" property="orderRentVehicleDetail" select="com.xxfc.platform.order.mapper.OrderRentVehicleDetailMapper.selectByPrimaryKey" javaType="com.xxfc.platform.order.entity.OrderRentVehicleDetail"></association>
+                <association column="{id=detail_id}" property="orderRentVehicleDetail" select="com.xxfc.platform.order.mapper.OrderRentVehicleDetailMapper.pageByParm" javaType="com.xxfc.platform.order.entity.OrderRentVehicleDetail"></association>
             </case>
             <case value="2" resultType="com.xxfc.platform.order.pojo.order.OrderPageVO">
                 <association column="detail_id" property="orderTourDetail" select="com.xxfc.platform.order.mapper.OrderTourDetailMapper.selectByPrimaryKey" javaType="com.xxfc.platform.order.entity.OrderTourDetail"></association>
@@ -44,6 +44,9 @@
             <if test="crtUser != null">
                 and crt_user = #{crtUser}
             </if>
+            <if test="crtCompanyId != null">
+                and crt_user = #{crtCompanyId}
+            </if>
             <if test="status != null">
                 and status = #{status}
             </if>

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

@@ -18,4 +18,21 @@
     <select id="getPScore" resultType="Integer" >
         SELECT round(IFNULL (AVG(score),0)) score  FROM  order_rent_vehicle_detail  WHERE model_id=#{modelId}
      </select>
+
+    <select id="pageByParm" parameterType="Map" resultType="com.xxfc.platform.order.entity.OrderRentVehicleDetail">
+        select *
+        from order_rent_vehicle_detail
+        <where>
+            <if test="id != null">
+                and id = #{id}
+            </if>
+            <if test="startCompanyId != null">
+                and start_company_id = #{startCompanyId}
+            </if>
+            <if test="endCompanyId != null">
+                and end_company_id = #{endCompanyId}
+            </if>
+        </where>
+        order by crt_time desc
+    </select>
 </mapper>
\ No newline at end of file