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

admin

2020-06-24 d0da0aa5e01dd73b7fca8e59ff2664d7e6076802

 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;



@@ -29,6 +29,8 @@
   @Resource

   private UserCloudService userCloudService;

   

	
	
   @Override

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

      if (uid == null)