Merge branch 'dev' of http://192.168.1.220:10080/Amoy2/wlyy2.0 into dev

# Conflicts:
#	common/common-entity/src/main/java/com/yihu/jw/entity/health/bank/ActivityDO.java
#	svr/svr-wlyy-health-bank/src/main/java/com/yihu/jw/controller/ActivityController.java
#	svr/svr-wlyy-health-bank/src/main/java/com/yihu/jw/service/ActivityService.java

svr/svr-wlyy-health-bank/src/main/java/com/yihu/jw/service/ActivityService.java

@@ -77,18 +77,20 @@ public class ActivityService extends BaseJpaService<ActivityDO,ActivityDao> {
        if (value3 !=null && value3 !=""){
            JSONObject object = JSONObject.parseObject(value3);
            String exchangeType = object.getString("exchangeType");
            JSONArray array = object.getJSONArray("goodDetail");
            for (int i =0;i<array.size();i++){
                JSONObject jsonObject = array.getJSONObject(i);
                if (exchangeType.equals("1")){
                    TaskGoodsDO taskGoodsDO = new TaskGoodsDO();
                    taskGoodsDO.setActivityId(activityDO.getId());
                    taskGoodsDO.setCoupon(jsonObject.getInteger("couponNum"));
                    taskGoodsDO.setImg(jsonObject.getString("picUrl"));
                    taskGoodsDO.setName(jsonObject.getString("name"));
                    taskGoodsDO.setSaasId("dev");
                    taskGoodsDO.setStatus(1);
                    taskGoodsDao.save(taskGoodsDO);
            if (exchangeType.equals("1")){
                JSONArray array = object.getJSONArray("goodDetail");
                if (array !=null || array.size()!=0){
                    for (int i =0;i<array.size();i++){
                        JSONObject jsonObject = array.getJSONObject(i);
                        TaskGoodsDO taskGoodsDO = new TaskGoodsDO();
                        taskGoodsDO.setActivityId(activityDO.getId());
                        taskGoodsDO.setCoupon(jsonObject.getInteger("couponNum"));
                        taskGoodsDO.setImg(jsonObject.getString("picUrl"));
                        taskGoodsDO.setName(jsonObject.getString("name"));
                        taskGoodsDO.setSaasId("dev");
                        taskGoodsDO.setStatus(1);
                        taskGoodsDao.save(taskGoodsDO);
                    }
                }
            }
        }