From 5be0db736e75bf044b79b7d68682839a65f8fc27 Mon Sep 17 00:00:00 2001
From: Carl <376654749@qq.com>
Date: Thu, 30 Dec 2021 14:44:54 +0800
Subject: [PATCH] modify

---
 .../module/system/royalcanin/good/OrderController.java       | 5 +++++
 .../src/main/resources/dev/application.properties            | 2 +-
 .../smart-admin-api/src/main/resources/sql/smart-admin.sql   | 2 +-
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/good/OrderController.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/good/OrderController.java
index 2e53e1f3..bcc9e264 100644
--- a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/good/OrderController.java
+++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/good/OrderController.java
@@ -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.royalcanin.good.constant.OrderResponseCodeConst;
 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.orderMaster.AddOrSaveEntity;
 import net.lab1024.smartadmin.module.system.royalcanin.orderMaster.OrderDatilListEntity;
@@ -43,6 +44,9 @@ public class OrderController {
     @Autowired
     private AliPayService aliPayService;
 
+    @Autowired
+    private CartService cartService;
+
     @ApiOperation(value = "微信支付订单", notes = "生成订单")
     @PostMapping("royalcanin/generateOrderWX")
     public ResponseDTO<String> generateOrderWX(@RequestBody List<OrdersEntity> ordersEntityList) throws Exception {
@@ -56,6 +60,7 @@ public class OrderController {
         JSONArray orderDatilListJson = new JSONArray();
         OrdersEntity ordersEntity = new OrdersEntity();
         for (OrdersEntity ordersEntitys:ordersEntityList) {
+            cartService.cancelProduct(ordersEntitys.getMemberId(),ordersEntity.getProductId());
             //存储orderDetailList
             OrderDatilListEntity orderDatilListEntity= new OrderDatilListEntity();
             orderDatilListEntity.setProductName(ordersEntitys.getProductName());
diff --git a/smart-admin-service/smart-admin-api/src/main/resources/dev/application.properties b/smart-admin-service/smart-admin-api/src/main/resources/dev/application.properties
index 5f17e5f2..c12dbd0e 100644
--- a/smart-admin-service/smart-admin-api/src/main/resources/dev/application.properties
+++ b/smart-admin-service/smart-admin-api/src/main/resources/dev/application.properties
@@ -1,5 +1,5 @@
 ######################### server ###################
-server.servlet.context-path=/smart-admin-api
+server.servlet.context-path=/royalcanin
 server.port=10086
 spring.profiles.active=@profiles.active@
 
diff --git a/smart-admin-service/smart-admin-api/src/main/resources/sql/smart-admin.sql b/smart-admin-service/smart-admin-api/src/main/resources/sql/smart-admin.sql
index 8cc10ff4..a3bd64d0 100644
--- a/smart-admin-service/smart-admin-api/src/main/resources/sql/smart-admin.sql
+++ b/smart-admin-service/smart-admin-api/src/main/resources/sql/smart-admin.sql
@@ -1674,7 +1674,7 @@ CREATE TABLE IF NOT EXISTS `t_royalcanin_cart` (
   `product_code` varchar(20) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
   `product_price` decimal(20,1) 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,
   `buy_count` int(20) DEFAULT NULL,
   `member_id` varchar(20) COLLATE utf8mb4_unicode_ci DEFAULT NULL,