From 78676e7c2e4e06080a45fb6802bd32fd931cead3 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期五, 23 八月 2024 10:36:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TShoppingOrderController.java | 48 ++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 48 insertions(+), 0 deletions(-)
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TShoppingOrderController.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TShoppingOrderController.java
index e853464..5b448ec 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TShoppingOrderController.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TShoppingOrderController.java
@@ -1,6 +1,11 @@
package com.ruoyi.order.controller;
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.core.dto.ExchangeDto;
+import com.ruoyi.common.core.utils.OrderCodeUtil;
import com.ruoyi.common.core.web.domain.AjaxResult;
import com.ruoyi.order.api.model.TExchangeOrder;
import com.ruoyi.order.api.model.TShoppingOrder;
@@ -82,5 +87,48 @@
List<MyShoppingOrderList> list = shoppingOrderService.getNoInvoicedOrder(query);
return AjaxResult.success(list);
}
+
+// @PostMapping("/create")
+// public R<Long> shopCreate(@RequestBody ExchangeDto exchangeDto){
+// TShoppingOrder shoppingOrder = new TShoppingOrder();
+// shoppingOrder.setCode(OrderCodeUtil.getOrderCode("GW"));
+// shoppingOrder.setAppUserId(exchangeDto.getUserId());
+// shoppingOrder.setOrderType(exchangeDto.getGoodType());
+// if (exchangeDto.getGoodType()==1) {
+// shoppingOrder.setGoodsId(exchangeDto.getGoodId());
+// }else {
+// shoppingOrder.setCouponId(exchangeDto.getGoodId());
+// }
+// shoppingOrder.setPurchaseQuantity(exchangeDto.getNum());
+// shoppingOrder.setAppUserAddressId(Long.valueOf(exchangeDto.getAddressId()));
+// shoppingOrder.setOrderAmount(new BigDecimal("0"));
+// shoppingOrder.setAppCouponId(0L);
+// shoppingOrder.setCouponDiscountAmount(new BigDecimal("0"));
+// shoppingOrder.setVipDiscount(new BigDecimal("0"));
+// shoppingOrder.setVipDiscountAmount(new BigDecimal("0"));
+// shoppingOrder.setPaymentAmount(new BigDecimal("0"));
+// shoppingOrder.setPaymentStatus(0);
+// shoppingOrder.setPaymentType(0);
+// shoppingOrder.setSerialNumber("");
+// shoppingOrder.setRemark("");
+// shoppingOrder.setStatus(0);
+// shoppingOrder.setExpressCompany("");
+// shoppingOrder.setExpressNumber("");
+// shoppingOrder.setConsignerId(0);
+// shoppingOrder.setConsignerTime(LocalDateTime.now());
+// shoppingOrder.setReceivingTime(LocalDateTime.now());
+// shoppingOrder.setCancellationTime(LocalDateTime.now());
+// shoppingOrder.setCancellationId(0);
+// shoppingOrder.setRefundCode("");
+// shoppingOrder.setRefundAmount(new BigDecimal("0"));
+// shoppingOrder.setRefundStatus(0);
+// shoppingOrder.setRefundSerialNumber("");
+// shoppingOrder.setRefundTime(LocalDateTime.now());
+// shoppingOrder.setCreateTime(LocalDateTime.now());
+// shoppingOrder.setDelFlag(false);
+//
+//
+//
+// }
}
--
Gitblit v1.7.1