xinyin025/smart-admin
1
0
Fork 0
mirror of https://gitee.com/lab1024/smart-admin.git synced 2025-10-02 18:26:38 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

modify

Browse Source
This commit is contained in:
Carl 2021-12-30 14:44:54 +08:00
parent 22801a0927
commit 5be0db736e
3 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/good/OrderController.java
View File

@ -14,6 +14,7 @@ import net.lab1024.smartadmin.module.system.alipay.conf.AlipayConfig;
import net.lab1024.smartadmin.module.system.qrcode.QRCodeUtil; import net.lab1024.smartadmin.module.system.qrcode.QRCodeUtil;
import net.lab1024.smartadmin.module.system.royalcanin.good.constant.OrderResponseCodeConst; import net.lab1024.smartadmin.module.system.royalcanin.good.constant.OrderResponseCodeConst;
import net.lab1024.smartadmin.module.system.royalcanin.good.model.OrdersEntity; import net.lab1024.smartadmin.module.system.royalcanin.good.model.OrdersEntity;
import net.lab1024.smartadmin.module.system.royalcanin.good.service.CartService;
import net.lab1024.smartadmin.module.system.royalcanin.good.service.OrderService; import net.lab1024.smartadmin.module.system.royalcanin.good.service.OrderService;
import net.lab1024.smartadmin.module.system.royalcanin.orderMaster.AddOrSaveEntity; import net.lab1024.smartadmin.module.system.royalcanin.orderMaster.AddOrSaveEntity;
import net.lab1024.smartadmin.module.system.royalcanin.orderMaster.OrderDatilListEntity; import net.lab1024.smartadmin.module.system.royalcanin.orderMaster.OrderDatilListEntity;
@ -43,6 +44,9 @@ public class OrderController {
@Autowired @Autowired
private AliPayService aliPayService; private AliPayService aliPayService;
@Autowired
private CartService cartService;
@ApiOperation(value = "微信支付订单", notes = "生成订单") @ApiOperation(value = "微信支付订单", notes = "生成订单")
@PostMapping("royalcanin/generateOrderWX") @PostMapping("royalcanin/generateOrderWX")
public ResponseDTO<String> generateOrderWX(@RequestBody List<OrdersEntity> ordersEntityList) throws Exception { public ResponseDTO<String> generateOrderWX(@RequestBody List<OrdersEntity> ordersEntityList) throws Exception {
@ -56,6 +60,7 @@ public class OrderController {
JSONArray orderDatilListJson = new JSONArray(); JSONArray orderDatilListJson = new JSONArray();
OrdersEntity ordersEntity = new OrdersEntity(); OrdersEntity ordersEntity = new OrdersEntity();
for (OrdersEntity ordersEntitys:ordersEntityList) { for (OrdersEntity ordersEntitys:ordersEntityList) {
cartService.cancelProduct(ordersEntitys.getMemberId(),ordersEntity.getProductId());
//存储orderDetailList //存储orderDetailList
OrderDatilListEntity orderDatilListEntity= new OrderDatilListEntity(); OrderDatilListEntity orderDatilListEntity= new OrderDatilListEntity();
orderDatilListEntity.setProductName(ordersEntitys.getProductName()); orderDatilListEntity.setProductName(ordersEntitys.getProductName());

2
smart-admin-service/smart-admin-api/src/main/resources/dev/application.properties
View File

@ -1,5 +1,5 @@
######################### server ################### ######################### server ###################
server.servlet.context-path=/smart-admin-api server.servlet.context-path=/royalcanin
server.port=10086 server.port=10086
spring.profiles.active=@profiles.active@ spring.profiles.active=@profiles.active@

2
smart-admin-service/smart-admin-api/src/main/resources/sql/smart-admin.sql
View File

@ -1674,7 +1674,7 @@ CREATE TABLE IF NOT EXISTS `t_royalcanin_cart` (
`product_code` varchar(20) COLLATE utf8mb4_unicode_ci DEFAULT NULL, `product_code` varchar(20) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
`product_price` decimal(20,1) DEFAULT NULL, `product_price` decimal(20,1) DEFAULT NULL,
`product_name` varchar(200) COLLATE utf8mb4_unicode_ci DEFAULT NULL, `product_name` varchar(200) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
`product_img` varchar(200) COLLATE utf8mb4_unicode_ci DEFAULT NULL, `product_img` varchar(5000) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
`specifications` varchar(20) COLLATE utf8mb4_unicode_ci DEFAULT NULL, `specifications` varchar(20) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
`buy_count` int(20) DEFAULT NULL, `buy_count` int(20) DEFAULT NULL,
`member_id` varchar(20) COLLATE utf8mb4_unicode_ci DEFAULT NULL, `member_id` varchar(20) COLLATE utf8mb4_unicode_ci DEFAULT NULL,