Browse Source

* bug 修改

顾绍勇 5 years ago
parent
commit
73e4e8c6dd

+ 2
- 2
src/main/java/com/huiju/estateagents/redpack/controller/TaRedPacketController.java View File

128
      * @return
128
      * @return
129
      */
129
      */
130
     @RequestMapping(value = "/admin/redPacket/update", method = RequestMethod.PUT)
130
     @RequestMapping(value = "/admin/redPacket/update", method = RequestMethod.PUT)
131
-    public ResponseBean taRedPacketUpdate(@RequestBody TaRedPacket taRedPacket) {
131
+    public ResponseBean taRedPacketUpdate(@RequestBody TaRedPacket taRedPacket,HttpServletRequest request) {
132
         ResponseBean responseBean = new ResponseBean();
132
         ResponseBean responseBean = new ResponseBean();
133
         try {
133
         try {
134
-            responseBean = iTaRedPacketService.updateRedPacket(taRedPacket);
134
+            responseBean = iTaRedPacketService.updateRedPacket(taRedPacket,getOrgId(request));
135
         } catch (Exception e) {
135
         } catch (Exception e) {
136
             logger.error("taRedPacketUpdate -=- {}", e);
136
             logger.error("taRedPacketUpdate -=- {}", e);
137
             responseBean.addError(e.getMessage());
137
             responseBean.addError(e.getMessage());

+ 1
- 1
src/main/java/com/huiju/estateagents/redpack/service/ITaRedPacketService.java View File

35
      * @param taRedPacket
35
      * @param taRedPacket
36
      * @return
36
      * @return
37
      */
37
      */
38
-    ResponseBean updateRedPacket(TaRedPacket taRedPacket);
38
+    ResponseBean updateRedPacket(TaRedPacket taRedPacket,Integer orgId);
39
 
39
 
40
     /**
40
     /**
41
      * 根据ID查询红包图片信息
41
      * 根据ID查询红包图片信息

+ 2
- 2
src/main/java/com/huiju/estateagents/redpack/service/impl/TaRedPacketServiceImpl.java View File

81
     }
81
     }
82
 
82
 
83
     @Override
83
     @Override
84
-    public ResponseBean updateRedPacket(TaRedPacket taRedPacket) {
84
+    public ResponseBean updateRedPacket(TaRedPacket taRedPacket,Integer orgId) {
85
         ResponseBean responseBean = new ResponseBean();
85
         ResponseBean responseBean = new ResponseBean();
86
         Boolean updateResult = updateById(taRedPacket);
86
         Boolean updateResult = updateById(taRedPacket);
87
         if (!updateResult) {
87
         if (!updateResult) {
94
         UpdateWrapper<TaDrainage> taDrainageUpdateWrapper = new UpdateWrapper<>();
94
         UpdateWrapper<TaDrainage> taDrainageUpdateWrapper = new UpdateWrapper<>();
95
         taDrainageUpdateWrapper.eq("activity_id", taRedPacket.getActivityId());
95
         taDrainageUpdateWrapper.eq("activity_id", taRedPacket.getActivityId());
96
         taDrainageUpdateWrapper.eq("status", CommConstant.STATUS_NORMAL);
96
         taDrainageUpdateWrapper.eq("status", CommConstant.STATUS_NORMAL);
97
-        taDrainageUpdateWrapper.eq("org_id", taRedPacket.getOrgId());
97
+        taDrainageUpdateWrapper.eq("org_id", orgId);
98
 
98
 
99
         TaDrainage taDrainage = new TaDrainage();
99
         TaDrainage taDrainage = new TaDrainage();
100
         taDrainage.setBuildingId(taRedPacket.getBuildingId());
100
         taDrainage.setBuildingId(taRedPacket.getBuildingId());