Fix: 增加订单信息

增加了删除接口，同步了woocommerce订单状态，部分bug修复

src/controller/logistics.controller.ts

@@ -145,10 +145,7 @@ export class LogisticsController {
     }
   }
 
-  @ApiOkResponse({
-    type: BooleanRes,
-  })
-  @Post('/deleteShipment/:id')
+  @Del('deleteShipment/id')
   async deleteShipment(@Param('id') id: number) {
     try {
       const res = await this.logisticsService.removeShipment(id);

src/entity/shipment.entity.ts

@@ -21,10 +21,6 @@ export class Shipment {
   @Expose()
   id: string;
 
-  @ApiProperty()
-  @Column({ nullable: true })
-  order_id: number;
-
   @ApiProperty()
   @OneToOne(() => Order)
   @JoinColumn({ name: 'order_id' })

src/service/logistics.service.ts

@@ -207,10 +207,13 @@ export class LogisticsService {
   async removeShipment(shipmentId) {
     try {
       const shipment:Shipment = await this.shipmentModel.findOneBy({id: shipmentId});
-      const order:Order = await this.orderModel.findOneBy({id: shipment.order_id});
-      // todo 同步到wooccommerce删除运单信息
+      const order = shipment.order;
+      // todo 同步到wooccommerce
       const site = await this.geSite(order.siteId);
-      await this.wpService.deleteShipment(site, order.externalOrderId, shipment.tracking_id);
+          await this.wpService.deleteShipment(site, order.externalOrderId, shipment.tracking_id, {
+            tracking_number: shipment.return_tracking_number,
+            tracking_provider: shipment?.tracking_provider,
+          });
       
       const dataSource = this.dataSourceManager.getDataSource('default');
       let transactionError = undefined;
@@ -225,18 +228,6 @@ export class LogisticsService {
 
         const res = await this.uniExpressService.deleteShipment(shipment.return_tracking_number);
         console.log('res', res.data);
-
-        // 同步订单状态到woocommerce
-        if (order.status === OrderStatus.COMPLETED) {
-          await this.wpService.updateOrder(site, order.externalOrderId, {
-            status: OrderStatus.PROCESSING,
-          });
-          order.status = OrderStatus.PROCESSING;
-        }
-        order.orderStatus = ErpOrderStatus.PROCESSING;
-
-        await orderRepo.save(order);
-
       }).catch(error => {
         transactionError = error;
       });
@@ -339,7 +330,6 @@ export class LogisticsService {
       }
       const dataSource = this.dataSourceManager.getDataSource('default');
       let transactionError = undefined;
-      let shipmentId = undefined;
       await dataSource.transaction(async manager => {
         const orderRepo = manager.getRepository(Order);
         const shipmentRepo = manager.getRepository(Shipment);
@@ -364,19 +354,10 @@ export class LogisticsService {
             order: order
           });
           order.shipmentId = shipment.id;
-          shipmentId = shipment.id;
         }
 
-        // 同步订单状态到woocommerce
-        if (order.status !== OrderStatus.COMPLETED) {
-          await this.wpService.updateOrder(site, order.externalOrderId, {
-            status: OrderStatus.COMPLETED,
-          });
-          order.status = OrderStatus.COMPLETED;
-        }
-        order.orderStatus = ErpOrderStatus.COMPLETED;
-
         await orderRepo.save(order);
+
       }).catch(error => {
         transactionError = error
       });
@@ -387,7 +368,7 @@ export class LogisticsService {
       }
 
       return { data: {
-        shipmentId
+        resShipmentOrder
       } };
     } catch(error) {
       if (resShipmentOrder.status === 'SUCCESS') {
@@ -479,7 +460,6 @@ export class LogisticsService {
   }
 
   async delShipment(id: string, userId: number) {
-
     const shipment = await this.shipmentModel.findOneBy({ id });
     if (!shipment) throw new Error('物流不存在');
     if (shipment.type === ShipmentType.FREIGHTCOM) {

src/service/wp.service.ts

@@ -281,13 +281,13 @@ export class WPService {
     site: WpSite,
     orderId: string,
     trackingId: string,
+    data: Record<string, any>
   ): Promise<Boolean> {
     const { wpApiUrl, consumerKey, consumerSecret } = site;
     const auth = Buffer.from(`${consumerKey}:${consumerSecret}`).toString(
       'base64'
     );
 
-    console.log('del', orderId, trackingId);
     // 删除接口： DELETE /wp-json/wc-shipment-tracking/v3/orders/<order_id>/shipment-trackings/<tracking_id>
     const config: AxiosRequestConfig = {
       method: 'DELETE',
@@ -295,6 +295,7 @@ export class WPService {
       headers: {
         Authorization: `Basic ${auth}`,
       },
+      data,
     };
     return await axios.request(config);
   }