提交

hx-admin/src/test/java/BootTest.java

@@ -35,7 +35,7 @@ public class BootTest {
      */
     @TenantIgnore
     @Test
-    public void test1() {
+    public void test1() throws Exception {
         SecurityUtils.setTenantId(RunParamConstant.tenantId);
         DynamicDataSourceContextHolder.push(SourceConstant.VICTORIATOURIST);
 

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

@@ -5,7 +5,6 @@ import com.fjhx.victoriatourist.entity.jd.po.JdRefundDetail;
 import com.fjhx.victoriatourist.service.jd.JdRefundDetailService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
@@ -17,7 +16,7 @@ import java.util.List;
  * 京东售后退货明细 前端控制器
  * </p>
  *
- * @author 
+ * @author
  * @since 2024-09-25
  */
 @RestController
@@ -28,7 +27,7 @@ public class JdRefundDetailController {
     private JdRefundDetailService jdRefundDetailService;
 
     @GetMapping("/getList")
-    public List<JdRefundDetail> getList(@RequestBody JdRefundDetailSelectDto dto) {
+    public List<JdRefundDetail> getList(JdRefundDetailSelectDto dto) {
         return jdRefundDetailService.getList(dto);
     }
 

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

@@ -14,25 +14,4 @@ import lombok.Setter;
 @Setter
 public class JdRefundSelectDto extends BaseSelectDto {
 
-    /**
-     * 采销员
-     */
-    private String salesPin;
-
-    /**
-     * 出库单号
-     */
-    private Integer outNo;
-
-    /**
-     * 退货单号
-     */
-    private Long refundId;
-
-    /**
-     * 供应商名称
-     */
-    private String providerName;
-
-
 }

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

@@ -33,7 +33,7 @@ public class JdRefundDetail extends BasePo {
     /**
      * 确认收货时间
      */
-    private String signTime;
+    private Date signTime;
 
     /**
      * 备注

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

@@ -563,7 +563,7 @@ public class JdApiServiceImpl implements JdApiService {
         }
 
         //获取开始同步的时间
-        Date startTime = DateUtil.parseDateTime("2024-09-20 00:00:00");
+        Date startTime = DateUtil.parseDateTime("2024-09-23 00:00:00");
         Date endTime = new Date();
 
         //根据下单时间获取数据库里最后一个订单

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

@@ -36,7 +36,8 @@ public class JdRefundServiceImpl extends ServiceImpl<JdRefundMapper, JdRefund> i
                         k -> k.like(JdRefund::getSalesPin, keyword).or()
                                 .like(JdRefund::getOutNo, keyword).or()
                                 .like(JdRefund::getRefundId, keyword).or()
-                                .like(JdRefund::getProviderName, keyword)
+                                .like(JdRefund::getProviderName, keyword).or()
+                                .like(JdRefund::getContacts, keyword)
                 )
         );