Merge commit 'fcf1d45522e3ba6e6faf2590b60f2db1ef90e73c' into dev_jacy

2026-07-07 13:55:10 +08:00
parent 6572799264 fcf1d45522
commit d9e72ab227
85 changed files with 11210 additions and 164 deletions
@@ -118,46 +118,65 @@ export class TradeService {
      body.clientLocation,
    );

-    const order = await this.prisma.order.create({
-      data: {
-        orderNo,
-        userId,
-        cityId: city.id,
-        status: 'PENDING_PAY',
-        payStatus: 'UNPAID',
-        deliveryType: preview.deliveryType as 'LOCAL' | 'CROSS_CITY',
-        productId: product.id,
-        barcode69: product.barcode69,
-        productName: product.name,
-        productSpec: product.spec,
-        imageResourceId: product.coverResourceId,
-        quantity: body.quantity,
-        listUnitPrice: product.price,
-        listAmount: preview.productAmount,
-        productAmount: preview.productAmount,
-        receiverName: address.receiverName,
-        receiverPhone: address.phone,
-        receiverAddress: `${address.province}${address.city}${address.district}${address.detail}`,
-        receiverProvince: address.province,
-        receiverCity: address.city,
-        receiverDistrict: address.district,
-        clientIp: location.clientIp,
-        ipProvince: location.ipProvince,
-        ipCity: location.ipCity,
-        ipDistrict: location.ipDistrict,
-        gpsProvince: location.gpsProvince,
-        gpsCity: location.gpsCity,
-        gpsDistrict: location.gpsDistrict,
-        gpsLatitude: location.gpsLatitude,
-        gpsLongitude: location.gpsLongitude,
-        gpsAddress: location.gpsAddress,
-        freightAmount: preview.freightAmount,
-        freightPayType: preview.freightPayType,
-        payAmount: preview.payAmount,
-        benefitAmount: preview.benefitAmount,
-        payExpireAt,
-      },
-      include: { product: true, imageResource: true },
+    const attribution = await this.prisma.userPromoAttribution.findUnique({
+      where: { userId },
+      include: { promoCode: true },
+    });
+    const promoCodeId =
+      attribution?.promoCode?.status === 'ACTIVE' ? attribution.promoCodeId : undefined;
+
+    const order = await this.prisma.$transaction(async (tx) => {
+      const created = await tx.order.create({
+        data: {
+          orderNo,
+          userId,
+          cityId: city.id,
+          status: 'PENDING_PAY',
+          payStatus: 'UNPAID',
+          deliveryType: preview.deliveryType as 'LOCAL' | 'CROSS_CITY',
+          productId: product.id,
+          barcode69: product.barcode69,
+          productName: product.name,
+          productSpec: product.spec,
+          imageResourceId: product.coverResourceId,
+          quantity: body.quantity,
+          listUnitPrice: product.price,
+          listAmount: preview.productAmount,
+          productAmount: preview.productAmount,
+          receiverName: address.receiverName,
+          receiverPhone: address.phone,
+          receiverAddress: `${address.province}${address.city}${address.district}${address.detail}`,
+          receiverProvince: address.province,
+          receiverCity: address.city,
+          receiverDistrict: address.district,
+          clientIp: location.clientIp,
+          ipProvince: location.ipProvince,
+          ipCity: location.ipCity,
+          ipDistrict: location.ipDistrict,
+          gpsProvince: location.gpsProvince,
+          gpsCity: location.gpsCity,
+          gpsDistrict: location.gpsDistrict,
+          gpsLatitude: location.gpsLatitude,
+          gpsLongitude: location.gpsLongitude,
+          gpsAddress: location.gpsAddress,
+          freightAmount: preview.freightAmount,
+          freightPayType: preview.freightPayType,
+          payAmount: preview.payAmount,
+          benefitAmount: preview.benefitAmount,
+          payExpireAt,
+          promoCodeId,
+        },
+        include: { product: true, imageResource: true },
+      });
+
+      if (promoCodeId) {
+        await tx.commonPromoCode.update({
+          where: { id: promoCodeId },
+          data: { orderCount: { increment: 1 } },
+        });
+      }
+
+      return created;
    });

    this.analyticsService.trackOneSafe(userId, 'USER_H5', {