提交

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

@@ -1,9 +1,13 @@
 import com.baomidou.dynamic.datasource.toolkit.DynamicDataSourceContextHolder;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.fjhx.admin.BytesailingApplication;
 import com.fjhx.common.constant.SourceConstant;
 import com.fjhx.victoriatourist.entity.jd.vo.JdInfoVo;
 import com.fjhx.victoriatourist.service.jd.constants.RunParamConstant;
 import com.fjhx.victoriatourist.service.jd.impl.JdApiServiceImpl;
+import com.fjhx.wms.entity.stock.dto.StockWaitSelectDto;
+import com.fjhx.wms.entity.stock.vo.StockWaitVo;
+import com.fjhx.wms.service.stock.impl.StockWaitServiceImpl;
 import com.ruoyi.common.annotation.TenantIgnore;
 import com.ruoyi.common.utils.SecurityUtils;
 import lombok.extern.slf4j.Slf4j;
@@ -22,6 +26,13 @@ public class BootTest {
     @Autowired
     private JdApiServiceImpl jdApiServiceImpl;
 
+
+    @Autowired
+    private StockWaitServiceImpl stockWaitServiceImpl;
+
+    /**
+     * 重新同步 同步异常的京东采购单
+     */
     @TenantIgnore
     @Test
     public void test1() {
@@ -34,4 +45,17 @@ public class BootTest {
         DynamicDataSourceContextHolder.poll();
     }
 
+
+    @TenantIgnore
+    @Test
+    public void test2(){
+        SecurityUtils.setTenantId(RunParamConstant.tenantId);
+
+        StockWaitSelectDto dto = new StockWaitSelectDto();
+        dto.setKeyword("4004805206681078811");
+        dto.setStatus(3);
+        dto.setType("1");
+        Page<StockWaitVo> pageByWdly = stockWaitServiceImpl.getPageByWdly(dto);
+    }
+
 }

hx-supply/src/main/java/com/fjhx/supply/service/supplier/impl/SupplierInfoServiceImpl.java

@@ -24,6 +24,7 @@ import com.fjhx.supply.utils.CodeEnum;
 import com.fjhx.tenant.entity.dict.dto.DictTenantDataSelectDto;
 import com.fjhx.tenant.entity.dict.vo.DictTenantDataVo;
 import com.fjhx.tenant.service.dict.DictTenantDataService;
+import com.ruoyi.common.core.domain.BaseIdPo;
 import com.ruoyi.common.core.domain.BaseSelectDto;
 import com.ruoyi.common.exception.ServiceException;
 import com.ruoyi.common.utils.wrapper.IWrapper;
@@ -137,6 +138,11 @@ public class SupplierInfoServiceImpl extends ServiceImpl<SupplierInfoMapper, Sup
     @DSTransactional
     @Override
     public void add(SupplierInfoDto supplierInfoDto) {
+        long count = count(q -> q.eq(SupplierInfo::getName, supplierInfoDto.getName()));
+        if (count > 0) {
+            throw new ServiceException("供应商名称已存在");
+        }
+
         CustomizeAreaUtil.setAreaId(supplierInfoDto);
         supplierInfoDto.setCode(CodeEnum.SUPPLIER_INFO.getCode());
         this.save(supplierInfoDto);
@@ -146,6 +152,11 @@ public class SupplierInfoServiceImpl extends ServiceImpl<SupplierInfoMapper, Sup
     @DSTransactional
     @Override
     public void edit(SupplierInfoDto supplierInfoDto) {
+        long count = count(q -> q.ne(BaseIdPo::getId, supplierInfoDto.getId()).eq(SupplierInfo::getName, supplierInfoDto.getName()));
+        if (count > 0) {
+            throw new ServiceException("供应商名称已存在");
+        }
+
         CustomizeAreaUtil.setAreaId(supplierInfoDto);
         supplierInfoDto.setCode(null);
         this.updateById(supplierInfoDto);

hx-victoriatourist/pom.xml

@@ -38,7 +38,7 @@
         <dependency>
             <groupId>com.jd.open.api</groupId>
             <artifactId>open-api-sdk</artifactId>
-            <version>2.0</version>
+            <version>3.0</version>
         </dependency>
         <dependency>
             <groupId>org.codehaus.jackson</groupId>

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

@@ -47,4 +47,9 @@ public interface JdApiService {
      */
     void compensatingProductNon();
 
+    /**
+     * 查询售后退货列表
+     */
+    void refundInfo(JdInfoVo jdInfoVo);
+
 }

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

@@ -389,6 +389,64 @@ public class JdApiServiceImpl implements JdApiService {
         log.info("补偿商品id完成");
     }
 
+    @Override
+    public void refundInfo(JdInfoVo jdInfoVo) {
+        if (ObjectUtil.isNull(jdInfoVo)) {
+            return;
+        }
+        try {
+            saveRefundInfo(jdInfoVo);
+            log.info("京东收集售后退货列表完成");
+        } catch (Exception e) {
+            log.error("京东收集售后退货列表出错：{}", e.getMessage(), e);
+        }
+    }
+
+    private void saveRefundInfo(JdInfoVo jdInfoVo) {
+
+    }
+
+    ///**
+    // * 获取京东订单信息分页
+    // */
+    //private JOSOrderResultDto getRefundInfoList(Integer pageIndex, Integer pageSize, Date startTime, Date endTime) throws Exception {
+    //    EdiwsRoRefundInfoListRequest request = new EdiwsRoRefundInfoListRequest();
+    //    request.setApplyBeginTime(startTime);
+    //    request.setApplyEndTime(endTime);
+    //    request.setPageIndex(pageIndex);
+    //    request.setPageSize(pageSize);
+    //    EdiwsRoRefundInfoListResponse response = jdClient.execute(request);
+    //
+    //    validSuccess(response, "获取京东售后退货列表");
+    //    JOSOrderResultDto josOrderResultDto = response.getJosOrderResultDto();
+    //
+    //    boolean success = josOrderResultDto.getSuccess();
+    //    if (!success) {
+    //        log.error("获取京东售后退货列表失败：{}", josOrderResultDto.getResultMessage());
+    //        throw new RuntimeException("获取京东售后退货列表失败：" + josOrderResultDto.getResultMessage());
+    //    }
+    //
+    //    return josOrderResultDto;
+    //}
+    //
+    //
+    //private void getRefundInfoList(Date startTime, Date endTime) {
+    //    int pageIndex = 1;
+    //    int pageSize = 50;
+    //    int recordCount;
+    //
+    //    List<PurchaseOrderDto> purchaseOrderDtoList = new ArrayList<>();
+    //    do {
+    //        JOSOrderResultDto jdOrderInfo = getJdOrderInfo(pageIndex, pageSize, startTime, endTime, orderIds);
+    //        pageIndex++;
+    //        purchaseOrderDtoList.addAll(jdOrderInfo.getPurchaseOrderList());
+    //        recordCount = jdOrderInfo.getRecordCount();
+    //    } while (recordCount > (pageIndex - 1) * pageSize);
+    //    Collections.reverse(purchaseOrderDtoList);
+    //
+    //    return purchaseOrderDtoList;
+    //}
+
     /**
      * 请求API工具方法
      */

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

@@ -43,6 +43,10 @@ public class JdInitializer {
         // 刷新京东订单状态与信息
         jdApiService.refreshJdState(jdInfoVo);
 
+        // 收集售后退货列表
+        // https://jos.jd.com/apilistnewdetail?apiGroupId=86&apiId=19455&apiName=null
+        jdApiService.refundInfo(jdInfoVo);
+
         // 初始化字典
         jdApiService.initTenantDict();