Merge remote-tracking branch 'origin/div' into div

admin

2020-06-22 07a64ebd6da54fb9481d9bf7e7afce62dce1ff21

 fanli/src/main/java/com/yeshi/fanli/service/impl/user/cloud/UserCloudOrderServiceImpl.java

@@ -8,13 +8,13 @@


import org.springframework.context.annotation.Lazy;

import org.springframework.stereotype.Service;

import org.springframework.transaction.annotation.Transactional;



import com.yeshi.fanli.dao.mybatis.user.cloud.UserCloudOrderMapper;

import com.yeshi.fanli.entity.bus.user.cloud.CloudOrderMenuEnum;

import com.yeshi.fanli.entity.bus.user.cloud.UserCloudOrder;

import com.yeshi.fanli.exception.user.cloud.UserCloudOrderException;

import com.yeshi.fanli.log.LogHelper;

import com.yeshi.fanli.service.inter.msg.UserOtherMsgNotificationService;

import com.yeshi.fanli.service.inter.user.cloud.UserCloudOrderService;

import com.yeshi.fanli.service.inter.user.cloud.UserCloudService;



@@ -28,6 +28,8 @@
   @Lazy

   @Resource

   private UserCloudService userCloudService;

	
	
   

   @Override

   public UserCloudOrder addCloudOrder(Long uid, String type) throws UserCloudOrderException{

@@ -60,7 +62,6 @@
   }

   

   

   @Transactional(rollbackFor = Exception.class)

   @Override

   public void cloudPayCloudSuccess(Long orderId) throws UserCloudOrderException{

      UserCloudOrder cloudOrder = userCloudOrderMapper.selectForUpdate(orderId);

@@ -73,6 +74,7 @@
      UserCloudOrder updateOrder = new UserCloudOrder();

      updateOrder.setState(true);

      updateOrder.setId(cloudOrder.getId());

      updateOrder.setDesc("成功开通" + cloudOrder.getType().getDescShow());

      updateOrder.setUpdateTime(new Date());

      userCloudOrderMapper.updateByPrimaryKeySelective(updateOrder);