合并

src/main/java/com/huiju/estateagents/controller/HelpActivityController.java

@@ -164,7 +164,8 @@ public class HelpActivityController extends BaseController {
         helpActivity.setStatus(1);
         helpActivity.setWeight(0);
         helpActivity.setIsMain(false);
-        taHelpActivityService.helpActivityAdd(helpActivity, orgId);
+         int id = taHelpActivityService.helpActivityAdd(helpActivity, orgId);
+        responseBean.addSuccess(id);
         return responseBean;
     }
 

src/main/java/com/huiju/estateagents/controller/TaShareActivityController.java

@@ -126,8 +126,8 @@ public class TaShareActivityController extends BaseController {
     @RequestMapping(value="/admin/taShareActivity",method= RequestMethod.POST)
     public ResponseBean taShareActivityAdd(@RequestBody String parameter, HttpServletRequest request){
         ResponseBean responseBean = new ResponseBean();
+        TaShareActivity taShareActivity = JSONObject.parseObject(parameter, TaShareActivity.class);
         try {
-            TaShareActivity taShareActivity = JSONObject.parseObject(parameter, TaShareActivity.class);
             if  (taShareActivity.getGroupBuyPeople() <= 1){
                 responseBean.addError("拼团人数必须大于等于2人");
                 return responseBean;
@@ -158,6 +158,7 @@ public class TaShareActivityController extends BaseController {
             logger.error("taShareActivityAdd -=- {}",e.toString());
             responseBean.addError(e.getMessage());
         }
+        responseBean.addSuccess(taShareActivity.getGroupActivityId());
         return responseBean;
     }
 

src/main/java/com/huiju/estateagents/service/IHelpActivityService.java

@@ -38,7 +38,7 @@ public interface IHelpActivityService extends IService<HelpActivity> {
      * 活动助力添加
      * @param helpActivity
      */
-    void helpActivityAdd(HelpActivity helpActivity,Integer orgId);
+    int helpActivityAdd(HelpActivity helpActivity,Integer orgId);
 
     /**
      * 活动助力修改

src/main/java/com/huiju/estateagents/service/impl/HelpActivityServiceImpl.java

@@ -65,10 +65,11 @@ public class HelpActivityServiceImpl extends ServiceImpl<HelpActivityMapper, Hel
     }
 
     @Override
-    public void helpActivityAdd(HelpActivity helpActivity, Integer orgId) {
+    public int helpActivityAdd(HelpActivity helpActivity, Integer orgId) {
         helpActivity.setOrgId(orgId)
                 .setCreateDate(LocalDateTime.now());
-        taHelpActivityMapper.insert(helpActivity);
+                taHelpActivityMapper.insert(helpActivity);
+        return helpActivity.getHelpActivityId();
     }
 
     @Override