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

admin

2020-05-20 98b1a0affd69bbe63223c21fdd2c404e8bedfccb

 fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserSystemCouponGiveRecordServiceImpl.java

@@ -7,7 +7,9 @@
import org.springframework.stereotype.Service;



import com.yeshi.fanli.dao.mybatis.user.UserSystemCouponGiveRecordMapper;

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

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

import com.yeshi.fanli.service.inter.user.UserInfoService;

import com.yeshi.fanli.service.inter.user.UserSystemCouponGiveRecordService;



@Service

@@ -16,10 +18,17 @@
   @Resource

   private UserSystemCouponGiveRecordMapper userSystemCouponGiveRecordMapper;

   

   @Resource

   private UserInfoService userInfoService;

   

   @Override

   public void insertSelective(UserSystemCouponGiveRecord record) {

      userSystemCouponGiveRecordMapper.insertSelective(record);

   }

	
   @Override

   public UserSystemCouponGiveRecord selectByPrimaryKey(Long id) {

      return userSystemCouponGiveRecordMapper.selectByPrimaryKey(id);

   }

   

   @Override

@@ -36,4 +45,47 @@
   public List<UserSystemCouponGiveRecord> overdueList(int count) {

      return userSystemCouponGiveRecordMapper.overdueList(count);

   }

	
   @Override

   public List<UserSystemCouponGiveRecord> overdueListByUser(Long uid) {

      return userSystemCouponGiveRecordMapper.overdueListByUser(uid);

   }



   @Override

   public UserSystemCouponGiveRecord getByReceiveId(Long receiveId) {

      return userSystemCouponGiveRecordMapper.getByReceiveId(receiveId);

   }

	
   @Override

   public List<UserSystemCouponGiveRecord> listGiveRecord(long start, int count, String type, Integer state) {

      List<UserSystemCouponGiveRecord> list = userSystemCouponGiveRecordMapper.listGiveRecord(start, count, type, state);

      if (list == null || list.size() == 0)			
         return list;

		
      for (UserSystemCouponGiveRecord giveRecord: list) {

         UserInfo giveUser = userInfoService.selectByPKey(giveRecord.getGiveUid());

         if (giveUser != null) 
            giveRecord.setGiveName(giveUser.getNickName());

			
         Long receiveUid = giveRecord.getReceiveUid();

         if (receiveUid == null)

            continue;

			
         UserInfo receiveUser = userInfoService.selectByPKey(receiveUid);

         if (receiveUser != null) 
            giveRecord.setReceiveName(receiveUser.getNickName());

      }

      return list;

   }

	
	
   @Override

   public long countGiveRecord(String type, Integer state) {

      return userSystemCouponGiveRecordMapper.countGiveRecord(type, state);

   }



   @Override

   public UserSystemCouponGiveRecord getByCouponId(Long couponId) {

      return userSystemCouponGiveRecordMapper.getByCouponId(couponId);

   }

}