feat: 推送订单到erp

fs-admin/src/test/java/com/fs/store/controller/FsStorePaymentControllerTest.java

@@ -5,9 +5,10 @@ import com.alibaba.fastjson.JSON;
 import com.fs.FSAdminApplication;
 import com.fs.common.core.domain.R;
 import com.fs.common.exception.CustomException;
-import com.fs.erp.dto.GetInitTokenRequestDTO;
-import com.fs.erp.dto.GetInitTokenResponseDTO;
+import com.fs.erp.dto.*;
 import com.fs.erp.http.JstErpHttpService;
+import com.fs.erp.service.IErpGoodsService;
+import com.fs.erp.service.IErpOrderService;
 import com.fs.erp.utils.SignUtil;
 import com.fs.huifuPay.dto.*;
 import com.fs.pay.pay.domain.OrderResult;
@@ -92,9 +93,32 @@ public class FsStorePaymentControllerTest {
     @Autowired
     private IFsStoreOrderService fsStoreOrderService;
 
+    @Autowired
+    private IErpOrderService erpOrderService;
+
+    @Autowired
+    private IErpGoodsService erpGoodsService;
+
     @Test
     public void pushErp() throws ParseException {
-        fsStoreOrderService.createOmsOrder(1332678L);
+        fsStoreOrderService.createOmsOrder(1332687L);
+    }
+
+    @Test
+    public void getErpInfo() {
+        ErpOrderQueryRequert request = new ErpOrderQueryRequert();
+        request.setCode("28377458");
+        ErpOrderQueryResponse order = erpOrderService.getOrder(request);
+        log.info("订单信息: {}",order);
+    }
+
+    @Test
+    public void getGoods(){
+        ErpGoodsQueryRequert erpGoodsQueryRequert = new ErpGoodsQueryRequert();
+        erpGoodsQueryRequert.setCode("105220");
+        ErpGoodsQueryResponse goods = erpGoodsService.getGoods(erpGoodsQueryRequert);
+
+        log.info("查询结果: {}",goods);
     }
     @Test
     public void initJstToken() {

fs-service-system/src/main/java/com/fs/erp/service/impl/JSTErpOrderServiceImpl.java

@@ -198,7 +198,7 @@ public class JSTErpOrderServiceImpl implements IErpOrderService {
 
         // 设置物流信息
         erpOrder.setExpress_name(order.getLogisticsCompany());
-        erpOrder.setExpress_code(order.getLcId());
+        erpOrder.setExpress_code(order.getLId());
 
         // 设置收件人信息
         erpOrder.setReceiver_name(order.getReceiverName());