|
...
|
...
|
@@ -179,6 +179,7 @@ public class UnionShareServiceImpl implements IUnionShareService,IBusinessExport |
|
|
|
private String SETTLEMENT_TOPIC = "front.union.shareSettleAdd";
|
|
|
|
private String NEW_USER_REBATES_RATIO_KEY = "union.newUserRebatesRatio";
|
|
|
|
private String OLD_USER_REBATES_RATIO_KEY = "union.oldUserRebatesRatio";
|
|
|
|
private String UNION_APPLY_H5_URL = "union.apply.h5.url";
|
|
|
|
private String UNION_SHAREID = "union.shareId";
|
|
|
|
private String UNION_CPS_IMAGEURL = "union.cps.ImageUrl";
|
|
|
|
private String UNION_CPS_APPLY_IMAGEURL = "union.cps.applyImageUrl";
|
|
...
|
...
|
@@ -681,6 +682,8 @@ public class UnionShareServiceImpl implements IUnionShareService,IBusinessExport |
|
|
|
UnionShareUser unionShareUser = unionShareUserMapper.selectByUid(uid);
|
|
|
|
if (null != unionShareUser && unionShareUser.getStatus() == 1) {
|
|
|
|
BeanUtils.copyProperties(unionShareUser, bo);
|
|
|
|
} else {
|
|
|
|
bo.setApplyH5Url(configReader.getString(UNION_APPLY_H5_URL, ""));//无渠道号需要h5申请页面url
|
|
|
|
}
|
|
|
|
|
|
|
|
//是否存在申请中的请求:0-无申请，1-申请中，2-申请通过,3-拒绝
|
|
...
|
...
|
@@ -1180,8 +1183,6 @@ public class UnionShareServiceImpl implements IUnionShareService,IBusinessExport |
|
|
|
UninoShareIncomeRankBo result = new UninoShareIncomeRankBo();
|
|
|
|
//每月一号0-8点排行榜关闭
|
|
|
|
Calendar now = Calendar.getInstance();
|
|
|
|
// int monthday=configReader.getInt(UNION_CPS_RANK_MONTHDAY,1);
|
|
|
|
// int hour=configReader.getInt(UNION_CPS_RANK_HOUR,8);
|
|
|
|
if (now.get(Calendar.DAY_OF_MONTH) == 1 && now.get(Calendar.HOUR_OF_DAY) < 8) {
|
|
|
|
logger.info("queryRank end");
|
|
|
|
return result;
|
|
...
|
...
|
@@ -1286,7 +1287,7 @@ public class UnionShareServiceImpl implements IUnionShareService,IBusinessExport |
|
|
|
rankInfo.setAmount(amount);
|
|
|
|
// DecimalFormat df = new DecimalFormat("0.00");
|
|
|
|
// rankInfo.setAmountStr("￥"+df.format(rankInfo.getAmount()));
|
|
|
|
rankInfo.setAmountStr("￥"+rankInfo.getAmount());
|
|
|
|
rankInfo.setAmountStr("￥"+rankInfo.getAmount().intValue());
|
|
|
|
logger.info("getRankInfo,uid is {},date is {},type is {},getUserInfoFromUic",uid,date,type);
|
|
|
|
UserInfoRspBO userInfoRspBO = userServiceHelper.getUserInfoFromUic(uid);
|
|
|
|
if (userInfoRspBO != null) {
|
|
...
|
...
|
@@ -1311,12 +1312,10 @@ public class UnionShareServiceImpl implements IUnionShareService,IBusinessExport |
|
|
|
if (CollectionUtils.isEmpty(list)) {
|
|
|
|
return null;
|
|
|
|
}
|
|
|
|
// DecimalFormat df = new DecimalFormat("0.00");
|
|
|
|
for (int i = 0; i < list.size(); i++) {
|
|
|
|
UninoShareIncomeBo uninoShareIncomeBo = list.get(i);
|
|
|
|
uninoShareIncomeBo.setRankNum(i+1);
|
|
|
|
// uninoShareIncomeBo.setAmountStr("￥"+df.format(uninoShareIncomeBo.getAmount()));
|
|
|
|
uninoShareIncomeBo.setAmountStr("￥"+uninoShareIncomeBo.getAmount());
|
|
|
|
uninoShareIncomeBo.setAmountStr("￥"+uninoShareIncomeBo.getAmount().intValue());
|
|
|
|
uninoShareIncomeBo.setImage(ImagesHelper.getHeadImageUrl(uninoShareIncomeBo.getImage()));
|
|
|
|
}
|
|
|
|
PageResponseBO<UninoShareIncomeBo> pageList = new PageResponseBO<>();
|
|
...
|
...
|
@@ -1808,6 +1807,7 @@ public class UnionShareServiceImpl implements IUnionShareService,IBusinessExport |
|
|
|
log.setUpdateTime(log.getCreateTime());
|
|
|
|
log.setOrderId(order.getId());
|
|
|
|
log.setAmount(extraAmount);
|
|
|
|
log.setActivityType(activity.getType());
|
|
|
|
log.setStatus(1);
|
|
|
|
log.setOrders(order.getOrderCode());
|
|
|
|
log.setId(null);
|
...
|
...
|
|
