Merge remote-tracking branch 'origin/master'

“mitao”

2025-12-25 01de10c8e22e4b8aae07a210baa9294ec7a88c4b

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TPhysicalGoodsOrderController.java

@@ -9,10 +9,12 @@
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.utils.WebUtils;
import com.ruoyi.system.model.TAppUser;
import com.ruoyi.system.model.TBigGiftPackageOrder;
import com.ruoyi.system.model.TPhysicalGoods;
import com.ruoyi.system.model.TPhysicalGoodsOrder;
import com.ruoyi.system.query.BigGiftPackageQuery;
import com.ruoyi.system.service.TAppUserService;
import com.ruoyi.system.service.TPhysicalGoodsOrderService;
import com.ruoyi.system.service.TPhysicalGoodsService;
import io.swagger.annotations.Api;
@@ -42,10 +44,12 @@
public class TPhysicalGoodsOrderController {
    private final TPhysicalGoodsOrderService tPhysicalGoodsOrderService;
    private final TPhysicalGoodsService tPhysicalGoodsService;
    private final TAppUserService tAppUserService;

    public TPhysicalGoodsOrderController(TPhysicalGoodsOrderService tPhysicalGoodsOrderService, TPhysicalGoodsService tPhysicalGoodsService) {
    public TPhysicalGoodsOrderController(TPhysicalGoodsOrderService tPhysicalGoodsOrderService, TPhysicalGoodsService tPhysicalGoodsService, TAppUserService tAppUserService) {
        this.tPhysicalGoodsOrderService = tPhysicalGoodsOrderService;
        this.tPhysicalGoodsService = tPhysicalGoodsService;
        this.tAppUserService = tAppUserService;
    }


@@ -68,6 +72,12 @@
        order.setPhysicalGoodsCover(jsonObject.getString("coverImage"));
        order.setPhysicalGoodsPrice(new BigDecimal(jsonObject.getString("totalPrice")).setScale(2, BigDecimal.ROUND_HALF_UP));
        order.setPhysicalGoodsIntro(jsonObject.getString("introduction"));

        Integer appUserId = order.getAppUserId();
        TAppUser appUser = tAppUserService.getById(appUserId);
        order.setUserName(appUser.getName());
        order.setPhone(appUser.getPhone());

        return R.ok(order);
    }