顾绍勇 4 gadus atpakaļ
vecāks
revīzija
e207dc7102

+ 5
- 1
src/main/java/com/huiju/estateagents/drainage/service/impl/TaDrainageServiceImpl.java Parādīt failu

@@ -16,6 +16,8 @@ import com.huiju.estateagents.redpack.service.ITaRedPacketService;
16 16
 import com.huiju.estateagents.service.IMiniAppService;
17 17
 import com.huiju.estateagents.third.entity.TaThirdPartyMiniappConfig;
18 18
 import com.huiju.estateagents.third.service.ITaThirdPartyMiniappConfigService;
19
+import org.slf4j.Logger;
20
+import org.slf4j.LoggerFactory;
19 21
 import org.springframework.beans.factory.annotation.Autowired;
20 22
 import org.springframework.stereotype.Service;
21 23
 
@@ -32,6 +34,8 @@ import java.time.LocalDateTime;
32 34
 @Service
33 35
 public class TaDrainageServiceImpl extends ServiceImpl<TaDrainageMapper, TaDrainage> implements ITaDrainageService {
34 36
 
37
+    private Logger logger = LoggerFactory.getLogger(TaDrainageServiceImpl.class);
38
+
35 39
     @Autowired
36 40
     private TaDrainageMapper taDrainageMapper;
37 41
 
@@ -56,7 +60,6 @@ public class TaDrainageServiceImpl extends ServiceImpl<TaDrainageMapper, TaDrain
56 60
     public ResponseBean saveDrainage(TaDrainage taDrainage, Integer orgId, Integer userId) {
57 61
         ResponseBean responseBean = new ResponseBean();
58 62
 
59
-
60 63
         // 1.保存H5活动信息
61 64
         taDrainage.setOrgId(orgId);
62 65
         taDrainage.setCreateUser(userId);
@@ -80,6 +83,7 @@ public class TaDrainageServiceImpl extends ServiceImpl<TaDrainageMapper, TaDrain
80 83
 
81 84
         // 3.初始化活动(红包)相关数据
82 85
         String activityId = CommonUtils.getUUIDS();
86
+        logger.info("生成activityId为:" + activityId);
83 87
         TaRedPacket taRedPacket = new TaRedPacket();
84 88
         taRedPacket.setOrgId(orgId);
85 89
         taRedPacket.setActivityId(activityId);

+ 2
- 0
src/main/java/com/huiju/estateagents/redpack/service/ITaRedPacketService.java Parādīt failu

@@ -3,6 +3,7 @@ package com.huiju.estateagents.redpack.service;
3 3
 import com.baomidou.mybatisplus.extension.service.IService;
4 4
 import com.huiju.estateagents.base.ResponseBean;
5 5
 import com.huiju.estateagents.redpack.entity.TaRedPacket;
6
+import org.springframework.transaction.annotation.Transactional;
6 7
 
7 8
 import javax.servlet.http.HttpServletResponse;
8 9
 import java.time.LocalDate;
@@ -23,6 +24,7 @@ public interface ITaRedPacketService extends IService<TaRedPacket> {
23 24
      * @param record
24 25
      * @return
25 26
      */
27
+    @Transactional
26 28
     ResponseBean initializeRedPacket(TaRedPacket record);
27 29
 
28 30
 

+ 10
- 14
src/main/resources/mapper/redpack/TaRedPacketMapper.xml Parādīt failu

@@ -16,9 +16,7 @@
16 16
         `building_name`,
17 17
         `poster_show_pos`,
18 18
         `join_fields`,
19
-        `org_id`,
20
-        `create_date`,
21
-        `status`
19
+        `org_id`
22 20
         ) SELECT
23 21
         #{activityId},
24 22
         #{name},
@@ -32,13 +30,11 @@
32 30
         `building_name`,
33 31
         `poster_show_pos`,
34 32
         `join_fields`,
35
-        #{orgId},
36
-        `create_date`,
37
-        `status`
33
+        #{orgId}
38 34
         FROM
39 35
             ta_red_packet t2
40 36
         WHERE
41
-            activity_id =1
37
+            activity_id = '1'
42 38
     </insert>
43 39
 
44 40
     <insert id="initRedPacketHelp">
@@ -67,7 +63,7 @@
67 63
         FROM
68 64
             ta_red_packet_help t2
69 65
         WHERE
70
-            activity_id =1
66
+            activity_id ='1'
71 67
     </insert>
72 68
 
73 69
     <insert id="initRedPacketClient">
@@ -75,7 +71,7 @@
75 71
            `activity_id`,
76 72
            `mch_name`,
77 73
             `blessing`,
78
-            'activity_name`,
74
+            `activity_name`,
79 75
             `remark`
80 76
          ) SELECT
81 77
             #{activityId},
@@ -86,7 +82,7 @@
86 82
         FROM
87 83
             ta_red_packet_client t2
88 84
         WHERE
89
-            activity_id = 1
85
+            activity_id = '1'
90 86
     </insert>
91 87
 
92 88
     <insert id="initRedPacketMoney">
@@ -102,20 +98,20 @@
102 98
         FROM
103 99
             ta_red_packet_money t2 
104 100
         WHERE
105
-            activity_id =1
101
+            activity_id ='1'
106 102
     </insert>
107 103
 
108 104
     <insert id="initRedPacketImages">
109
-        INSERT INTO ta_h5_sample ( `activity_type`, `activity_id`, `image_type`, `image_url`, `sort_no` ) SELECT
105
+        INSERT INTO ta_h5_images ( `activity_type`, `activity_id`, `image_type`, `image_url`, `sort_no` ) SELECT
110 106
             `activity_type`,
111 107
             #{activityId},
112 108
             `image_type`,
113 109
             `image_url`,
114 110
             `sort_no`
115 111
         FROM
116
-            ta_h5_sample t2
112
+            ta_h5_images t2
117 113
         WHERE
118
-            t2.activity_id = 1
114
+            t2.activity_id = '1'
119 115
     </insert>
120 116
 
121 117
     <select id = "listVisitRecordByCondition" resultType="com.huiju.estateagents.entity.TaCustomerFrom">