维多利亚

hx-service-api/victoriatourist-api/src/main/java/com/fjhx/params/logistics/DataInfoPageDto.java

@@ -0,0 +1,11 @@
+package com.fjhx.params.logistics;
+
+import com.fjhx.base.BaseSelectDto;
+import lombok.Getter;
+import lombok.Setter;
+
+@Getter
+@Setter
+public class DataInfoPageDto extends BaseSelectDto {
+
+}

hx-service-api/victoriatourist-api/src/main/java/com/fjhx/params/logistics/DataInfoPageVo.java

@@ -0,0 +1,76 @@
+package com.fjhx.params.logistics;
+
+import lombok.Getter;
+import lombok.Setter;
+
+import java.util.Date;
+
+@Getter
+@Setter
+public class DataInfoPageVo {
+
+    /**
+     * 物流id
+     *
+     * @table logistics_info
+     * @field id
+     */
+    private Long id;
+
+    /**
+     * 业务id
+     *
+     * @table logistics_info
+     * @field business_id
+     */
+    private Long businessId;
+
+    /**
+     * 业务类型（1采购出货 2京东订单出货）
+     *
+     * @table logistics_info
+     * @field business_type
+     */
+    private Integer businessType;
+
+    /**
+     * 物流单号
+     *
+     * @table logistics_info
+     * @field code
+     */
+    private String code;
+
+    /**
+     * 物流公司编码
+     *
+     * @table logistics_info
+     * @field logistics_company_code
+     */
+    private String logisticsCompanyCode;
+
+    /**
+     * 物流状态（快递100的状态）-1未找到快递信息 0在途，1揽收，2疑难，3签收，4退签，5派件，6退回，7转投，8清关，14拒签
+     *
+     * @table logistics_info
+     * @field logistics_status
+     */
+    private Integer logisticsStatus;
+
+    /**
+     * 创建人id
+     *
+     * @table logistics_info
+     * @field create_user
+     */
+    private Long createUser;
+
+    /**
+     * 创建时间
+     *
+     * @table logistics_info
+     * @field create_time
+     */
+    private Date createTime;
+
+}

hx-service/victoriatourist/src/main/java/com/fjhx/controller/logistics/LogisticsInfoController.java

@@ -4,11 +4,14 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.fjhx.constants.StatusConstant;
 import com.fjhx.constants.logistics.LogisticsConstant;
 import com.fjhx.entity.logistics.LogisticsInfo;
+import com.fjhx.params.logistics.DataInfoPageDto;
+import com.fjhx.params.logistics.DataInfoPageVo;
 import com.fjhx.params.logistics.DeliverDetailsVo;
 import com.fjhx.params.logistics.LogisticsInfoVo;
 import com.fjhx.service.logistics.LogisticsInfoService;
 import org.springblade.core.tool.api.R;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -64,15 +67,14 @@ public class LogisticsInfoController {
 
     @PostMapping("/list")
     public R list() {
-        List<LogisticsInfo> list = logisticsInfoService.list(q -> q.eq(LogisticsInfo::getStatus, StatusConstant.NO).eq(LogisticsInfo::getLogisticsStatus, LogisticsConstant.KD100Status.STATUS_3));
+        List<LogisticsInfo> list = logisticsInfoService.list(q -> q
+                .eq(LogisticsInfo::getStatus, StatusConstant.NO)
+                .eq(LogisticsInfo::getLogisticsStatus, LogisticsConstant.KD100Status.STATUS_3));
         return R.success(list);
     }
 
     /**
      * 查询物流单号下拉款
-     *
-     * @param entity
-     * @return
      */
     @PostMapping("/code/select")
     public R codeSelect(@RequestBody LogisticsInfoVo entity) {
@@ -90,9 +92,6 @@ public class LogisticsInfoController {
 
     /**
      * 到货通知
-     *
-     * @param entity
-     * @return
      */
     @PostMapping("/arrival/notice")
     public R arrivalNotice(@RequestBody LogisticsInfoVo entity) {
@@ -100,5 +99,14 @@ public class LogisticsInfoController {
         return R.success();
     }
 
+    /**
+     * 物流数据分页列表
+     */
+    @PostMapping(value = "/dataInfoPage")
+    public R dataInfoPage(@Validated @RequestBody DataInfoPageDto dto) {
+        Page<DataInfoPageVo> result = logisticsInfoService.dataInfoPage(dto);
+        return R.success(result);
+    }
+
 }
 

hx-service/victoriatourist/src/main/java/com/fjhx/controller/thirdpartypush/ThirdPartyPushController.java

@@ -30,7 +30,6 @@ public class ThirdPartyPushController {
      * kd100回调
      *
      * @param data 物流信息
-     * @return
      */
     @PostMapping("/kd100")
     public JSONObject kd100(@RequestBody String data) {
@@ -44,9 +43,10 @@ public class ThirdPartyPushController {
 
         JSONObject returnResult = new JSONObject();
         returnResult.put("result", true);
-        returnResult.put("returnCode", "200");
+        returnResult.put("returnCode", 200);
         returnResult.put("message", "成功");
         return returnResult;
     }
+
 }
 

hx-service/victoriatourist/src/main/java/com/fjhx/mapper/logistics/LogisticsInfoMapper.java

@@ -3,6 +3,7 @@ package com.fjhx.mapper.logistics;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.fjhx.entity.logistics.LogisticsInfo;
+import com.fjhx.params.logistics.DataInfoPageVo;
 import com.fjhx.utils.wrapperUtil.IWrapper;
 import org.apache.ibatis.annotations.Param;
 
@@ -24,4 +25,7 @@ public interface LogisticsInfoMapper extends BaseMapper<LogisticsInfo> {
      * @return
      */
     Page<LogisticsInfo> getPurchaseInStockPage(@Param("page") Page<LogisticsInfo> page, @Param("ew") IWrapper<LogisticsInfo> wrapper);
+
+    Page<DataInfoPageVo> dataInfoPage(@Param("page") Page<Object> page, @Param("ew") IWrapper<Object> wrapper);
+
 }

hx-service/victoriatourist/src/main/java/com/fjhx/mapper/logistics/LogisticsInfoMapper.xml

@@ -25,4 +25,17 @@
         ${ew.customSqlSegment}
     </select>
 
+    <select id="dataInfoPage" resultType="com.fjhx.params.logistics.DataInfoPageVo">
+        select sc.id                     id,
+               sc.business_id            businessId,
+               sc.business_type          businessType,
+               sc.code                   code,
+               sc.logistics_company_code logisticsCompanyCode,
+               sc.logistics_status       logisticsStatus,
+               sc.create_user            createUser,
+               sc.create_time            createTime
+        from logistics_info sc
+            ${ew.customSqlSegment}
+    </select>
+
 </mapper>

hx-service/victoriatourist/src/main/java/com/fjhx/service/logistics/LogisticsInfoService.java

@@ -3,6 +3,8 @@ package com.fjhx.service.logistics;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.fjhx.base.BaseService;
 import com.fjhx.entity.logistics.LogisticsInfo;
+import com.fjhx.params.logistics.DataInfoPageDto;
+import com.fjhx.params.logistics.DataInfoPageVo;
 import com.fjhx.params.logistics.DeliverDetailsVo;
 import com.fjhx.params.logistics.LogisticsInfoVo;
 import com.fjhx.params.stock.InStockAdd;
@@ -79,4 +81,9 @@ public interface LogisticsInfoService extends BaseService<LogisticsInfo> {
      */
     void inStock(InStockAdd inStockAdd);
 
+    /**
+     * 物流数据分页列表
+     */
+    Page<DataInfoPageVo> dataInfoPage(DataInfoPageDto dto);
+
 }

hx-service/victoriatourist/src/main/java/com/fjhx/service/logistics/impl/LogisticsInfoServiceImpl.java

@@ -18,6 +18,8 @@ import com.fjhx.enums.purchase.PurchaseStatusEnum;
 import com.fjhx.enums.stock.InTypeEnum;
 import com.fjhx.enums.stock.QualityStatusEnum;
 import com.fjhx.mapper.logistics.LogisticsInfoMapper;
+import com.fjhx.params.logistics.DataInfoPageDto;
+import com.fjhx.params.logistics.DataInfoPageVo;
 import com.fjhx.params.logistics.DeliverDetailsVo;
 import com.fjhx.params.logistics.LogisticsInfoVo;
 import com.fjhx.params.stock.InStockAdd;
@@ -398,4 +400,12 @@ public class LogisticsInfoServiceImpl extends ServiceImpl<LogisticsInfoMapper, L
         qualityDetailsService.saveBatch(qualityDetailsList);
     }
 
+    @Override
+    public Page<DataInfoPageVo> dataInfoPage(DataInfoPageDto dto) {
+        IWrapper<Object> wrapper = IWrapper.getWrapper(dto);
+
+
+        return baseMapper.dataInfoPage(dto.getPage(), wrapper);
+    }
+
 }