fanli/src/main/java/com/yeshi/fanli/controller/apph5/AppH5QualityGoodsController.java
@@ -4,7 +4,6 @@ import java.math.BigDecimal; import java.util.ArrayList; import java.util.List; import java.util.Map; import javax.annotation.Resource; @@ -215,7 +214,6 @@ Gson gson = JsonUtil.getConvertBigDecimalToStringSubZeroBuilder(new GsonBuilder()) .excludeFieldsWithoutExposeAnnotation().setDateFormat("yyyy-MM-dd").create(); Map<String, String> map = manageService.convertMap(); BigDecimal proportion = hongBaoManageService.getFanLiRate(); /* 遍历列表数据 */ for (QualityFactory selectionGoods : listQuery) { @@ -1209,8 +1207,12 @@ continue; // 券后价大于10 } array.add(gson.toJson(TaoBaoUtil.getTaoBaoGoodsBriefExtra(taoBaoGoodsBrief, proportion.toString(), null))); TaoBaoGoodsBriefExtra extra = TaoBaoUtil.getTaoBaoGoodsBriefExtra(taoBaoGoodsBrief, proportion.toString(), null); // 将在售价改为券后价 extra.setZkPrice(extra.getQuanPrice()); array.add(gson.toJson(extra)); } long count = qualityGoodsService.countFreeGoods(tkRate, lableName); fanli/src/main/java/com/yeshi/fanli/controller/client/UserCouponController.java
@@ -25,6 +25,7 @@ import com.yeshi.fanli.service.inter.config.ConfigService; import com.yeshi.fanli.service.inter.config.SystemCouponService; import com.yeshi.fanli.service.inter.homemodule.SwiperPictureService; import com.yeshi.fanli.service.inter.hongbao.ThreeSaleSerivce; import com.yeshi.fanli.service.inter.order.CommonOrderCountService; import com.yeshi.fanli.service.inter.order.CommonOrderService; import com.yeshi.fanli.service.inter.user.DeviceLotteryRecordService; @@ -72,6 +73,8 @@ @Resource private CommonOrderCountService commonOrderCountService; @Resource private ThreeSaleSerivce threeSaleSerivce; // 最大抽奖次数 private static int MAX_COUNT = 5; @@ -470,29 +473,8 @@ if (hasPrize.equals(prize)) { prize = null; } else { SystemCoupon coupon= systemCouponService.getCouponByType(prize); String endDay = DateUtil.plusDay(coupon.getExpiryDay(), new Date()); SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd"); Date endTime = format.parse(endDay); int stateActivated = 1; if (coupon.getType() == CouponTypeEnum.welfareFreeCoupon) { stateActivated = 0; } UserSystemCoupon userCoupon = new UserSystemCoupon(); userCoupon.setUid(uid); userCoupon.setSource(UserSystemCoupon.SOURCE_CHOUJIANG); userCoupon.setSystemCoupon(coupon); userCoupon.setState(UserSystemCoupon.STATE_CAN_USE); userCoupon.setStateActivated(stateActivated); userCoupon.setStartTime(new Date()); userCoupon.setEndTime(endTime); userCoupon.setCreateTime(new Date()); userCoupon.setUpdateTime(new Date()); userSystemCouponService.insertSelective(userCoupon); // 插入券信息 userSystemCouponService.insertUserCoupon(uid, prize, UserSystemCoupon.SOURCE_CHOUJIANG); } }
@@ -372,7 +372,7 @@ </select> <select id="countFirstTeam" resultType="java.lang.Long"> SELECT count(id) FROM `yeshi_ec_threesale` SELECT IFNULL(count(id),0) FROM `yeshi_ec_threesale` WHERE `boss_id` = #{uid} <if test="state != null"> AND `state` = #{state} fanli/src/main/java/com/yeshi/fanli/service/impl/hongbao/ThreeSaleSerivceImpl.java
@@ -664,7 +664,11 @@ // 邀请消息 userInviteMsgNotificationService.inviteSuccess(inviter.getId(), threeSale); } @Override public long countSuccessFirstTeam(Long uid) { return threeSaleMapper.countFirstTeam(uid,1); } } fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserSystemCouponServiceImpl.java
@@ -31,6 +31,7 @@ import com.yeshi.fanli.service.inter.config.ConfigService; import com.yeshi.fanli.service.inter.config.SystemCouponService; import com.yeshi.fanli.service.inter.hongbao.HongBaoV2Service; import com.yeshi.fanli.service.inter.hongbao.ThreeSaleSerivce; import com.yeshi.fanli.service.inter.msg.UserMoneyMsgNotificationService; import com.yeshi.fanli.service.inter.order.CommonOrderService; import com.yeshi.fanli.service.inter.order.HongBaoOrderService; @@ -95,6 +96,9 @@ @Resource private UserInfoExtraService userInfoExtraService; @Resource private ThreeSaleSerivce threeSaleSerivce; // 券失效图片 public final static String PIC_INVALID = "http://192.168.1.200/icon/mian_invalid.png"; @@ -134,6 +138,49 @@ return userSystemCouponMapper.countUserCouponList(uid); } @Override public void insertUserCoupon(Long uid, String couponType,String source)throws UserSystemCouponException,Exception{ if (couponType == null || uid == null) { throw new UserSystemCouponException(1, "参数不正确"); } SystemCoupon coupon= systemCouponService.getCouponByType(couponType); if (coupon == null) { throw new UserSystemCouponException(1, "券类型不正确"); } int stateActivated = 1; if (coupon.getType() == CouponTypeEnum.welfareFreeCoupon) { // 福利券状态 long countSuccess = threeSaleSerivce.countSuccessFirstTeam(uid); // 没有下级队员 --待激活 if (countSuccess == 0) { stateActivated = 0; } } // 结束日期 String endDay = DateUtil.plusDay(coupon.getExpiryDay(), new Date()); SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd"); Date endTime = format.parse(endDay); UserSystemCoupon userCoupon = new UserSystemCoupon(); userCoupon.setUid(uid); userCoupon.setSource(source); userCoupon.setSystemCoupon(coupon); userCoupon.setState(UserSystemCoupon.STATE_CAN_USE); userCoupon.setStateActivated(stateActivated); userCoupon.setStartTime(new Date()); userCoupon.setEndTime(endTime); userCoupon.setCreateTime(new Date()); userCoupon.setUpdateTime(new Date()); // 插入数据库 insertSelective(userCoupon); } @Override public List<UserSystemCouponVO> getUserCouponVOList(long start, int count, Long uid) throws UserSystemCouponException, Exception { @@ -201,17 +248,19 @@ Map<String, Object> jumpLink = new HashMap<String, Object>(); UserInfoExtra userInfoExtra = userInfoExtraService.getUserInfoExtra(uid); // 邀请队员界面 if (userInfoExtra != null && userInfoExtra.getInviteCode() != null && userInfoExtra.getInviteCode().trim().length() > 0) { jumpLink.put("url", configService.get("invite_activation_success_url" +"?alert=ture")); // 邀请激活成功界面 jumpLink.put("url", configService.get("invite_activation_success_url") + "?alert=true"); } else { // 激活邀请码界面 jumpLink.put("url", configService.get("invite_activation_url")); } jumpBtn.put("params", jumpLink); jumpBtn.put("jumpDetail", jumpDetailV2Service.getByTypeCache("invite")); jumpBtn.put("jumpDetail", jumpDetailV2Service.getByTypeCache("invite_web")); } else if (stateActivated == 1) { // 显示规则 @@ -272,7 +321,6 @@ differentDays = 0; } } // 剩余天数 Map<String, Object> remainDays = new HashMap<String, Object>(); remainDays.put("content", "还剩" + differentDays + "天过期"); fanli/src/main/java/com/yeshi/fanli/service/inter/hongbao/ThreeSaleSerivce.java
@@ -259,4 +259,11 @@ */ public void bindRelationshipByInviteCode(UserInfo invitee, UserInfo inviter) throws ThreeSaleException; /** * 统计邀请成功队员数量 * @param uid * @return */ public long countSuccessFirstTeam(Long uid); } fanli/src/main/java/com/yeshi/fanli/service/inter/user/UserSystemCouponService.java
@@ -124,5 +124,15 @@ */ public List<UserSystemCoupon> getUserCouponBySource(Long uid, String source); /** * 插入券信息 * @param uid * @param couponType * @param source 来源 * @throws UserSystemCouponException * @throws Exception */ public void insertUserCoupon(Long uid, String couponType, String source) throws UserSystemCouponException, Exception; }
