fanli/src/main/java/com/yeshi/fanli/controller/client/v2/DynamicControllerV2.java
@@ -371,12 +371,7 @@ if (special.getState() == 1L) { list.remove(i--); } else { if (special.getStartTime() != null && special.getEndTime() != null) special.setTimeTask(true); else special.setTimeTask(false); if (special.isTimeTask()) { if (special.getStartTime() != null && special.getEndTime() != null) { if (time < special.getStartTime().getTime() || time > special.getEndTime().getTime()) { list.remove(i--); } else// 设置倒计时 fanli/src/main/java/com/yeshi/fanli/controller/client/v2/RecommendControllerV2.java
@@ -262,10 +262,6 @@ if (array == null) { array = new JSONArray(); BigDecimal fanLiRate = hongBaoManageService.getFanLiRate(); BigDecimal shareRate = hongBaoManageService.getShareRate(); Gson gson = JsonUtil.getConvertBigDecimalToStringSubZeroBuilder(new GsonBuilder()) .excludeFieldsWithoutExposeAnnotation().setDateFormat("yyyy-MM-dd").create(); @@ -837,12 +833,7 @@ if (special.getState() == 1L) { list.remove(i--); } else { if (special.getStartTime() != null && special.getEndTime() != null) special.setTimeTask(true); else special.setTimeTask(false); if (special.isTimeTask()) { if (special.getStartTime() != null && special.getEndTime() != null) { if (time < special.getStartTime().getTime() || time > special.getEndTime().getTime()) { list.remove(i--); } else// 设置倒计时 fanli/src/main/java/com/yeshi/fanli/controller/client/v2/UserOrderControllerV2.java
@@ -27,7 +27,6 @@ import com.yeshi.fanli.entity.order.CommonOrderGoods; import com.yeshi.fanli.entity.order.ESOrder; import com.yeshi.fanli.entity.order.HongBaoOrder; import com.yeshi.fanli.entity.order.InviteOrderSubsidy; import com.yeshi.fanli.entity.system.ConfigKeyEnum; import com.yeshi.fanli.entity.system.SystemCoupon.CouponTypeEnum; import com.yeshi.fanli.entity.taobao.TaoBaoWeiQuanOrder; @@ -40,7 +39,6 @@ import com.yeshi.fanli.service.inter.order.CommonOrderService; import com.yeshi.fanli.service.inter.order.ESOrderService; import com.yeshi.fanli.service.inter.order.HongBaoOrderService; import com.yeshi.fanli.service.inter.order.InviteOrderSubsidyService; import com.yeshi.fanli.service.inter.order.OrderHongBaoMapService; import com.yeshi.fanli.service.inter.order.OrderHongBaoMoneyComputeService; import com.yeshi.fanli.service.inter.order.tb.TaoBaoWeiQuanOrderService; @@ -98,9 +96,6 @@ @Resource private UserVIPInfoService userVIPInfoService; @Resource private InviteOrderSubsidyService inviteOrderSubsidyServiceV2; @Resource private HongBaoOrderService hongBaoOrderService; @@ -465,20 +460,17 @@ teamMoney = hongBaoV2CountService.getRewardMoneyToCount(uid, dateType, 3, null); } else { BigDecimal bonus = null; BigDecimal subsidy = null; BigDecimal dividend = null; // TODO 分红统计 if (dateType == 4) { // 已到账 dividend = new BigDecimal(0); bonus = hongBaoV2CountService.geBonusByuid(uid, dateType, 3, 2); subsidy = inviteOrderSubsidyServiceV2.sumMoneyByUidAndDateAndState(uid,dateType,null,3); } else { // 未失效 bonus = hongBaoV2CountService.geBonusByuid(uid, dateType, 3, 4); subsidy = inviteOrderSubsidyServiceV2.sumValidMoneyByUidAndDate(uid,dateType,null); } dividend = new BigDecimal(0); // 总团队奖励 teamMoney = bonus.add(subsidy).add(dividend); teamMoney = bonus.add(dividend); } data.put("inviteMoney", teamMoney.setScale(2, BigDecimal.ROUND_DOWN).toString()); out.print(JsonUtil.loadTrueResult(data)); @@ -582,12 +574,6 @@ CommonOrder commonOrder1 = hoList.get(0).getCommonOrder(); Date downTime = commonOrder1.getThirdCreateTime(); Integer urank = commonOrder1.getUrank(); UserLevelEnum buyerUserLevel = UserLevelUtil.getByOrderRank(urank); boolean direct = false; if (hongBaoV2.getType() == HongBaoV2.TYPE_YIJI || hongBaoV2.getType() == HongBaoV2.TYPE_SHARE_YIJI) { direct = true; } BigDecimal upperTotalMoney = new BigDecimal(0); List<GoodsRebateVO> voList = new ArrayList<>(); @@ -637,45 +623,6 @@ } else if (type == 3) { upperTotalMoney = upperTotalMoney.add(hongBao); } } // 团队补贴 if (type == 3) { BigDecimal teamSubsidy = null; BigDecimal lowerSubsidy = null; InviteOrderSubsidy inviteOrderSubsidy = inviteOrderSubsidyServiceV2.getByOrderNoAndType(uid, orderNo, sourceType); if (inviteOrderSubsidy != null) { teamSubsidy = inviteOrderSubsidy.getMoney(); // 计算原比例 BigDecimal originRate = orderHongBaoMoneyComputeService.getTeamSubsidyRate(downTime,buyerUserLevel, userLevel, direct); // 计算达人补贴 if (userLevel != UserLevelEnum.daRen) { BigDecimal daRenRate = orderHongBaoMoneyComputeService.getTeamSubsidyRate(downTime, buyerUserLevel, UserLevelEnum.daRen, direct); lowerSubsidy = MoneyBigDecimalUtil.div(teamSubsidy.multiply(daRenRate), originRate); } // 计算超级会员补贴 if (userLevel != UserLevelEnum.superVIP && userLevel != UserLevelEnum.tearcher) { BigDecimal vipRate = orderHongBaoMoneyComputeService.getTeamSubsidyRate(downTime, buyerUserLevel, UserLevelEnum.superVIP, direct); upperTotalMoney = upperTotalMoney.add(MoneyBigDecimalUtil.div(teamSubsidy.multiply(vipRate), originRate)); } } else { teamSubsidy = BigDecimal.valueOf(0.00); lowerSubsidy = BigDecimal.valueOf(0.00); } if (userLevel != UserLevelEnum.daRen) { orderRebateVO.setOriginSubsidy("¥" + lowerSubsidy.setScale(2, BigDecimal.ROUND_DOWN)); } orderRebateVO.setSubsidyDesc("团队补贴"); orderRebateVO.setSubsidy("¥" + teamSubsidy.setScale(2, BigDecimal.ROUND_DOWN) +""); hongBao = hongBao.add(teamSubsidy); } orderRebateVO.setFanLiDesc(predictDesc + typeName); fanli/src/main/java/com/yeshi/fanli/controller/wxmp/v1/DynamicController.java
@@ -130,12 +130,7 @@ if (special.getState() == 1L) { list.remove(i--); } else { if (special.getStartTime() != null && special.getEndTime() != null) special.setTimeTask(true); else special.setTimeTask(false); if (special.isTimeTask()) { if (special.getStartTime() != null && special.getEndTime() != null) { if (time < special.getStartTime().getTime() || time > special.getEndTime().getTime()) { list.remove(i--); } else// 设置倒计时 fanli/src/main/java/com/yeshi/fanli/entity/bus/homemodule/Special.java
@@ -14,13 +14,6 @@ /** * 专题管理 * * @author yj * * @date 2018年10月23日 */ /** * @author Administrator * */ @Table("yeshi_ec_special") public class Special implements Serializable { @@ -151,10 +144,6 @@ // 限制最低版本 private String version; // 是否定时 @Expose private boolean timeTask; // 起始时间 private String startTime_str; // 结束时间 @@ -408,14 +397,6 @@ public void setEndTime(Date endTime) { this.endTime = endTime; } public boolean isTimeTask() { return timeTask; } public void setTimeTask(boolean timeTask) { this.timeTask = timeTask; } public String getStartTime_str() { fanli/src/main/java/com/yeshi/fanli/entity/bus/homemodule/SpecialCard.java
@@ -57,8 +57,6 @@ private Date updatetime; // 是否定时 private boolean timeTask; // 起始时间 private String startTime_str; // 结束时间 @@ -158,14 +156,6 @@ public void setEndTime(Date endTime) { this.endTime = endTime; } public boolean isTimeTask() { return timeTask; } public void setTimeTask(boolean timeTask) { this.timeTask = timeTask; } public String getStartTime_str() { fanli/src/main/java/com/yeshi/fanli/service/impl/homemodule/SpecialCardServiceImpl.java
@@ -22,6 +22,7 @@ import com.yeshi.fanli.service.inter.homemodule.SpecialPlaceService; import com.yeshi.fanli.service.inter.homemodule.SpecialService; import com.yeshi.fanli.util.FilePathEnum; import com.yeshi.fanli.util.StringUtil; @Service @@ -54,7 +55,7 @@ } // 时间任务控制 conversionTime(record); handleTime(record); // 图片上传 @@ -106,35 +107,31 @@ /** * web段时间转换 * * @param record */ public void conversionTime(SpecialCard record) throws SpecialCardException, Exception { // 是否时间控制 if(!record.isTimeTask()) { record.setStartTime(null); record.setEndTime(null); } else { String startTime_str = record.getStartTime_str(); String endTime_str = record.getEndTime_str(); if ((startTime_str == null|| startTime_str.trim().length() == 0) && (endTime_str == null || endTime_str.trim().length() == 0)) { throw new SpecialCardException(1, "请输入控制时间"); } else { SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm"); if (startTime_str != null && startTime_str.trim().length() > 0) { startTime_str = startTime_str.replaceAll("T", " "); record.setStartTime(format.parse(startTime_str)); } if (endTime_str != null && endTime_str.trim().length() > 0) { endTime_str = endTime_str.replaceAll("T", " "); record.setEndTime(format.parse(endTime_str)); } } private void handleTime(SpecialCard record) throws SpecialCardException, Exception { SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm"); String startTime_str = record.getStartTime_str(); if (!StringUtil.isNullOrEmpty(startTime_str)) { startTime_str = startTime_str.replaceAll("T", " "); record.setStartTime(format.parse(startTime_str)); } String endTime_str = record.getEndTime_str(); if (!StringUtil.isNullOrEmpty(endTime_str)) { endTime_str = endTime_str.replaceAll("T", " "); record.setEndTime(format.parse(endTime_str)); } if (record.getEndTime() != null && record.getStartTime() != null && record.getStartTime().getTime() > record.getEndTime().getTime()) { throw new SpecialCardException(1, "起始时间不能小于结束时间"); } } /** * 上传图片 @@ -191,12 +188,9 @@ Date startTime = specialCard.getStartTime(); Date endTime = specialCard.getEndTime(); if (startTime == null && endTime == null) { specialCard.setTimeTask(false); specialCard.setStartTime_str(""); specialCard.setEndTime_str(""); } else { specialCard.setTimeTask(true); SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm"); if (startTime == null) { specialCard.setStartTime_str(""); @@ -218,9 +212,7 @@ specialCard.setPlaceName(specialPlace.getName()); } } } return listObj; }
@@ -29,7 +29,6 @@ import com.yeshi.fanli.entity.common.JumpDetailV2; import com.yeshi.fanli.entity.system.ConfigKeyEnum; import com.yeshi.fanli.exception.banner.SwiperPictureException; import com.yeshi.fanli.exception.homemodule.HomeNavbarException; import com.yeshi.fanli.exception.homemodule.SpecialException; import com.yeshi.fanli.service.inter.common.JumpDetailV2Service; import com.yeshi.fanli.service.inter.config.AppVersionService; @@ -102,11 +101,6 @@ record.setParams(params.trim()); } String startTime_str = record.getStartTime_str(); if (record.isTimeTask() && (startTime_str == null || startTime_str.length() == 0)) { throw new SpecialException(1, "控制时间不能为空"); } if (!StringUtil.isNullOrEmpty(jumpType)) { List<JumpDetailV2> listByType = jumpDetailV2Service.listByType(jumpType); if (listByType != null && listByType.size() > 0) { @@ -115,7 +109,7 @@ } // 时间转换 conversionTime(record); handleTime(record); Long state = record.getState(); if (state == null) { @@ -227,30 +221,24 @@ * * @param record */ public void conversionTime(Special record) throws SpecialException, Exception { // 是否时间控制 if (!record.isTimeTask()) { record.setStartTime(null); record.setEndTime(null); } else { String startTime_str = record.getStartTime_str(); String endTime_str = record.getEndTime_str(); if ((startTime_str == null || startTime_str.trim().length() == 0) && (endTime_str == null || endTime_str.trim().length() == 0)) { throw new HomeNavbarException(1, "请输入控制时间"); } else { SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm"); if (startTime_str != null && startTime_str.trim().length() > 0) { startTime_str = startTime_str.replaceAll("T", " "); record.setStartTime(format.parse(startTime_str)); } if (endTime_str != null && endTime_str.trim().length() > 0) { endTime_str = endTime_str.replaceAll("T", " "); record.setEndTime(format.parse(endTime_str)); } } private void handleTime(Special record) throws SpecialException, Exception { SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm"); String startTime_str = record.getStartTime_str(); if (!StringUtil.isNullOrEmpty(startTime_str)) { startTime_str = startTime_str.replaceAll("T", " "); record.setStartTime(format.parse(startTime_str)); } String endTime_str = record.getEndTime_str(); if (!StringUtil.isNullOrEmpty(endTime_str)) { endTime_str = endTime_str.replaceAll("T", " "); record.setEndTime(format.parse(endTime_str)); } if (record.getEndTime() != null && record.getStartTime() != null && record.getStartTime().getTime() > record.getEndTime().getTime()) { throw new SpecialException(1, "起始时间不能小于结束时间"); } } @@ -400,12 +388,9 @@ Date endTime = special.getEndTime(); if (startTime == null && endTime == null) { special.setTimeTask(false); special.setStartTime_str(""); special.setEndTime_str(""); } else { special.setTimeTask(true); SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm"); if (startTime == null) { special.setStartTime_str(""); fanli/src/main/java/com/yeshi/fanli/service/impl/order/CommonOrderServiceImpl.java
@@ -2043,13 +2043,12 @@ orderStateMap.put("fontColor", "#666666"); order.setOrderState(orderStateMap); String hongbaoInfo = ""; // 订单标识 List<String> signList = new ArrayList<String>(); /* 订单返利类型 转换 */ if (HongBaoV2.TYPE_ZIGOU == hongBaoType || 2 == hongBaoType) { // 自购 hongbaoInfo = "返利"; order.setOrderOrigin("1"); order.setHongBaoTypePic(CommonOrder.TYPE_FANLI); signList.add(CommonOrder.TYPE_FANLI); @@ -2064,7 +2063,6 @@ } } else if (HongBaoV2.TYPE_SHARE_GOODS == hongBaoType) { // 分享 hongbaoInfo = "奖金"; order.setOrderOrigin("2"); order.setHongBaoTypePic(CommonOrder.TYPE_SHARE); signList.add(CommonOrder.TYPE_SHARE); @@ -2073,7 +2071,6 @@ || HongBaoV2.TYPE_YAOQING == hongBaoType || HongBaoV2.TYPE_YIJI == hongBaoType || HongBaoV2.TYPE_ERJI == hongBaoType) { // 邀请订单 hongbaoInfo = "收益"; order.setOrderOrigin("3"); order.setHongBaoTypePic(CommonOrder.TYPE_INVITE); signList.add(CommonOrder.TYPE_INVITE); @@ -2136,10 +2133,9 @@ stateMap.put("content", stateContent); stateMap.put("fontColor", stateFontColor); order.setAccountState(stateMap); hongbaoInfo = hongBaoState_Str + hongbaoInfo; Map<String, String> hongBaoMap = new HashMap<String, String>(); hongBaoMap.put("content", hongbaoInfo + " ¥" + hongBao.setScale(2, BigDecimal.ROUND_DOWN).toString()); hongBaoMap.put("content", hongBaoState_Str + "收益 ¥" + hongBao.setScale(2, BigDecimal.ROUND_DOWN).toString()); hongBaoMap.put("fontColor", hongbaoInfoFontColor); order.setHongBaoInfo(hongBaoMap);
@@ -18,10 +18,6 @@ private String userLevel; // 用户等级 private String jumpLink; // 跳转链接 private String subsidyDesc; // 团队说明 private String subsidy; // 团队补贴 private String originSubsidy; // 小一等级补贴 private Integer couponType; // 券图标：1-奖励券 2-免单券 private boolean coupon; // 使用奖励券 private boolean couponUse; // 已使用券 @@ -127,31 +123,7 @@ public void setFanLiDesc(String fanLiDesc) { this.fanLiDesc = fanLiDesc; } public String getSubsidy() { return subsidy; } public void setSubsidy(String subsidy) { this.subsidy = subsidy; } public String getOriginSubsidy() { return originSubsidy; } public void setOriginSubsidy(String originSubsidy) { this.originSubsidy = originSubsidy; } public String getSubsidyDesc() { return subsidyDesc; } public void setSubsidyDesc(String subsidyDesc) { this.subsidyDesc = subsidyDesc; } public String getCouponParams() { return couponParams; }
