奖励券使用区分订单下单三方日期

yujian

2019-08-28 d88c167fc5973a2c15ff1539e4cdab36e4a7842c

奖励券使用区分订单下单三方日期

 fanli/src/main/java/com/yeshi/fanli/controller/client/v1/UserCouponController.java

@@ -119,13 +119,11 @@
                changeJump = true;

            }

            

            long count = 0;

            long count = UserSystemCouponService.countCouponOld(uid);

            List<UserSystemCouponVO> resultList = UserSystemCouponService

                    .getUserCouponVOList((page - 1) * Constant.PAGE_SIZE, Constant.PAGE_SIZE, uid, changeJump);



            if (resultList != null && resultList.size() > 0) {

                count = UserSystemCouponService.countUserCouponList(uid);

            } else if (resultList == null) {

             if (resultList == null) {

                resultList = new ArrayList<UserSystemCouponVO>();

            }




 fanli/src/main/java/com/yeshi/fanli/controller/client/v2/UserCouponControllerV2.java

@@ -2,6 +2,7 @@


import java.io.PrintWriter;

import java.util.ArrayList;

import java.util.Date;

import java.util.List;



import javax.annotation.Resource;

@@ -15,6 +16,7 @@
import com.yeshi.fanli.entity.accept.AcceptData;

import com.yeshi.fanli.entity.bus.homemodule.SwiperPicture;

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

import com.yeshi.fanli.entity.order.CommonOrder;

import com.yeshi.fanli.exception.user.UserInfoExtraException;

import com.yeshi.fanli.exception.user.UserSystemCouponException;

import com.yeshi.fanli.log.LogHelper;

@@ -27,6 +29,8 @@
import com.yeshi.fanli.service.inter.user.UserLotteryRecordService;

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

import com.yeshi.fanli.util.Constant;

import com.yeshi.fanli.util.StringUtil;

import com.yeshi.fanli.util.TimeUtil;

import com.yeshi.fanli.vo.user.UserSystemCouponVO;



import net.sf.json.JSONObject;

@@ -170,4 +174,69 @@
        }

    }



	
    /**

     * 用户奖励券

     * 
     * @param acceptData

     * @param page

     * @param uid

     * @param out

     */

    @RequestMapping(value = "getOrderCouponList", method = RequestMethod.POST)

    public void getOrderCouponList(AcceptData acceptData, Long uid, String orderNo, PrintWriter out) {



        if (uid == null || StringUtil.isNullOrEmpty(orderNo)) {

            out.print(JsonUtil.loadFalseResult("传递参数信息不完整"));

            return;

        }

		
		
        List<CommonOrder> listOrder = commonOrderService.getByOrderNo(uid, orderNo);

        if (listOrder == null || listOrder.size() == 0) {

            out.print(JsonUtil.loadFalseResult("订单号不存在"));

            return;

        }

		
        boolean valid = false;

        long limitDate = TimeUtil.convertDateToTemp("2019-09-01");

        for (CommonOrder commonOrder: listOrder) {

            Integer wholeOrder = commonOrder.getStateWholeOrder();

            if (wholeOrder != null && CommonOrder.STATE_WHOLE_ORDER_SHIXIAO ==  wholeOrder) {

                out.print(JsonUtil.loadFalseResult("整个订单已失效"));

                return;

            }

			
            Date thirdCreateTime = commonOrder.getThirdCreateTime();

            if (thirdCreateTime != null &&  thirdCreateTime.getTime() > limitDate) {

                valid = true; // 1.6.5上线之后下单

            }

        }

		
        try {

			
            List<UserSystemCouponVO> resultList = null;

            if (valid) { 
                 resultList = UserSystemCouponService.getOrderCouponList(uid);

            } else {

                 resultList = UserSystemCouponService.listIncludeNotExchange(uid);

            }

			
            if (resultList == null) {

                resultList = new ArrayList<UserSystemCouponVO>();

            }



            JSONObject data = new JSONObject();

            data.put("helpLink", configService.get("reward_coupon_help"));

            data.put("count", resultList.size());

            data.put("result_list", JsonUtil.getApiCommonGson().toJson(resultList));

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

        } catch (UserSystemCouponException e) {

            out.print(JsonUtil.loadFalseResult(e.getCode(), e.getMsg()));

        } catch (Exception e) {

            out.print(JsonUtil.loadFalseResult(1, "查询失败"));

            LogHelper.errorDetailInfo(e);

        }

    }



}


 fanli/src/main/java/com/yeshi/fanli/dao/mybatis/order/CommonOrderMapper.java

@@ -270,4 +270,13 @@
    List<CommonOrder> listBySourceTypeAndStateAndThirdCrateTime(@Param("sourceType") int sourceType,
            @Param("state") Integer state, @Param("minTime") Long minTime, @Param("maxTime") Long maxTime,
            @Param("start") long start, @Param("count") int count);
	
	
    /**

     * 根据订单号查询

     * @param orderNO

     * @return

     */

    List<CommonOrder> getByOrderNo(@Param("uid") Long uid, @Param("orderNo") String orderNo);



}

 fanli/src/main/java/com/yeshi/fanli/dao/mybatis/user/UserSystemCouponMapper.java

@@ -14,6 +14,13 @@
    List<UserSystemCoupon> getUserCouponList(@Param("start") long start, @Param("count") int count, 

            @Param("uid") Long uid);

    

	
    List<UserSystemCouponVO> getCouponListOld(@Param("start") long start, @Param("count") int count, 
            @Param("uid") Long uid);

	
    long countCouponOld(@Param("uid") Long uid);

	
	
    List<UserSystemCouponVO> getUserCouponVOList(@Param("start") long start, @Param("count") int count, 

            @Param("uid") Long uid);

    

@@ -71,7 +78,7 @@
     * @param source

     * @return

     */

    List<UserSystemCoupon> getIncludeExchange(@Param("uid") Long uid, @Param("list") List<String> list);

    List<UserSystemCoupon> getIncludeExchange(@Param("uid") Long uid, @Param("num") int num, @Param("type") String type);

    

    

    /**

@@ -80,6 +87,6 @@
     * @param source

     * @return

     */

    List<UserSystemCoupon> getIncludeNotExchange(@Param("uid") Long uid,@Param("list") List<String> list);

    List<UserSystemCouponVO> getIncludeNotExchange(@Param("uid") Long uid,@Param("num") int num, @Param("type") String type);

    

}

 fanli/src/main/java/com/yeshi/fanli/mapping/order/CommonOrderMapper.xml

@@ -881,4 +881,9 @@
        </if>
        GROUP BY co.`co_order_no`, co.`co_source_type`
    </select>
	
    <select id="getByOrderNo" resultMap="BaseResultMap">

        SELECT * FROM yeshi_ec_common_order co 
        WHERE co_uid = #{uid} AND co_order_no=#{orderNo}

    </select>

</mapper>

 fanli/src/main/java/com/yeshi/fanli/mapping/user/UserSystemCouponMapper.xml

@@ -113,6 +113,24 @@
         AND TO_DAYS(uc.`usc_create_time`) = TO_DAYS(NOW())

  </select>

  

  
  <select id="getCouponListOld" resultMap="ResultVOMap">

    SELECT * FROM `yeshi_ec_user_system_coupon` uc

    LEFT JOIN `yeshi_ec_system_coupon` c ON uc.`usc_coupon_id` = c.`sc_id`

    WHERE uc.`usc_uid`= #{uid} AND DATEDIFF(NOW(), uc.`usc_end_time`)<![CDATA[<=]]> 30

               AND (uc.`usc_give` IS NULL OR  uc.`usc_give` = 0) AND c.`sc_type` NOT IN ('freeCoupon','freeCouponBuy','freeCouponGive')

    ORDER BY uc.`usc_state`,uc.`usc_create_time` DESC

    LIMIT #{start},#{count}

  </select>

  
  <select id="countCouponOld" resultType="java.lang.Long">

    SELECT IFNULL(count(uc.`usc_id`),0) FROM `yeshi_ec_user_system_coupon` uc

    LEFT JOIN `yeshi_ec_system_coupon` c ON uc.`usc_coupon_id` = c.`sc_id`

    WHERE uc.`usc_uid`= #{uid} AND DATEDIFF(NOW(), uc.`usc_end_time`)<![CDATA[<=]]> 30

               AND (uc.`usc_give` IS NULL OR  uc.`usc_give` = 0) AND c.`sc_type` NOT IN ('freeCoupon','freeCouponBuy','freeCouponGive')

  </select>

  
  
  <select id="getUserCouponVOList" resultMap="ResultVOMap">

    SELECT * FROM `yeshi_ec_user_system_coupon` uc

    WHERE uc.`usc_uid`= #{uid} AND DATEDIFF(NOW(), uc.`usc_end_time`)<![CDATA[ <= ]]> 30

@@ -158,18 +176,16 @@
  </select>

  

  <select id="getIncludeExchange" resultMap="BaseResultMap">

    SELECT * FROM yeshi_ec_user_system_coupon 
    WHERE usc_state_activate = 1 AND usc_state = 1

          AND usc_uid = #{uid} AND usc_source in

          <foreach collection="list" item="item" open="(" close=")"

            separator=",">#{item}</foreach>

     SELECT * FROM `yeshi_ec_user_system_coupon` t

    LEFT JOIN `yeshi_ec_system_coupon` c ON t.`usc_coupon_id` = c.`sc_id`

    WHERE t.usc_state = 1 AND t.usc_state_activate = 1 AND t.usc_uid = #{uid}

        AND c.`sc_percent` = #{num} AND c.`sc_type`= #{type} 
  </select>

  

  <select id="getIncludeNotExchange" resultMap="BaseResultMap">

    SELECT * FROM yeshi_ec_user_system_coupon 
    WHERE usc_state_activate = 1 AND usc_state = 1

          AND usc_uid = #{uid} AND usc_source not in 
          <foreach collection="list" item="item" open="(" close=")"

            separator=",">#{item}</foreach>

  <select id="getIncludeNotExchange" resultMap="ResultVOMap">

      SELECT * FROM `yeshi_ec_user_system_coupon` t

    LEFT JOIN `yeshi_ec_system_coupon` c ON t.`usc_coupon_id` = c.`sc_id`

    WHERE t.usc_state = 1 AND t.usc_state_activate = 1 AND t.usc_uid = #{uid}

        AND c.`sc_percent` <![CDATA[<>]]> #{num} AND c.`sc_type`= #{type} 
  </select>

</mapper>


 fanli/src/main/java/com/yeshi/fanli/service/impl/integral/IntegralGetServiceImpl.java

@@ -417,10 +417,6 @@
    @Override

    public void addRebateOrder(Long uid) {

        try {

            UserInfo boss = getBossByUid(uid);

            if (boss != null)

                addInviteOrderLevelOne(boss.getId());



            addEventStatistic(uid, TaskUniqueKeyEnum.rebateOrder.name());

        } catch (Exception e) {

            LogHelper.errorDetailInfo(e);

@@ -434,12 +430,9 @@
     */

    @IntegralGetVersionLimit(uid = "#uid")

    @Async()

    private void addInviteOrderLevelOne(Long uid) {

    @Override

    public void addInviteOrderLevelOne(Long uid) {

        try {

            UserInfo boss = getBossByUid(uid);

            if (boss != null)

                addInviteOrderLevelTwo(boss.getId());



            addEventStatistic(uid, TaskUniqueKeyEnum.inviteOrderLevelOne.name());

        } catch (Exception e) {

            LogHelper.errorDetailInfo(e);

@@ -453,7 +446,8 @@
     */

    @IntegralGetVersionLimit(uid = "#uid")

    @Async()

    private void addInviteOrderLevelTwo(Long uid) {

    @Override

    public void addInviteOrderLevelTwo(Long uid) {

        try {

            addEventStatistic(uid, TaskUniqueKeyEnum.inviteOrderLevelTwo.name());

        } catch (Exception e) {


 fanli/src/main/java/com/yeshi/fanli/service/impl/integral/IntegralTaskRecordServiceImpl.java

@@ -290,7 +290,7 @@


            if (num <= 0)

                num = 1;

            String title = taskClass.getName() + "-" + integralTask.getName() + "-" + num + "次";

            String title = taskClass.getName() + "-" + integralTask.getName() + "-第" + num + "次";

            detail.setTitle(title);

        }




 fanli/src/main/java/com/yeshi/fanli/service/impl/msg/UserOtherMsgNotificationServiceImpl.java

@@ -148,7 +148,7 @@
                coupon.getSource(), coupon.getStartTime(), coupon.getEndTime());

        try {

            msgOtherDetailService.addMsgOtherDetail(MsgOtherDetailFactory.createCouponMsg(coupon.getUid(),

                    coupon.getId(), dto, MsgTypeOtherTypeEnum.couponMianDan, "可在首页-免单商品-选择商品-使用"));

                    coupon.getId(), dto, MsgTypeOtherTypeEnum.couponMianDan, "首页-免单-选择商品-使用"));

        } catch (MsgOtherDetailException e) {

            e.printStackTrace();

        }


 fanli/src/main/java/com/yeshi/fanli/service/impl/order/CommonOrderServiceImpl.java

@@ -329,7 +329,9 @@
        SimpleDateFormat formatday = new SimpleDateFormat("yyyy.MM.dd");



        // 是否存在奖励券

        boolean hasRewardCoupon = userSystemCouponService.hasRewardCoupon(uid);

        //boolean hasRewardCoupon = userSystemCouponService.hasRewardCoupon(uid);

        boolean hasRewardCoupon = userSystemCouponService.getIncludeNotExchange(uid);

        boolean exchangeCoupon = userSystemCouponService.getIncludeExchange(uid);



        // 2019.8.1开始返回维权信息

        Date august = null;

@@ -548,13 +550,13 @@
            } else {

                // 奖励订单、免单 使用记录

                if (sourceType == null) {

                    setSystemCouponRecord(order, hasRewardCoupon, hongBaoState, hongBaoType, null, signList, acceptData);

                    setSystemCouponRecord(order, hasRewardCoupon, exchangeCoupon, hongBaoState, hongBaoType, null, signList, acceptData);

                } else if (sourceType == Constant.SOURCE_TYPE_TAOBAO) {

                    setSystemCouponRecord(order, hasRewardCoupon, hongBaoState, hongBaoType, listRecordTB, signList, acceptData);

                    setSystemCouponRecord(order, hasRewardCoupon, exchangeCoupon, hongBaoState, hongBaoType, listRecordTB, signList, acceptData);

                } else if (sourceType == Constant.SOURCE_TYPE_JD) {

                    setSystemCouponRecord(order, hasRewardCoupon, hongBaoState, hongBaoType, listRecordJD, signList, acceptData);

                    setSystemCouponRecord(order, hasRewardCoupon, exchangeCoupon, hongBaoState, hongBaoType, listRecordJD, signList, acceptData);

                } else if (sourceType == Constant.SOURCE_TYPE_PDD) {

                    setSystemCouponRecord(order, hasRewardCoupon, hongBaoState, hongBaoType, listRecordPDD, signList, acceptData);

                    setSystemCouponRecord(order, hasRewardCoupon, exchangeCoupon, hongBaoState, hongBaoType, listRecordPDD, signList, acceptData);

                }

            }



@@ -576,7 +578,7 @@
     * @param list

     * @param signList

     */

    public void setSystemCouponRecord(CommonOrderVO order, boolean hasRewardCoupon, Integer hongBaoState,

    public void setSystemCouponRecord(CommonOrderVO order, boolean hasRewardCoupon, boolean exchangeCoupon, Integer hongBaoState,

            Integer hongBaoType, List<UserSystemCouponRecord> list, List<String> signList, AcceptData acceptData) {



        // 是否免单商品

@@ -623,6 +625,21 @@


        // 订单标识

        order.setSignList(signList);



        // 1.6.5 是否存在新兑换的券

        if (!hasRewardCoupon && exchangeCoupon) {

            try {

                String downTime = order.getDownTime();

                if (!StringUtil.isNullOrEmpty(downTime)) {

                    long downOrderTime = TimeUtil.convertDateToTemp2(downTime);

                    long limitDate = TimeUtil.convertDateToTemp("2019-09-01");

                    if (downOrderTime > limitDate )

                        hasRewardCoupon = true;

                }

            } catch (Exception e) {

                e.printStackTrace();

            }

        }



        boolean rewardOrder = false;



@@ -1412,4 +1429,10 @@
        return commonOrderMapper.listBySourceTypeAndStateAndThirdCrateTime(sourceType, state, minTime, maxTime,

                (page - 1) * pageSize, pageSize);

    }

	
    @Override

    public List<CommonOrder> getByOrderNo(Long uid, String orderNO) {

        return commonOrderMapper.getByOrderNo(uid, orderNO);

    }



}


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

@@ -185,6 +185,11 @@
    }

    

    @Override

    public long countCouponOld(Long uid) {

        return userSystemCouponMapper.countCouponOld(uid);

    }

	
    @Override

    public long countUserCouponList(Long uid) {

        return userSystemCouponMapper.countUserCouponList(uid);

    }

@@ -308,7 +313,7 @@
        // 退回券

        sendBackTimeOutCoupon(uid);

        

        List<UserSystemCouponVO> listVO = userSystemCouponMapper.getUserCouponVOList(start, count, uid);

        List<UserSystemCouponVO> listVO = userSystemCouponMapper.getCouponListOld(start, count, uid);

        if (listVO == null || listVO.size() == 0) {

            return listVO;

        }

@@ -1834,11 +1839,12 @@
                    // 可使用、 可赠送

                    userCouponVO.setState(UserSystemCoupon.STATE_USE_GIVE);



                    // 返利奖励券- 跳转至订单到账界面

                    // 返利奖励券- 跳转至已到账-已收货

                    jumpLink.put("state", "2");

                    jumpLink.put("type", "1");

                    jumpBtn = new HashMap<String, Object>();

                    jumpBtn.put("params", jumpLink);

                    jumpBtn.put("jumpDetail", jumpDetailV2Service.getByTypeCache("orderList"));

                    jumpBtn.put("jumpDetail", jumpDetailV2Service.getByTypeCache("order_screen_list"));

                }

            } else if (UserSystemCoupon.STATE_IN_USE == state && give) {

                userCouponVO.setCouponEffect("赠送中");

@@ -2142,10 +2148,10 @@
    

    @Override

    public boolean getIncludeExchange(Long uid) {

        List<String> list = new ArrayList<String>();

        list.add(UserSystemCoupon.SOURCE_EXCHANGE);

        list.add(UserSystemCoupon.SOURCE_GIVE);

        List<UserSystemCoupon> listCoupon = userSystemCouponMapper.getIncludeExchange(uid, list);

        String percent = configService.get("exchange_rebate_percent");

        if (StringUtil.isNullOrEmpty(percent)) 
            percent = "35";

        List<UserSystemCoupon> listCoupon = userSystemCouponMapper.getIncludeExchange(uid, Integer.parseInt(percent), CouponTypeEnum.rebatePercentCoupon.name());

        if (listCoupon == null || listCoupon.size() == 0)

            return false;

        return true;

@@ -2154,13 +2160,85 @@
    

    @Override

    public boolean getIncludeNotExchange(Long uid) {

        List<String> list = new ArrayList<String>();

        list.add(UserSystemCoupon.SOURCE_EXCHANGE);

        list.add(UserSystemCoupon.SOURCE_GIVE);

        List<UserSystemCoupon> listCoupon = userSystemCouponMapper.getIncludeNotExchange(uid, list);

        String percent = configService.get("exchange_rebate_percent");

        if (StringUtil.isNullOrEmpty(percent)) 
            percent = "35";

        List<UserSystemCouponVO> listCoupon = userSystemCouponMapper.getIncludeNotExchange(uid, Integer.parseInt(percent), CouponTypeEnum.rebatePercentCoupon.name());

        if (listCoupon == null || listCoupon.size() == 0)

            return false;

        return true;

    }



	
    @Override

    public List<UserSystemCouponVO> listIncludeNotExchange(Long uid) throws Exception{

        sendBackTimeOutCoupon(uid);

		
        String percent = configService.get("exchange_rebate_percent");

        if (StringUtil.isNullOrEmpty(percent)) 
            percent = "35";

		
        List<UserSystemCouponVO> listCoupon = userSystemCouponMapper.getIncludeNotExchange(uid, Integer.parseInt(percent), CouponTypeEnum.rebatePercentCoupon.name());

        if (listCoupon == null || listCoupon.size() == 0)

            return null;



        for (UserSystemCouponVO userCouponVO : listCoupon) {

            String source = userCouponVO.getSource();

            if (source != null && "奖励券天天抽".equals(source)) {

                source = "天天抽";

            }

			
            SystemCoupon systemCoupon = userCouponVO.getSystemCoupon();

            if (systemCoupon == null) {

                continue; // 券信息不完整

            }



            systemCoupon = systemCouponService.selectByPrimaryKey(systemCoupon.getId());

			
            userCouponVO.setSource("来源：" + source);

            userCouponVO.setCouponName(systemCoupon.getName());

            userCouponVO.setCouponEffect(systemCoupon.getEffect());

            userCouponVO.setCouponRule(systemCoupon.getRule());

            userCouponVO.setCouponRuleLink(systemCoupon.getRuleLink());

            userCouponVO.setCouponPicture(systemCoupon.getPicture());

            userCouponVO.setCouponPictureInvalid(systemCoupon.getPictureInvalid());



            int differentDays = 0;

            String couponTerm = "有效期：";

            Date startTime = userCouponVO.getStartTime();

            Date endTime = userCouponVO.getEndTime();

            if (endTime != null && startTime != null) {

                SimpleDateFormat sdf = new SimpleDateFormat("yyyy.MM.dd");

                couponTerm = couponTerm + sdf.format(startTime) + "-" + sdf.format(endTime);



                SimpleDateFormat sdf2 = new SimpleDateFormat("yyyy-MM-dd");

                differentDays = DateUtil.daysBetween(sdf2.format(new Date()), sdf2.format(endTime)) + 1;

                if (differentDays < 0) {

                    differentDays = 0;

                }

            }

            userCouponVO.setCouponTerm(couponTerm);



            // 剩余天数

            Map<String, Object> remainDays = new HashMap<String, Object>();

            remainDays.put("content", "还剩" + differentDays + "天过期");

            String remainDaysFontColor = "";



            Integer stateActivated = userCouponVO.getStateActivated();

            if (stateActivated == null || stateActivated == 0) {

                userCouponVO.setState(0);

                userCouponVO.setCouponEffect("待激活");

                userCouponVO.setCouponPicture(systemCoupon.getPictureInvalid());

                remainDaysFontColor = "#CCCCCC";

            } else {

                userCouponVO.setCouponPicture(systemCoupon.getPicture());

                remainDaysFontColor = "#F14242";

            }



            remainDays.put("fontColor", remainDaysFontColor);

            userCouponVO.setRemainDays(remainDays);

        }



        return listCoupon;

    }

}


 fanli/src/main/java/com/yeshi/fanli/service/inter/integral/IntegralGetService.java

@@ -162,6 +162,19 @@
    public void addRebateOrder(Long uid);



    /**

     * 一级邀请订单

     * @param uid

     */

    public void addInviteOrderLevelOne(Long uid);



    /**

     * 二级邀请订单

     * @param uid

     */

    public void addInviteOrderLevelTwo(Long uid);



	
    /**

     * 分享订单

     * @param uid

     */


 fanli/src/main/java/com/yeshi/fanli/service/inter/order/CommonOrderService.java

@@ -278,7 +278,15 @@
     * @param pageSize

     * @return

     */

    List<CommonOrder> listBySourceTypeAndStateAndThirdCrateTime(int sourceType, Integer state, Long minTime,

    public List<CommonOrder> listBySourceTypeAndStateAndThirdCrateTime(int sourceType, Integer state, Long minTime,

            Long maxTime, int page, int pageSize);



    /**

     * 查询订单  -根据订单号

     * @param uid

     * @param orderNO

     * @return

     */

    public List<CommonOrder> getByOrderNo(Long uid, String orderNO);



}


 fanli/src/main/java/com/yeshi/fanli/service/inter/user/UserSystemCouponService.java

@@ -267,4 +267,13 @@
     */

    public boolean getIncludeNotExchange(Long uid);



    /**

     * 查询1.6.5之前的  不等于35%

     * @param uid

     * @return

     */

    public List<UserSystemCouponVO> listIncludeNotExchange(Long uid) throws Exception;



    public long countCouponOld(Long uid);



}