提交

hx-victoriatourist/src/main/java/com/fjhx/victoriatourist/controller/jd/JdRefundController.java

@@ -2,7 +2,7 @@ package com.fjhx.victoriatourist.controller.jd;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.fjhx.victoriatourist.entity.jd.dto.JdRefundSelectDto;
-import com.fjhx.victoriatourist.entity.jd.po.JdRefund;
+import com.fjhx.victoriatourist.entity.jd.vo.JdRefundVo;
 import com.fjhx.victoriatourist.service.jd.JdRefundService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -26,7 +26,7 @@ public class JdRefundController {
     private JdRefundService JdRefundService;
 
     @GetMapping("/getPage")
-    public Page<JdRefund> getPage(JdRefundSelectDto dto) {
+    public Page<JdRefundVo> getPage(JdRefundSelectDto dto) {
         return JdRefundService.getPage(dto);
     }
 

hx-victoriatourist/src/main/java/com/fjhx/victoriatourist/controller/jd/JdRefundQualityCheckController.java

@@ -0,0 +1,37 @@
+package com.fjhx.victoriatourist.controller.jd;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fjhx.victoriatourist.entity.jd.dto.JdRefundQualityCheckSelectDto;
+import com.fjhx.victoriatourist.entity.jd.vo.JdRefundQualityCheckVo;
+import com.fjhx.victoriatourist.service.jd.JdRefundQualityCheckService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+
+/**
+ * <p>
+ * 京东售后退货质检 前端控制器
+ * </p>
+ *
+ * @author
+ * @since 2024-09-27
+ */
+@RestController
+@RequestMapping("/jdRefundQualityCheck")
+public class JdRefundQualityCheckController {
+
+    @Autowired
+    private JdRefundQualityCheckService jdRefundQualityCheckService;
+
+    /**
+     * 京东售后退货质检分页
+     */
+    @PostMapping("/page")
+    public Page<JdRefundQualityCheckVo> page(@RequestBody JdRefundQualityCheckSelectDto dto) {
+        return jdRefundQualityCheckService.getPage(dto);
+    }
+
+}

hx-victoriatourist/src/main/java/com/fjhx/victoriatourist/entity/jd/dto/JdRefundQualityCheckDto.java

@@ -0,0 +1,17 @@
+package com.fjhx.victoriatourist.entity.jd.dto;
+
+import com.fjhx.victoriatourist.entity.jd.po.JdRefundQualityCheck;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 京东售后退货质检新增编辑入参实体
+ *
+ * @author
+ * @since 2024-09-27
+ */
+@Getter
+@Setter
+public class JdRefundQualityCheckDto extends JdRefundQualityCheck {
+
+}

hx-victoriatourist/src/main/java/com/fjhx/victoriatourist/entity/jd/dto/JdRefundQualityCheckSelectDto.java

@@ -0,0 +1,17 @@
+package com.fjhx.victoriatourist.entity.jd.dto;
+
+import com.ruoyi.common.core.domain.BaseSelectDto;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 京东售后退货质检列表查询入参实体
+ *
+ * @author
+ * @since 2024-09-27
+ */
+@Getter
+@Setter
+public class JdRefundQualityCheckSelectDto extends BaseSelectDto {
+
+}

hx-victoriatourist/src/main/java/com/fjhx/victoriatourist/entity/jd/dto/JdRefundSelectDto.java

@@ -14,4 +14,6 @@ import lombok.Setter;
 @Setter
 public class JdRefundSelectDto extends BaseSelectDto {
 
+    private Integer status;
+
 }

hx-victoriatourist/src/main/java/com/fjhx/victoriatourist/entity/jd/po/JdRefundDetail.java

@@ -1,18 +1,19 @@
 package com.fjhx.victoriatourist.entity.jd.po;
 
-import com.ruoyi.common.core.domain.BasePo;
 import com.baomidou.mybatisplus.annotation.TableName;
-import java.math.BigDecimal;
-import java.util.Date;
+import com.ruoyi.common.core.domain.BasePo;
 import lombok.Getter;
 import lombok.Setter;
 
+import java.math.BigDecimal;
+import java.util.Date;
+
 /**
  * <p>
  * 京东售后退货明细
  * </p>
  *
- * @author 
+ * @author
  * @since 2024-09-25
  */
 @Getter
@@ -81,7 +82,7 @@ public class JdRefundDetail extends BasePo {
     private String saleModeCd;
 
     /**
-     * 		合作渠道id
+     * 合作渠道id
      */
     private String channelId;
 
@@ -95,4 +96,9 @@ public class JdRefundDetail extends BasePo {
      */
     private String upc;
 
+    /**
+     * 状态 0待确认 1待质检 2部分质检 3已质检
+     */
+    private Integer status;
+
 }

hx-victoriatourist/src/main/java/com/fjhx/victoriatourist/entity/jd/po/JdRefundQualityCheck.java

@@ -0,0 +1,68 @@
+package com.fjhx.victoriatourist.entity.jd.po;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.ruoyi.common.core.domain.BasePo;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.util.Date;
+
+/**
+ * <p>
+ * 京东售后退货质检
+ * </p>
+ *
+ * @author
+ * @since 2024-09-27
+ */
+@Getter
+@Setter
+@TableName("jd_refund_quality_check")
+public class JdRefundQualityCheck extends BasePo {
+
+    /**
+     * 质检单号
+     */
+    private String code;
+
+    /**
+     * 京东售后id
+     */
+    private Long jdRefund;
+
+    /**
+     * 产品id
+     */
+    private Long productId;
+
+    /**
+     * 需要质检数量
+     */
+    private Integer totalToInspect;
+
+    /**
+     * 质检合格数量
+     */
+    private Integer qualifiedCount;
+
+    /**
+     * 质检不合格数量
+     */
+    private Integer unqualifiedCount;
+
+    /**
+     * 质检时间
+     */
+    private Date inspectionTime;
+
+    /**
+     * 质检人员
+     */
+    private Long inspectionUserId;
+
+    /**
+     * 状态 0待质检 1已质检
+     */
+    private Integer status;
+
+}

hx-victoriatourist/src/main/java/com/fjhx/victoriatourist/entity/jd/vo/JdRefundQualityCheckVo.java

@@ -0,0 +1,17 @@
+package com.fjhx.victoriatourist.entity.jd.vo;
+
+import com.fjhx.victoriatourist.entity.jd.po.JdRefundQualityCheck;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 京东售后退货质检列表查询返回值实体
+ *
+ * @author
+ * @since 2024-09-27
+ */
+@Getter
+@Setter
+public class JdRefundQualityCheckVo extends JdRefundQualityCheck {
+
+}

hx-victoriatourist/src/main/java/com/fjhx/victoriatourist/entity/jd/vo/JdRefundVo.java

@@ -7,11 +7,20 @@ import lombok.Setter;
 /**
  * 京东售后退货列表查询返回值实体
  *
- * @author 
+ * @author
  * @since 2024-09-25
  */
 @Getter
 @Setter
 public class JdRefundVo extends JdRefund {
 
+    private Long refundDetailId;
+    private String signTime;
+    private String partCode;
+    private String shipCode;
+    private String wareId;
+    private String wareName;
+    private String confirmReceiptPeople;
+    private Integer status;
+
 }

hx-victoriatourist/src/main/java/com/fjhx/victoriatourist/mapper/jd/JdRefundMapper.java

@@ -1,7 +1,11 @@
 package com.fjhx.victoriatourist.mapper.jd;
 
-import com.fjhx.victoriatourist.entity.jd.po.JdRefund;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fjhx.victoriatourist.entity.jd.po.JdRefund;
+import com.fjhx.victoriatourist.entity.jd.vo.JdRefundVo;
+import com.ruoyi.common.utils.wrapper.IWrapper;
+import org.apache.ibatis.annotations.Param;
 
 
 /**
@@ -9,9 +13,12 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  * 京东售后退货 Mapper 接口
  * </p>
  *
- * @author 
+ * @author
  * @since 2024-09-25
  */
 public interface JdRefundMapper extends BaseMapper<JdRefund> {
 
+
+    Page<JdRefundVo> getPage(@Param("page") Page<Object> page, @Param("ew") IWrapper<JdRefund> wrapper);
+
 }

hx-victoriatourist/src/main/java/com/fjhx/victoriatourist/mapper/jd/JdRefundQualityCheckMapper.java

@@ -0,0 +1,26 @@
+package com.fjhx.victoriatourist.mapper.jd;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fjhx.victoriatourist.entity.jd.po.JdRefundQualityCheck;
+import com.fjhx.victoriatourist.entity.jd.vo.JdRefundQualityCheckVo;
+import com.ruoyi.common.utils.wrapper.IWrapper;
+import org.apache.ibatis.annotations.Param;
+
+
+/**
+ * <p>
+ * 京东售后退货质检 Mapper 接口
+ * </p>
+ *
+ * @author
+ * @since 2024-09-27
+ */
+public interface JdRefundQualityCheckMapper extends BaseMapper<JdRefundQualityCheck> {
+
+    /**
+     * 京东售后退货质检分页
+     */
+    Page<JdRefundQualityCheckVo> getPage(@Param("page") Page<Object> page, @Param("ew") IWrapper<JdRefundQualityCheck> wrapper);
+
+}

hx-victoriatourist/src/main/java/com/fjhx/victoriatourist/service/jd/JdRefundQualityCheckService.java

@@ -0,0 +1,25 @@
+package com.fjhx.victoriatourist.service.jd;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fjhx.victoriatourist.entity.jd.dto.JdRefundQualityCheckSelectDto;
+import com.fjhx.victoriatourist.entity.jd.po.JdRefundQualityCheck;
+import com.fjhx.victoriatourist.entity.jd.vo.JdRefundQualityCheckVo;
+import com.ruoyi.common.core.service.BaseService;
+
+
+/**
+ * <p>
+ * 京东售后退货质检 服务类
+ * </p>
+ *
+ * @author
+ * @since 2024-09-27
+ */
+public interface JdRefundQualityCheckService extends BaseService<JdRefundQualityCheck> {
+
+    /**
+     * 京东售后退货质检分页
+     */
+    Page<JdRefundQualityCheckVo> getPage(JdRefundQualityCheckSelectDto dto);
+
+}

hx-victoriatourist/src/main/java/com/fjhx/victoriatourist/service/jd/JdRefundService.java

@@ -3,6 +3,7 @@ package com.fjhx.victoriatourist.service.jd;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.fjhx.victoriatourist.entity.jd.dto.JdRefundSelectDto;
 import com.fjhx.victoriatourist.entity.jd.po.JdRefund;
+import com.fjhx.victoriatourist.entity.jd.vo.JdRefundVo;
 import com.ruoyi.common.core.service.BaseService;
 
 
@@ -11,11 +12,11 @@ import com.ruoyi.common.core.service.BaseService;
  * 京东售后退货 服务类
  * </p>
  *
- * @author 
+ * @author
  * @since 2024-09-25
  */
 public interface JdRefundService extends BaseService<JdRefund> {
 
-    Page<JdRefund> getPage(JdRefundSelectDto dto);
+    Page<JdRefundVo> getPage(JdRefundSelectDto dto);
 
 }

hx-victoriatourist/src/main/java/com/fjhx/victoriatourist/service/jd/impl/JdRefundQualityCheckServiceImpl.java

@@ -0,0 +1,33 @@
+package com.fjhx.victoriatourist.service.jd.impl;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.fjhx.victoriatourist.entity.jd.dto.JdRefundQualityCheckSelectDto;
+import com.fjhx.victoriatourist.entity.jd.po.JdRefundQualityCheck;
+import com.fjhx.victoriatourist.entity.jd.vo.JdRefundQualityCheckVo;
+import com.fjhx.victoriatourist.mapper.jd.JdRefundQualityCheckMapper;
+import com.fjhx.victoriatourist.service.jd.JdRefundQualityCheckService;
+import com.ruoyi.common.utils.wrapper.IWrapper;
+import org.springframework.stereotype.Service;
+
+
+/**
+ * <p>
+ * 京东售后退货质检 服务实现类
+ * </p>
+ *
+ * @author
+ * @since 2024-09-27
+ */
+@Service
+public class JdRefundQualityCheckServiceImpl extends ServiceImpl<JdRefundQualityCheckMapper, JdRefundQualityCheck> implements JdRefundQualityCheckService {
+
+    @Override
+    public Page<JdRefundQualityCheckVo> getPage(JdRefundQualityCheckSelectDto dto) {
+        IWrapper<JdRefundQualityCheck> wrapper = getWrapper();
+        wrapper.orderByDesc("jrqc", JdRefundQualityCheck::getId);
+        Page<JdRefundQualityCheckVo> page = this.baseMapper.getPage(dto.getPage(), wrapper);
+        return page;
+    }
+
+}

hx-victoriatourist/src/main/java/com/fjhx/victoriatourist/service/jd/impl/JdRefundServiceImpl.java

@@ -1,12 +1,15 @@
 package com.fjhx.victoriatourist.service.jd.impl;
 
-import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.fjhx.victoriatourist.entity.jd.dto.JdRefundSelectDto;
 import com.fjhx.victoriatourist.entity.jd.po.JdRefund;
+import com.fjhx.victoriatourist.entity.jd.po.JdRefundDetail;
+import com.fjhx.victoriatourist.entity.jd.vo.JdRefundVo;
 import com.fjhx.victoriatourist.mapper.jd.JdRefundMapper;
 import com.fjhx.victoriatourist.service.jd.JdRefundService;
+import com.ruoyi.common.utils.wrapper.IWrapper;
+import com.ruoyi.common.utils.wrapper.SqlField;
 import org.springframework.stereotype.Service;
 
 import java.util.Date;
@@ -24,23 +27,26 @@ import java.util.Date;
 public class JdRefundServiceImpl extends ServiceImpl<JdRefundMapper, JdRefund> implements JdRefundService {
 
     @Override
-    public Page<JdRefund> getPage(JdRefundSelectDto dto) {
+    public Page<JdRefundVo> getPage(JdRefundSelectDto dto) {
 
         Date beginTime = dto.getBeginTime();
         Date endTime = dto.getEndTime();
         String keyword = dto.getKeyword();
 
-        return page(dto.getPage(), q -> q
-                .between(ObjectUtil.isAllNotEmpty(beginTime, endTime), JdRefund::getApplyDateTime, beginTime, endTime)
-                .and(ObjectUtil.isNotEmpty(keyword),
-                        k -> k.like(JdRefund::getSalesPin, keyword).or()
-                                .like(JdRefund::getOutNo, keyword).or()
-                                .like(JdRefund::getRefundId, keyword).or()
-                                .like(JdRefund::getProviderName, keyword).or()
-                                .like(JdRefund::getContacts, keyword)
-                )
-        );
-
+        IWrapper<JdRefund> wrapper = getWrapper()
+                .eq("jrd", JdRefundDetail::getStatus, dto.getStatus())
+                .between("jr", JdRefund::getApplyDateTime, beginTime, endTime)
+                .keyword(keyword,
+                        new SqlField("jr", JdRefund::getOutNo),
+                        new SqlField("jr", JdRefund::getStoreName),
+                        new SqlField("jrd", JdRefundDetail::getPartCode),
+                        new SqlField("jrd", JdRefundDetail::getShipCode),
+                        new SqlField("jrd", JdRefundDetail::getWareId),
+                        new SqlField("jrd", JdRefundDetail::getWareName),
+                        new SqlField("jrd", JdRefundDetail::getConfirmReceiptPeople)
+                );
+
+        return baseMapper.getPage(dto.getPage(), wrapper);
     }
 
 }

hx-victoriatourist/src/main/resources/mapper/jd/JdRefundMapper.xml

@@ -1,4 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.fjhx.victoriatourist.mapper.jd.JdRefundMapper">
+    <select id="getPage" resultType="com.fjhx.victoriatourist.entity.jd.vo.JdRefundVo">
+        select jr.id,
+               jr.status_name,
+               jr.store_name,
+               jr.out_no,
+               jr.out_type_desc,
+               jrd.id as jd_refund_detail_id,
+               jrd.sign_time,
+               jrd.part_code,
+               jrd.ship_code,
+               jrd.ware_id,
+               jrd.ware_name,
+               jrd.confirm_receipt_people,
+               jrd.status
+        from jd_refund jr
+                 left join jd_refund_detail jrd on jr.id = jrd.jd_refund_id
+            ${ew.customSqlSegment}
+    </select>
 </mapper>

hx-victoriatourist/src/main/resources/mapper/jd/JdRefundQualityCheckMapper.xml

@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.fjhx.victoriatourist.mapper.jd.JdRefundQualityCheckMapper">
+    <select id="getPage" resultType="com.fjhx.victoriatourist.entity.jd.vo.JdRefundQualityCheckVo">
+        select jrqc.id,
+               jrqc.code,
+               jrqc.jd_refund,
+               jrqc.product_id,
+               jrqc.total_to_inspect,
+               jrqc.qualified_count,
+               jrqc.unqualified_count,
+               jrqc.inspection_time,
+               jrqc.inspection_user_id,
+               jrqc.status,
+               jrqc.create_user,
+               jrqc.create_time,
+               jrqc.update_user,
+               jrqc.update_time
+        from jd_refund_quality_check jrqc
+            ${ew.customSqlSegment}
+    </select>
+
+</mapper>