Merge remote-tracking branch 'origin/master'

admin

2019-03-15 a8e45a802600ca1cde28fe8522a26635328bbd99

 fanli/src/main/java/com/yeshi/fanli/service/impl/hongbao/SuperHongBaoActivityServiceImpl.java

@@ -16,8 +16,8 @@
import com.yeshi.fanli.dao.goods.SuperHongBaoActivityDao;

import com.yeshi.fanli.entity.bus.su.hongbao.SuperHongBaoActivity;

import com.yeshi.fanli.entity.bus.user.HongBaoActivity;

import com.yeshi.fanli.entity.system.System;

import com.yeshi.fanli.service.inter.config.SystemService;

import com.yeshi.fanli.entity.system.BusinessSystem;

import com.yeshi.fanli.service.inter.config.BusinessSystemService;

import com.yeshi.fanli.service.inter.hongbao.SuperHongBaoActivityService;



@Service

@@ -28,7 +28,7 @@
   private SuperHongBaoActivityDao superHongBaoActivityDao; 

   

   @Resource

   private SystemService systemService;

   private BusinessSystemService businessSystemService;

   

   public List<SuperHongBaoActivity> getSuperHongBaoActivitysByHongBaoActivitys(

         List<Long> hbaIdList) {

@@ -68,7 +68,7 @@


         public Integer doInHibernate(Session session)

               throws HibernateException {

            System system = systemService.getSystem(platform, packageName);

            BusinessSystem system = businessSystemService.getBusinessSystem(platform, packageName);

            Transaction transaction = session.beginTransaction();

            Query query = session.createQuery("delete SuperHongBaoActivity shs "

                     + " where shs.hongBaoActivity.id=? and shs.system.id=?");

@@ -83,7 +83,7 @@


   public void addSuperHongBaoActivity(long id, String platform,

         String packageName) {

      System system = systemService.getSystem(platform,packageName);

      BusinessSystem system = businessSystemService.getBusinessSystem(platform,packageName);

      SuperHongBaoActivity superHongBaoActivity = new SuperHongBaoActivity();

      HongBaoActivity hongBaoActivity = new HongBaoActivity();

      hongBaoActivity.setId(id);