Merge remote-tracking branch 'origin/master'

admin

2019-03-15 a8e45a802600ca1cde28fe8522a26635328bbd99

 fanli/src/main/java/com/yeshi/fanli/service/impl/goods/SuperGoodsClassServiceImpl.java

@@ -17,8 +17,8 @@
import com.yeshi.fanli.dao.goods.SuperGoodsClassDao;

import com.yeshi.fanli.entity.bus.clazz.GoodsClass;

import com.yeshi.fanli.entity.bus.su.clazz.SuperGoodsClass;

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.goods.SuperGoodsClassService;



@Service

@@ -28,7 +28,9 @@
   private SuperGoodsClassDao superGoodsClassDao;

   

   @Resource

   private SystemService systemService;

   private BusinessSystemService businessSystemService;

	
	
   @Cacheable(value="classCache", key="'getSuperGoodsClassBySystemId-'+#id")

   public List<SuperGoodsClass> getSuperGoodsClassBySystemId(long id) {

      

@@ -76,7 +78,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 SuperGoodsClass shs "

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

@@ -91,7 +93,7 @@


   public void addSuperGoodsClass(long gcid, String platform,

         String packageName) {

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

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

      SuperGoodsClass superGoodsClass = new SuperGoodsClass();

      GoodsClass goodsClass = new GoodsClass();

      goodsClass.setId(gcid);