正式数据库修改

admin

2019-03-13 69bee82b81626b82b7f39f0e459e4f56b1699b51

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

@@ -47,6 +47,8 @@
import com.yeshi.fanli.service.inter.order.HongBaoOrderService;

import com.yeshi.fanli.service.inter.order.OrderHongBaoMapService;

import com.yeshi.fanli.service.inter.order.OrderService;

import com.yeshi.fanli.service.inter.push.PushCouponRecordService;

import com.yeshi.fanli.service.inter.push.PushCouponService;

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

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

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

@@ -128,6 +130,13 @@
   @Resource

   private CommonOrderCountService commonOrderCountService;

   

   @Resource

   private PushCouponService pushCouponService;

	
   @Resource

   private PushCouponRecordService pushCouponRecordService;

	
	
   @Override

   public int insertSelective(UserSystemCoupon record) {

      return userSystemCouponMapper.insertSelective(record);

@@ -172,7 +181,15 @@
         throw new UserSystemCouponException(1, "参数不正确");

      }



      SystemCoupon coupon = systemCouponService.getCouponByType(couponType);

      SystemCoupon coupon = null;

      if (couponType.equals(CouponTypeEnum.welfareFreeCoupon.name())) {

         // 福利免单券

         coupon = systemCouponService.getCouponByType(couponType);

      } else if (couponType.equals(CouponTypeEnum.rebatePercentCoupon.name())) {

         // 奖励券10%

         coupon = systemCouponService.getCouponByTypeAndPercent(couponType,new BigDecimal(10));

      }

		
      if (coupon == null) {

         throw new UserSystemCouponException(1, "券类型不正确");

      }

@@ -512,6 +529,7 @@
   @Transactional

   @Override

   public List<UserSystemCouponVO> getOrderCouponList(Long uid) throws UserSystemCouponException, Exception {

		
      if (uid == null) {

         throw new UserSystemCouponException(1, "用户未登录");

      }

@@ -1536,7 +1554,6 @@
         }

         

         if (receive) {

				
            // 插入记录

            PushCouponRecord pushCouponRecord = new PushCouponRecord();

            pushCouponRecord.setPushCoupon(pushCoupon);