소스 검색

京东订单,详情,退货单,详情,字典初始化,状态更新

1018653686@qq.com 1 년 전
부모
커밋
6c81fbe695

+ 15 - 0
hx-victoriatourist/src/main/java/com/fjhx/victoriatourist/entity/jd/vo/JdBackDetailsVo.java

@@ -14,4 +14,19 @@ import lombok.Setter;
 @Setter
 public class JdBackDetailsVo extends JdBackDetails {
 
+    /**
+     * 产品编码
+     */
+    private String productCode;
+
+    /**
+     * 产品名称
+     */
+    private String productName;
+
+    /**
+     * 产品自定义编码
+     */
+    private String productCustomCode;
+
 }

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

@@ -256,7 +256,7 @@ public class JdApiServiceImpl implements JdApiService {
      * @author hj
      * @date 2023/12/13 22:30
      */
-//    @PostConstruct
+    @PostConstruct
     public void startJdBackOrder(){
         JdClient jdClient = jdClientFactory.getJdClient();
         while (true){
@@ -310,7 +310,7 @@ public class JdApiServiceImpl implements JdApiService {
      * 刷新京东状态
      * @param
      */
-    @PostConstruct
+//    @PostConstruct
     public void refreshJdState(){
         JdClient jdClient = jdClientFactory.getJdClient();
         while (true){

+ 12 - 4
hx-victoriatourist/src/main/java/com/fjhx/victoriatourist/service/jd/impl/JdBackServiceImpl.java

@@ -19,11 +19,10 @@ import com.fjhx.kd100.service.company.CompanyInfoService;
 import com.fjhx.kd100.util.KD100Util;
 import com.fjhx.victoriatourist.entity.jd.dto.JdBackDto;
 import com.fjhx.victoriatourist.entity.jd.dto.JdBackSelectDto;
-import com.fjhx.victoriatourist.entity.jd.po.JdBack;
-import com.fjhx.victoriatourist.entity.jd.po.JdBackDetails;
-import com.fjhx.victoriatourist.entity.jd.po.JdBackQualityWait;
-import com.fjhx.victoriatourist.entity.jd.po.JdOrder;
+import com.fjhx.victoriatourist.entity.jd.po.*;
+import com.fjhx.victoriatourist.entity.jd.vo.JdBackDetailsVo;
 import com.fjhx.victoriatourist.entity.jd.vo.JdBackVo;
+import com.fjhx.victoriatourist.entity.jd.vo.JdOrderDetailsVo;
 import com.fjhx.victoriatourist.entity.logistics.po.LogisticsInfos;
 import com.fjhx.victoriatourist.mapper.jd.JdBackMapper;
 import com.fjhx.victoriatourist.service.jd.JdBackDetailsService;
@@ -122,6 +121,15 @@ public class JdBackServiceImpl extends ServiceImpl<JdBackMapper, JdBack> impleme
         }
         //赋值退货明细
         List<JdBackDetails> jdBackDetailsList = jdBackDetailsService.list(q -> q.eq(JdBackDetails::getJdBackId, id));
+
+        List<JdBackDetailsVo> jdBackDetailsVoList = BeanUtil.copyToList(jdBackDetailsList, JdBackDetailsVo.class);
+
+        productInfoService.attributeAssign(jdBackDetailsVoList, JdBackDetails::getProductId, (item, product) -> {
+            item.setProductCode(product.getCode());
+            item.setProductName(product.getName());
+            item.setProductCustomCode(product.getCustomCode());
+        });
+
         result.setJdBackDetailsList(jdBackDetailsList);
         return result;
     }

+ 4 - 1
hx-victoriatourist/src/main/java/com/fjhx/victoriatourist/service/jd/impl/JdOrderServiceImpl.java

@@ -141,8 +141,9 @@ public class JdOrderServiceImpl extends ServiceImpl<JdOrderMapper, JdOrder> impl
 //            }
 //        }
         wrapper.groupBy("jo.id");
-
+        SecurityUtils.setTenantId("wdly");
         Page<JdOrderVo> page = this.baseMapper.getPage(dto.getPage(), wrapper);
+        SecurityUtils.clearTenantId();
         List<JdOrderVo> records = page.getRecords();
         if (records.size() == 0) {
             return page;
@@ -161,6 +162,7 @@ public class JdOrderServiceImpl extends ServiceImpl<JdOrderMapper, JdOrder> impl
 
     @Override
     public JdOrderVo detail(Long id) {
+        SecurityUtils.setTenantId("wdly");
         JdOrder JdOrder = this.getById(id);
         JdOrderVo result = BeanUtil.toBean(JdOrder, JdOrderVo.class);
 
@@ -173,6 +175,7 @@ public class JdOrderServiceImpl extends ServiceImpl<JdOrderMapper, JdOrder> impl
         });
 
         result.setJdOrderDetailsList(jdOrderDetailsVoList);
+        SecurityUtils.clearTenantId();
         return result;
     }