From a52403161590d16c98c776639efc929868c71a27 Mon Sep 17 00:00:00 2001
From: 44323 <443237572@qq.com>
Date: 星期四, 07 十二月 2023 14:46:08 +0800
Subject: [PATCH] 11.27,9

---
 cloud-server-activity/src/main/java/com/dsh/activity/controller/PointMercharsController.java |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/cloud-server-activity/src/main/java/com/dsh/activity/controller/PointMercharsController.java b/cloud-server-activity/src/main/java/com/dsh/activity/controller/PointMercharsController.java
index 40f35ea..e674942 100644
--- a/cloud-server-activity/src/main/java/com/dsh/activity/controller/PointMercharsController.java
+++ b/cloud-server-activity/src/main/java/com/dsh/activity/controller/PointMercharsController.java
@@ -897,7 +897,7 @@
                             //detailsResponse.setRid(rid);
                             // todo 修改区域id 临时
                             // 根据门店id 写死区域id 后续调整为门票指定多个区域
-                            // 以下代码均为临时代码
+                            // 以下代码均为临时代码===============================
                             for (Integer integer : collect) {
                                 ArrayList<Integer> list2 = new ArrayList<>();
                                 if (integer==2024){
@@ -918,6 +918,7 @@
                                     }
                                 }
                             }
+                            //======================================================
                         }
                     }
 
@@ -1729,6 +1730,7 @@
     public Integer add(@RequestBody PointsMerchandise pointsMerchandise) {
         Integer storeId = pointsMerchandise.getShelves();
         pointsMerchandise.setShelves(1);
+        pointsMerchandise.setInsertTime(new Date());
         boolean save = pmdsService.save(pointsMerchandise);
         if (save && ToolUtil.isNotEmpty(storeId) && pointsMerchandise.getType() == 2) {
             PointsMerchandiseStore pointsMerchandiseStore = new PointsMerchandiseStore();

--
Gitblit v1.7.1