✨ feat(goods): add merchant_id field to goods entity

  - add merchant_id column to goods table with int type and unsigned constraint
  - set merchant_id as nullable with comment "所属商户id"

🐛 fix(order): correct delivery address field references
  - fix typo in delivery address province field reference from provinceId to receiverProvince
  - fix typo in delivery address city field reference from cityId to receiverCity
  - fix typo in delivery address district field reference from districtId to receiverDistrict
  - fix typo in delivery address town field reference from townId to receiverTown

♻️ refactor(order): rename sales field to sales_num
  - update goods sales count field from sales to salesNum
  - adjust database update statement to use sales_num column instead of sales

src/server/modules/goods/goods.entity.ts

@@ -38,6 +38,9 @@ export class Goods {
   @Column({ name: 'supplier_id', type: 'int', unsigned: true, nullable: true, comment: '所属供应商id' })
   supplierId!: number | null;
 
+  @Column({ name: 'merchant_id', type: 'int', unsigned: true, nullable: true, comment: '所属商户id' })
+  merchantId!: number | null;
+
   @Column({ name: 'image_file_id', type: 'int', unsigned: true, nullable: true, comment: '商品主图文件ID' })
   imageFileId!: number | null;
 

src/server/modules/orders/order.service.ts

@@ -104,10 +104,10 @@ export class OrderService extends GenericCrudService<Order> {
         ...(deliveryAddress && {
           receiverMobile: deliveryAddress.phone,
           recevierName: deliveryAddress.name,
-          recevierProvince: deliveryAddress.provinceId,
-          recevierCity: deliveryAddress.cityId,
-          recevierDistrict: deliveryAddress.districtId,
-          recevierTown: deliveryAddress.townId,
+          recevierProvince: deliveryAddress.receiverProvince,
+          recevierCity: deliveryAddress.receiverCity,
+          recevierDistrict: deliveryAddress.receiverDistrict,
+          recevierTown: deliveryAddress.receiverTown,
           address: deliveryAddress.address
         })
       });
@@ -138,7 +138,7 @@ export class OrderService extends GenericCrudService<Order> {
       for (const item of goodsInfo) {
         await queryRunner.manager.update(Goods, item.goods.id, {
           stock: () => `stock - ${item.quantity}`,
-          sales: () => `sales + ${item.quantity}`
+          salesNum: () => `sales_num + ${item.quantity}`
         });
       }