Merge remote-tracking branch 'origin/master'

admin

2019-02-28 32d0a71284b509a365cc9d1eab6103e8073a7f1d

Merge remote-tracking branch 'origin/master'

 fanli/src/main/java/com/yeshi/fanli/controller/client/RecommendController.java

@@ -2064,16 +2064,20 @@
        data.put("couponUsers", listCouponUser);

        data.put("detailWebUrl", "http://apph5.yeshitv.com/apppage/goods_img.html?id=" + id);



        JSONObject shareActivity = new JSONObject();

        shareActivity.put("moneyDesc", "春节狂欢奖金:¥" + TaoBaoUtil.getGoodsHongBaoMoney(tb,

                new BigDecimal(hongBaoManageService.get("share_activity_proportion"))));

        shareActivity.put("ruleDescPicture", "http://img.flqapp.com/resource/share_activity_img.png");

		


        if (!StringUtil.isNullOrEmpty(uid)

                && shareGoodsActivityOrderService.countShareGoodsActivityOrder(Long.parseLong(uid)) > 0) {

        } else

        } else if(!"miandan".equals(from)) {

            // 非免单商品

            JSONObject shareActivity = new JSONObject();

            shareActivity.put("moneyDesc", "春节狂欢奖金:¥" + TaoBaoUtil.getGoodsHongBaoMoney(tb,

                    new BigDecimal(hongBaoManageService.get("share_activity_proportion"))));

            shareActivity.put("ruleDescPicture", "http://img.flqapp.com/resource/share_activity_img.png");

			
            data.put("shareActivity", shareActivity);



        } 
		
        out.print(JsonUtil.loadTrueResult(data));



        final String tempUid = uid;


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

@@ -233,7 +233,7 @@
    }



    

	
    @Transactional

    @Override

    public List<UserSystemCouponVO> getUserCouponVOList(long start, int count, Long uid)

            throws UserSystemCouponException, Exception {

@@ -484,6 +484,7 @@
        return hasCoupon;

    }



    @Transactional

    @Override

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

        if (uid == null) {

@@ -504,6 +505,7 @@
        return getEnableListByCouponId(uid, 1, couponList);

    }



    @Transactional

    @Override

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

        

@@ -548,6 +550,7 @@
        return list;

    }



    @Transactional

    @Override

    public void useGoodsCoupon(Long uid, Long id, Long goodId) throws UserSystemCouponException, Exception {

        if (uid == null) {

@@ -804,6 +807,7 @@
        return userRecordVO;

    }



	
    @Override

    public UserSystemCouponRecordVO getFreeCouponRecord(String orderNo) throws UserSystemCouponException, Exception {



@@ -1005,7 +1009,7 @@
        return userRecordVO;

    }

    

	
    @Transactional

    @Override

    public void activatedWelfareFreeCoupon(Long uid) {

        if (uid == null) {

@@ -1044,6 +1048,7 @@
        }

    }

    

    @Transactional

    @Override

    public void updateStateByDrawback(String orderNo) throws Exception {

        

@@ -1065,6 +1070,7 @@
        sendBackCoupon(record.getUserSystemCoupon());

    }

    

    @Transactional

    @Override

    public void updateStateByArrivalAccount(String orderNo) throws Exception {

        

@@ -1083,6 +1089,7 @@
        userSystemCouponRecordService.updateByPrimaryKeySelective(record);

    }



    @Transactional

    @Override

    public void updateCounponInvalid(Long uid) {

        List<UserSystemCoupon> list = userSystemCouponMapper.getCounponNowInvalid(uid);

@@ -1125,6 +1132,7 @@
        }

    }

    

    @Transactional

    @Override

    public void  sendBackTimeOutCoupon(Long uid) {

        // 超过120秒 未被匹配的券

@@ -1170,6 +1178,7 @@
        }

    }

    

    @Transactional

    @Override

    public boolean updateCouponRecordUsed(Long uid, String orderNo, BigDecimal payment,

            Long auctionId) throws  Exception{