获取客户端集运首页内容

yudao-module-customer/yudao-module-customer-core/src/main/java/cn/iocoder/yudao/module/customer/dal/dataobject/customer/CustomerDO.java

@@ -544,4 +544,9 @@ public class CustomerDO extends BaseDO {
      */
     private Integer preferenceTransportType;
 
+    /**
+     * 集运提货点
+     */
+    private Long consPickupPoint;
+
 }

yudao-module-member/yudao-module-member-impl/src/main/java/cn/iocoder/yudao/module/member/controller/app/user/AppUserController.java

@@ -179,7 +179,14 @@ public class AppUserController {
                 respVO.setDefaultPay(customerDO.getDefaultPay());
                 respVO.setNoConsignee(customerDO.getNoConsignee());
                 respVO.setFirstDealTime(customerDO.getFirstDealTime());
+                // 设置客户是否设置集运服务
                 respVO.setIsConsService(customerDO.getIsConsService());
+                // 设置客户编号
+                respVO.setCustomerNumber(customerDO.getNumber());
+                // 设置客户集运服务运输方式偏好
+                respVO.setPreferenceTransportType(customerDO.getPreferenceTransportType());
+                // 设置客户集运常用提单点
+                respVO.setConsPickupPoint(customerDO.getConsPickupPoint());
             }else {
                 respVO.setDefaultPay(Boolean.FALSE);
                 respVO.setNoConsignee(Boolean.FALSE);

yudao-module-member/yudao-module-member-impl/src/main/java/cn/iocoder/yudao/module/member/controller/app/user/vo/AppUserInfoRespVO.java

@@ -76,6 +76,15 @@ public class AppUserInfoRespVO {
     @ApiModelProperty(value = "是否开启集运服务：1 是  0 否")
     private Boolean isConsService ;
 
+    @ApiModelProperty(value = "集运服务运输方式偏好")
+    private Integer preferenceTransportType;
+
+    @ApiModelProperty(value = "集运提货点")
+    private Long consPickupPoint;
+
+    @ApiModelProperty(value = "客户编号")
+    private String customerNumber;
+
     @ApiModelProperty(value = "客户档案记录的首次成交时间")
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
     @JsonFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)

yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/dal/mysql/cons/ConsAppMapper.java

+package cn.iocoder.yudao.module.order.dal.mysql.cons;
+
+
+import cn.iocoder.yudao.framework.mybatis.core.mapper.AbstractMapper;
+import cn.iocoder.yudao.module.order.dal.dataobject.cons.ConsDO;
+import cn.iocoder.yudao.module.order.vo.cons.ConsBackVO;
+import cn.iocoder.yudao.module.order.vo.cons.ConsQueryVO;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * 集运包裹主 Mapper
+ * @author 系统管理员
+ */
+@Mapper
+public interface ConsAppMapper extends AbstractMapper<ConsDO> {
+
+    Long selectCount(@Param("query") ConsQueryVO query);
+
+    ConsBackVO selectInfoById(Long id);
+
+    List<ConsBackVO> selectAppPage(@Param("start") int start, @Param("size") int size, @Param("query") ConsQueryVO query);
+}
+

yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/dal/mysql/cons/ConsMapper.java

@@ -106,7 +106,5 @@ public interface ConsMapper extends AbstractMapper<ConsDO> {
     }
     List<ConsBackVO> myConsPageList(@Param("start") int start, @Param("size") int size, @Param("query") ConsQueryVO query);
     Long myConsCount(@Param("query") ConsQueryVO query);
-
-    ConsBackVO selectInfoById(Long id);
 }
 

yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/service/cons/ConsService.java

@@ -85,6 +85,15 @@ public interface ConsService extends IService<ConsDO> {
      */
     PageResult<ConsBackVO> getConsPage(ConsQueryVO query, PageVO page);
 
+
+    /**
+     * 获取客户端集运我的包裹分页
+     * @param query 请求参数
+     * @param page
+     * @return
+     */
+    PageResult<ConsBackVO> getMyConsPage(ConsQueryVO query, PageVO page);
+
     /**
      * 获得集运包裹主列表, 用于 Excel 导出
      * @param query 查询

yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/service/cons/ConsServiceImpl.java

 package cn.iocoder.yudao.module.order.service.cons;
 
 import cn.iocoder.yudao.framework.common.exception.ServiceException;
+import cn.iocoder.yudao.framework.common.pojo.CommonResult;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.framework.i18n.core.I18nMessage;
 import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
@@ -28,6 +29,7 @@ import cn.iocoder.yudao.module.order.dal.dataobject.consItem.ConsItemDO;
 import cn.iocoder.yudao.module.order.dal.dataobject.consLocation.ConsLocationDO;
 import cn.iocoder.yudao.module.order.dal.dataobject.consMedia.ConsMediaDO;
 import cn.iocoder.yudao.module.order.dal.dataobject.order.OrderDO;
+import cn.iocoder.yudao.module.order.dal.mysql.cons.ConsAppMapper;
 import cn.iocoder.yudao.module.order.dal.mysql.cons.ConsMapper;
 import cn.iocoder.yudao.module.order.dal.mysql.consApproval.ConsApprovalMapper;
 import cn.iocoder.yudao.module.order.dal.mysql.consFee.ConsFeeMapper;
@@ -53,6 +55,7 @@ import cn.iocoder.yudao.module.order.vo.consLocation.ConsLocationUpdateReqVO;
 import cn.iocoder.yudao.module.order.vo.consMedia.ConsMediaCreateReqVO;
 import cn.iocoder.yudao.module.order.vo.consTrackingRecord.ConsTrackingRecordBackVO;
 import cn.iocoder.yudao.module.order.vo.consTrackingRecord.ConsTrackingRecordCreateReqVO;
+import cn.iocoder.yudao.module.order.vo.order.OrderBackPageVO;
 import cn.iocoder.yudao.module.order.vo.order.OrderBackVO;
 import cn.iocoder.yudao.module.order.vo.orderConsignee.OrderConsigneeBackVO;
 import cn.iocoder.yudao.module.order.vo.orderConsignor.OrderConsignorBackVO;
@@ -154,6 +157,10 @@ public class ConsServiceImpl extends AbstractService<ConsMapper, ConsDO> impleme
     @Resource
     private ConsExceptionService consExceptionService;
 
+    @Resource
+    private ConsAppMapper consAppMapper;
+
+
     @Override
     @Transactional
     public Long createCons(ConsCreateReqVO createReqVO) {
@@ -377,8 +384,26 @@ public class ConsServiceImpl extends AbstractService<ConsMapper, ConsDO> impleme
     }
 
     @Override
-    public ConsBackVO getConsInfo(Long id){
-        return consMapper.selectInfoById(id);
+    public ConsBackVO getConsInfo(Long id) {
+        return consAppMapper.selectInfoById(id);
+    }
+
+    @Override
+    public PageResult<ConsBackVO> getMyConsPage(ConsQueryVO query, PageVO pageVO) {
+        // 设置当前语言
+        if (Objects.isNull(query.getLang())) {
+            query.setLang(I18nMessage.getLang());
+        }
+        // 获取总数
+        Long total = consAppMapper.selectCount(query);
+        // 根据页码计算分页数量
+        IPage<OrderBackPageVO> mpPage = MyBatisUtils.buildPage(pageVO);
+        int start = (pageVO.getPage() - 1) * pageVO.getRows();
+        int size = pageVO.getRows();
+        // 获取列表数据
+        List<ConsBackVO> list = consAppMapper.selectAppPage(start, size, query);
+
+        return new PageResult<>(list, total, mpPage.getSize(), pageVO.getPage(), (total + mpPage.getSize() - 1) / mpPage.getSize());
     }
 
     @Override
@@ -690,11 +715,11 @@ public class ConsServiceImpl extends AbstractService<ConsMapper, ConsDO> impleme
     public void createConsExitApplication(ConsRetiredWarehouseCreateReqVO query) {
         ConsDO consDO = consMapper.selectById(query.getConsId());
         OrderBackInfoDto info = orderQueryService.info(consDO.getOrderId());
-        if ( (info.getStatus() == 5 && info.getTransportId() == 3 && info.getAirShipment() == 12)|| info.getStatus() == 11){
-            throw new ServiceException(30005, "订单"+info.getOrderNo()+"当前状态下不允许撤销包裹");
+        if ((info.getStatus() == 5 && info.getTransportId() == 3 && info.getAirShipment() == 12) || info.getStatus() == 11) {
+            throw new ServiceException(30005, "订单" + info.getOrderNo() + "当前状态下不允许撤销包裹");
         }
         //未入仓，直接审核通过
-        if (info.getStatus() < OrderStatusEnum.IN_WAREHOUSE.getValue()){
+        if (info.getStatus() < OrderStatusEnum.IN_WAREHOUSE.getValue()) {
             ConsApprovalDO consApprovalDO = new ConsApprovalDO();
             consApprovalDO.setConsId(query.getConsId());
             consApprovalDO.setApprovalType(4);
@@ -715,7 +740,7 @@ public class ConsServiceImpl extends AbstractService<ConsMapper, ConsDO> impleme
             consTrackingRecordService.createConsTrackingRecord(consTrackingRecordCreateReqVO);
             consDO.setOrderId(null);
             consMapper.updateById(consDO);
-        }else {
+        } else {
             ConsApprovalDO consApprovalDO = new ConsApprovalDO();
             consApprovalDO.setConsId(query.getConsId());
             consApprovalDO.setApprovalType(4);
@@ -739,7 +764,7 @@ public class ConsServiceImpl extends AbstractService<ConsMapper, ConsDO> impleme
     @Override
     public void editAndUpdateConsRetiredWarehouseDeal(ConsRetiredWarehouseCreateReqVO query) {
         ConsApprovalDO consApprovalDO = consApprovalMapper.selectOne(new LambdaQueryWrapperX<ConsApprovalDO>().eq(ConsApprovalDO::getFormId, query.getFormId()));
-        if (query.getIsDeal()){
+        if (query.getIsDeal()) {
             ConsFeeDO consFeeDO = new ConsFeeDO();
             consFeeDO.setConsId(consApprovalDO.getConsId());
             consFeeDO.setFeeType(19);

yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/vo/cons/ConsBackVO.java

@@ -9,7 +9,14 @@ import cn.iocoder.yudao.module.order.dal.dataobject.consSpecialNeed.ConsSpecialN
 import cn.iocoder.yudao.module.order.vo.consItem.ConsItemBackVO;
 import cn.iocoder.yudao.module.order.vo.consItem.ConsItemBaseVO;
 import cn.iocoder.yudao.module.order.vo.consLocation.ConsLocationUpdateReqVO;
+import cn.iocoder.yudao.module.order.vo.consMedia.ConsMediaBackVO;
 import cn.iocoder.yudao.module.order.vo.consTrackingRecord.ConsTrackingRecordBackVO;
+import cn.iocoder.yudao.module.order.vo.order.OrderBackVO;
+
+import cn.iocoder.yudao.module.order.vo.consTrackingRecord.ConsTrackingRecordBaseVO;
+
+import cn.iocoder.yudao.module.order.vo.orderItem.OrderItemBackVO;
+
 import lombok.*;
 
 import java.math.BigDecimal;
@@ -311,6 +318,7 @@ public class ConsBackVO {
      */
     private WarehouseBackVO endWarehouse;
 
+<<<<<<< Updated upstream
     @ApiModelProperty("集运重量上限")
     private BigDecimal consWeightLimit ;
 
@@ -348,4 +356,12 @@ public class ConsBackVO {
 
     @ApiModelProperty("特需列表")
     List<ConsSpecialNeedDO> consSpecialNeeds;
+
+    /**
+     * 包裹影像
+     */
+    private List<ConsMediaBackVO> consMedia;
+
+    private OrderBackVO order;
+
 }

yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/vo/cons/ConsQueryVO.java

@@ -26,6 +26,9 @@ public class ConsQueryVO {
     @ApiModelProperty(value = "订单ID，关联订单表")
     private Long orderId;
 
+    @ApiModelProperty(value = "订单编号")
+    private String orderNo;
+
     @ApiModelProperty(value = "平台ID，关联平台表数据，为后面系统对接预留字段")
     private Long platformId;
 
@@ -38,6 +41,9 @@ public class ConsQueryVO {
     @ApiModelProperty(value = "包裹状态，来自字典表，cons_status")
     private Integer status;
 
+    @ApiModelProperty(value = "多个包裹状态，来自字典表，cons_status")
+    private List<Integer> statusList;
+
     @ApiModelProperty(value = "快递公司ID，对应快递公司表")
     private Long expressId;
 
@@ -154,9 +160,12 @@ public class ConsQueryVO {
     @ApiModelProperty(value = "跟进客服")
     private List<Long> salesmanIds;
 
-    @ApiModelProperty(value = "订单状态详情见字典：cons_status")
-    private List<Integer> statusList;
-
     @ApiModelProperty(value = "渠道ids")
     private List<Long> channelIds;
+
+    @ApiModelProperty(value = "根据快递单号、提单号、订单号、商品名称查询")
+    private String keyword;
+
+    @ApiModelProperty(value = "根据商品名称查询")
+    private String productName;
 }

yudao-module-order/yudao-module-order-core/src/main/resources/mapper/cons/ConsMapper.xml

@@ -58,145 +58,6 @@
         limit #{start}, #{size}
     </select>
 
-    <resultMap id="consInfoResultMap" type="cn.iocoder.yudao.module.order.vo.cons.ConsBackVO">
-        <id property="id" column="id"/>
-        <result  property="consNum" column="cons_num"/>
-        <result  property="transportId" column="transport_id"/>
-        <result  property="orderId" column="order_id"/>
-        <result  property="orderNo" column="order_no"/>
-        <result  property="needInspect" column="need_inspect"/>
-        <result  property="status" column="status"/>
-        <result  property="inspectStatus" column="inspect_status"/>
-        <result  property="worth" column="worth"/>
-        <result  property="createTime" column="create_time"/>
-        <result  property="creator" column="creator"/>
-        <result  property="creatorName" column="creator_name"/>
-        <result  property="expressNo" column="express_no"/>
-        <result  property="remarks" column="remarks"/>
-        <!-- 获取快递公司 -->
-        <association property="express" javaType="cn.iocoder.yudao.module.ecw.controller.admin.express.vo.ExpressBaseVO" >
-            <id property="id" column="express_id" />
-            <result property="companyName" column="company_name" />
-            <result property="companyNameEn" column="company_name_en" />
-            <result property="companyNameFr" column="company_name_fr" />
-        </association>
-        <!-- 获取始发仓库 -->
-        <association property="startWarehouse" javaType="cn.iocoder.yudao.module.depository.vo.warehouse.WarehouseBackVO">
-            <id property="id" column="ware_id" />
-            <result property="titleZh" column="start_warehouse_title_zh" />
-            <result property="titleEn" column="start_warehouse_title_en" />
-            <result property="titleFr" column="start_warehouse_title_fr" />
-        </association>
-        <!-- 获取目的仓库 -->
-        <association property="endWarehouse" javaType="cn.iocoder.yudao.module.depository.vo.warehouse.WarehouseBackVO">
-            <id property="id" column="consignee_warehouse_id" />
-            <result property="titleZh" column="end_warehouse_title_zh" />
-            <result property="titleEn" column="end_warehouse_title_en" />
-            <result property="titleFr" column="end_warehouse_title_fr" />
-            <!-- 获取目的国家信息 -->
-            <association property="country" javaType="cn.iocoder.yudao.module.ecw.controller.admin.region.vo.RegionBackVO">
-                <id property="id" column="country_id" />
-                <result property="countryTitleZh" column="country_title_zh" />
-                <result property="countryTitleEn" column="country_title_en" />
-                <result property="countryTitleFr" column="country_title_fr" />
-            </association>
-            <!-- 获取目的城市信息 -->
-            <association property="city" javaType="cn.iocoder.yudao.module.ecw.controller.admin.region.vo.RegionBackVO">
-                <id property="id" column="city_id" />
-                <result property="cityTitleZh" column="city_title_zh" />
-                <result property="cityTitleEn" column="city_title_en" />
-                <result property="cityTitleFr" column="city_title_fr" />
-            </association>
-        </association>
-        <!-- 获取包裹明细 -->
-        <collection property="consItem" ofType="cn.iocoder.yudao.module.order.vo.consItem.ConsItemBaseVO" >
-            <id property="id" column="cons_item_id" />
-            <result property="prodId" column="prod_id"/>
-            <result property="quantity" column="quantity"/>
-            <result property="inspectionNum" column="inspection_num" />
-            <result property="inspectionUnit" column="inspection_unit" />
-            <result property="inspectionQuantity" column="inspection_quantity" />
-            <result property="inspectionVolume" column="inspection_volume" />
-            <result property="inspectionWeight" column="inspection_weight" />
-            <!-- 获取商品名称 -->
-            <association property="product" javaType="cn.iocoder.yudao.module.product.vo.product.ProductBaseVO">
-                <id property="id" column="product_id" />
-                <result property="titleZh" column="title_zh"/>
-                <result property="titleEn" column="title_en"/>
-                <result property="titleFr" column="title_fr"/>
-            </association>
-        </collection>
-        <!-- 包裹动态 -->
-        <collection property="trackingRecord" ofType="cn.iocoder.yudao.module.order.vo.consTrackingRecord.ConsTrackingRecordBackVO">
-            <id property="id" column="tracking_record_id" />
-            <id property="status" column="tracking_record_status" />
-            <id property="trackingTime" column="tracking_time" />
-        </collection>
-    </resultMap>
-
-    <select id="selectInfoById" resultMap="consInfoResultMap" >
-        SELECT c.id,
-               c.cons_num ,
-               c.transport_id ,
-               c.order_id,
-               if(c.order_id > 0 , (select order_no from  ecw_order where deleted = 0 and order_id = c.order_id ) , '') as order_no,
-               c.express_no,
-               if(c.op_source = 1 , (select mu.nickname from member_user as mu where mu.id = c.creator) , (select su.nickname from system_user as su where su.id = c.creator)) as creator_name,
-               c.need_inspect ,
-               c.`status`,
-               c.inspect_status ,
-               c.worth,
-               c.create_time,
-               c.creator,
-               c.remarks,
-               c.ware_id,
-               c.consignee_warehouse_id,
-               ci.id as cons_item_id,
-               ci.prod_id,
-               ci.quantity,
-               ci.inspection_num,
-               ci.inspection_unit,
-               ci.inspection_quantity,
-               ci.inspection_volume,
-               ci.inspection_weight,
-               p.id as product_id,
-               p.title_zh,
-               p.title_en,
-               p.title_fr,
-               e.id as express_id,
-               e.company_name,
-               e.company_name_en,
-               e.company_name_fr,
-               ctr.id as tracking_record_id,
-               ctr.status as tracking_record_status,
-               ctr.tracking_time,
-               end_warehouse.guojia AS country_id,
-               end_warehouse.shi AS city_id,
-               start_warehouse.title_zh as start_warehouse_title_zh,
-               start_warehouse.title_en as start_warehouse_title_en,
-               start_warehouse.title_fr as start_warehouse_title_fr,
-               end_warehouse.title_zh as end_warehouse_title_zh,
-               end_warehouse.title_en as end_warehouse_title_en,
-               end_warehouse.title_fr as end_warehouse_title_fr,
-               country.title_zh as country_title_zh,
-               country.title_en as country_title_en,
-               country.title_fr as country_title_fr,
-               city.title_fr as city_title_zh,
-               city.title_fr as city_title_en,
-               city.title_fr as city_title_fr
-        FROM ecw_cons as c
-                 LEFT JOIN ecw_cons_item as ci ON ci.cons_id = c.id AND ci.deleted = 0
-                 LEFT JOIN ecw_product as p ON p.id = ci.prod_id AND p.deleted = 0
-                 LEFT JOIN ecw_express as e ON e.id = c.express_id AND e.deleted = 0
-                 LEFT JOIN ecw_cons_tracking_record as ctr ON ctr.cons_id = c.id AND ctr.deleted = 0
-                 LEFT JOIN ecw_warehouse as start_warehouse ON start_warehouse.id = c.ware_id AND start_warehouse.deleted = 0
-                 LEFT JOIN ecw_warehouse as end_warehouse ON end_warehouse.id = c.consignee_warehouse_id AND end_warehouse.deleted = 0
-                 LEFT JOIN ecw_region as country ON country.id = end_warehouse.guojia AND country.deleted = 0
-                 LEFT JOIN ecw_region as city ON city.id = end_warehouse.shi AND city.deleted = 0
-        WHERE c.id = #{id} AND c.deleted = 0
-    </select>
-
-
     <sql id="myConsQuery">
         <if test="query.numberKey != null and query.numberKey != '' ">
             AND concat(IFNULL(o.`order_no`,''), IFNULL(cons.`cons_num`,''), IFNULL(cons.`express_no`,'')) like

yudao-module-order/yudao-module-order-rest/src/main/java/cn/iocoder/yudao/module/order/controller/app/cons/AppConsController.java

 package cn.iocoder.yudao.module.order.controller.app.cons;
 
 import cn.iocoder.yudao.framework.common.pojo.CommonResult;
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.framework.common.util.code.CodeUtils;
 import cn.iocoder.yudao.framework.i18n.core.I18nMessage;
 import cn.iocoder.yudao.framework.i18n.core.LangEnum;
 import cn.iocoder.yudao.framework.i18n.core.Languages;
+import cn.iocoder.yudao.framework.mybatis.core.vo.PageVO;
 import cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils;
 import cn.iocoder.yudao.module.customer.dal.dataobject.customer.CustomerDO;
 import cn.iocoder.yudao.module.customer.service.customer.CustomerService;
@@ -15,10 +17,7 @@ import cn.iocoder.yudao.module.order.dal.dataobject.cons.ConsDO;
 import cn.iocoder.yudao.module.order.service.cons.ConsService;
 import cn.iocoder.yudao.module.order.service.cons.ConsServiceImpl;
 import cn.iocoder.yudao.module.order.service.consItem.ConsItemService;
-import cn.iocoder.yudao.module.order.vo.cons.ConsBackVO;
-import cn.iocoder.yudao.module.order.vo.cons.ConsBaseVO;
-import cn.iocoder.yudao.module.order.vo.cons.ConsCreateReqVO;
-import cn.iocoder.yudao.module.order.vo.cons.ConsUpdateReqVO;
+import cn.iocoder.yudao.module.order.vo.cons.*;
 import cn.iocoder.yudao.module.order.vo.consItem.ConsItemBackVO;
 import cn.iocoder.yudao.module.order.vo.consItem.ConsItemQueryVO;
 import io.swagger.annotations.Api;
@@ -72,7 +71,6 @@ public class AppConsController {
         return success(true);
     }
 
-
     @GetMapping("/get")
     @ApiOperation("获取集运包裹")
     @ApiImplicitParam(name = "id", value = "包裹id", required = true, example = "1024", dataTypeClass = Long.class)
@@ -83,7 +81,6 @@ public class AppConsController {
         return success(consInfo);
     }
 
-
     @GetMapping("/express_no")
     @ApiOperation("获取快递单号")
     public CommonResult<String> getExpressNo(){
@@ -96,5 +93,11 @@ public class AppConsController {
         return success(expressNo);
     }
 
+    @GetMapping("/page")
+    @ApiOperation("获取我的集运包裹分页")
+    public CommonResult<PageResult<ConsBackVO>> getConsPage(ConsQueryVO consQueryVO, PageVO pageVO){
+        PageResult<ConsBackVO> myConsPage = consService.getMyConsPage(consQueryVO, pageVO);
+        return success(myConsPage);
+    }
 
 }