2 Revīzijas

Autors SHA1 Ziņojums Datums
  dingxin 6c4ecd751d 合并 5 gadus atpakaļ
  dingxin a4e0274fb6 合并 5 gadus atpakaļ

+ 2
- 1
src/main/java/com/huiju/estateagents/controller/HelpActivityController.java Parādīt failu

164
         helpActivity.setStatus(1);
164
         helpActivity.setStatus(1);
165
         helpActivity.setWeight(0);
165
         helpActivity.setWeight(0);
166
         helpActivity.setIsMain(false);
166
         helpActivity.setIsMain(false);
167
-        taHelpActivityService.helpActivityAdd(helpActivity, orgId);
167
+         int id = taHelpActivityService.helpActivityAdd(helpActivity, orgId);
168
+        responseBean.addSuccess(id);
168
         return responseBean;
169
         return responseBean;
169
     }
170
     }
170
 
171
 

+ 2
- 1
src/main/java/com/huiju/estateagents/controller/TaShareActivityController.java Parādīt failu

126
     @RequestMapping(value="/admin/taShareActivity",method= RequestMethod.POST)
126
     @RequestMapping(value="/admin/taShareActivity",method= RequestMethod.POST)
127
     public ResponseBean taShareActivityAdd(@RequestBody String parameter, HttpServletRequest request){
127
     public ResponseBean taShareActivityAdd(@RequestBody String parameter, HttpServletRequest request){
128
         ResponseBean responseBean = new ResponseBean();
128
         ResponseBean responseBean = new ResponseBean();
129
+        TaShareActivity taShareActivity = JSONObject.parseObject(parameter, TaShareActivity.class);
129
         try {
130
         try {
130
-            TaShareActivity taShareActivity = JSONObject.parseObject(parameter, TaShareActivity.class);
131
             if  (taShareActivity.getGroupBuyPeople() <= 1){
131
             if  (taShareActivity.getGroupBuyPeople() <= 1){
132
                 responseBean.addError("拼团人数必须大于等于2人");
132
                 responseBean.addError("拼团人数必须大于等于2人");
133
                 return responseBean;
133
                 return responseBean;
158
             logger.error("taShareActivityAdd -=- {}",e.toString());
158
             logger.error("taShareActivityAdd -=- {}",e.toString());
159
             responseBean.addError(e.getMessage());
159
             responseBean.addError(e.getMessage());
160
         }
160
         }
161
+        responseBean.addSuccess(taShareActivity.getGroupActivityId());
161
         return responseBean;
162
         return responseBean;
162
     }
163
     }
163
 
164
 

+ 1
- 1
src/main/java/com/huiju/estateagents/service/IHelpActivityService.java Parādīt failu

38
      * 活动助力添加
38
      * 活动助力添加
39
      * @param helpActivity
39
      * @param helpActivity
40
      */
40
      */
41
-    void helpActivityAdd(HelpActivity helpActivity,Integer orgId);
41
+    int helpActivityAdd(HelpActivity helpActivity,Integer orgId);
42
 
42
 
43
     /**
43
     /**
44
      * 活动助力修改
44
      * 活动助力修改

+ 3
- 2
src/main/java/com/huiju/estateagents/service/impl/HelpActivityServiceImpl.java Parādīt failu

65
     }
65
     }
66
 
66
 
67
     @Override
67
     @Override
68
-    public void helpActivityAdd(HelpActivity helpActivity, Integer orgId) {
68
+    public int helpActivityAdd(HelpActivity helpActivity, Integer orgId) {
69
         helpActivity.setOrgId(orgId)
69
         helpActivity.setOrgId(orgId)
70
                 .setCreateDate(LocalDateTime.now());
70
                 .setCreateDate(LocalDateTime.now());
71
-        taHelpActivityMapper.insert(helpActivity);
71
+                taHelpActivityMapper.insert(helpActivity);
72
+        return helpActivity.getHelpActivityId();
72
     }
73
     }
73
 
74
 
74
     @Override
75
     @Override