Home Explore Help
Register Sign In
Amoy2
/
wlyy2.0
Watch 5
Star 1
Fork 18
Files Issues 0 Pull Requests 0 Wiki
Browse Source

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

wangzhinan 6 years ago
parent
553721109d 5cb4f57809
commit
e4270e377d
1 changed files with 3 additions and 1 deletions
Split View Show Diff Stats
  1. 3 1
      svr/svr-wlyy-health-bank/src/main/java/com/yihu/jw/service/ActivityService.java

+ 3 - 1
svr/svr-wlyy-health-bank/src/main/java/com/yihu/jw/service/ActivityService.java
View File 

@ -219,6 +219,8 @@ public class ActivityService extends BaseJpaService<ActivityDO,ActivityDao> {
 
                        taskGoodsDO.setCoupon(jsonObject.getInteger("couponNum"));
 
                        taskGoodsDO.setImg(jsonObject.getString("picUrl"));
 
                        taskGoodsDO.setName(jsonObject.getString("name"));
 
                        taskGoodsDO.setCreateTime(new Date());
 
                        taskGoodsDO.setUpdateTime(new Date());
 
                        taskGoodsDO.setSaasId("dev");
 
                        taskGoodsDO.setStatus(1);
 
                        taskGoodsDao.save(taskGoodsDO);
 
@ -235,7 +237,7 @@ public class ActivityService extends BaseJpaService<ActivityDO,ActivityDao> {
 
        activityRuleDO.setDelFlag(1);
 
        activityRuleDao.save(activityRuleDO);
 
        System.out.println("----------------------------update--"+activityDO.getId()+activityDO.getAreaName());
 
        activityDO.setCreateTime(new Date());
 
//        activityDO.setCreateTime(new Date());
 
        activityDao.save(activityDO);
 
        MixEnvelop<Boolean, Boolean> envelop = new MixEnvelop<>();
 
        envelop.setObj(true);