Commit 05b3c679 by fanjiaxin

修改为定向计划

parent 1c1f2977
Pipeline #71802 passed with stages
in 58 seconds
...@@ -54,10 +54,8 @@ public class ProductServiceImpl implements IProductService { ...@@ -54,10 +54,8 @@ public class ProductServiceImpl implements IProductService {
@Override @Override
public PageVO<ProductListVO> getProductPageList(PageQuery pageQuery, String keyword) { public PageVO<ProductListVO> getProductPageList(PageQuery pageQuery, String keyword) {
PageVO<ProductListVO> pageVO = new PageVO<>(); PageVO<ProductListVO> pageVO = new PageVO<>();
log.info("商品列表查询开始:{}", System.currentTimeMillis());
WeChatPromoteProductListVO productListVO = weChatShopPromoteProductListRequest.handle(keyword, WeChatPromoteProductListVO productListVO = weChatShopPromoteProductListRequest.handle(keyword,
pageQuery.getNextKey(), pageQuery.getPageSize()); pageQuery.getNextKey(), pageQuery.getPageSize());
log.info("商品列表查询结束:{}", System.currentTimeMillis());
pageVO.setHasMore(false); pageVO.setHasMore(false);
List<ProductListVO> productList = new ArrayList<>(0); List<ProductListVO> productList = new ArrayList<>(0);
// 商品列表 // 商品列表
...@@ -107,8 +105,6 @@ public class ProductServiceImpl implements IProductService { ...@@ -107,8 +105,6 @@ public class ProductServiceImpl implements IProductService {
if (null != price && null != commissionRatio && null != serviceRatio) { if (null != price && null != commissionRatio && null != serviceRatio) {
commission = price.multiply(serviceRatio).multiply(commissionRatio) commission = price.multiply(serviceRatio).multiply(commissionRatio)
.setScale(2, RoundingMode.HALF_UP); .setScale(2, RoundingMode.HALF_UP);
log.info("商品:{},计算佣金,价格:{},服务费率:{},推客分佣比例:{},佣金:{}",
item.getProduct_id(), price, serviceRatio, commissionRatio, commission);
} }
listVO.setCommission(commission); listVO.setCommission(commission);
listVO.setShopAppid(item.getShop_appid()); listVO.setShopAppid(item.getShop_appid());
...@@ -127,7 +123,6 @@ public class ProductServiceImpl implements IProductService { ...@@ -127,7 +123,6 @@ public class ProductServiceImpl implements IProductService {
pageVO.setHasMore(StringUtils.isNotBlank(productListVO.getNext_key()) pageVO.setHasMore(StringUtils.isNotBlank(productListVO.getNext_key())
&& !isEmpty && productList.size() >= pageQuery.getPageSize()); && !isEmpty && productList.size() >= pageQuery.getPageSize());
pageVO.setNextKey(productListVO.getNext_key()); pageVO.setNextKey(productListVO.getNext_key());
log.info("商品列表查询返回:{}", System.currentTimeMillis());
return pageVO; return pageVO;
} }
...@@ -185,7 +180,6 @@ public class ProductServiceImpl implements IProductService { ...@@ -185,7 +180,6 @@ public class ProductServiceImpl implements IProductService {
private BigDecimal getSharerCommissionRatio(LoginUserInfo loginUserInfo, String productId) { private BigDecimal getSharerCommissionRatio(LoginUserInfo loginUserInfo, String productId) {
// 默认佣金比例 // 默认佣金比例
BigDecimal commissionRatio = drmSharerConfig.getDefaultCommissionRatio(); BigDecimal commissionRatio = drmSharerConfig.getDefaultCommissionRatio();
log.info("商品:{},默认佣金比例:{}", productId, commissionRatio);
if (null != loginUserInfo) { if (null != loginUserInfo) {
// 微信配置分佣比例 // 微信配置分佣比例
BigDecimal weChatCommissionRatio = null; BigDecimal weChatCommissionRatio = null;
...@@ -198,7 +192,6 @@ public class ProductServiceImpl implements IProductService { ...@@ -198,7 +192,6 @@ public class ProductServiceImpl implements IProductService {
Long.valueOf(productId)); Long.valueOf(productId));
if (sharerProductCommissionVO.getIs_set()) { if (sharerProductCommissionVO.getIs_set()) {
weChatCommissionRatio = new BigDecimal(sharerProductCommissionVO.getCommission_ratio()); weChatCommissionRatio = new BigDecimal(sharerProductCommissionVO.getCommission_ratio());
log.info("商品:{},微信商品纬度佣金比例:{}", productId, weChatCommissionRatio);
} }
} }
// 获取推客纬度分佣比例 // 获取推客纬度分佣比例
...@@ -208,7 +201,6 @@ public class ProductServiceImpl implements IProductService { ...@@ -208,7 +201,6 @@ public class ProductServiceImpl implements IProductService {
WeChatSharerInfoVO sharerInfoVO = sharerListVO.getSharer_info_list().get(0); WeChatSharerInfoVO sharerInfoVO = sharerListVO.getSharer_info_list().get(0);
if (null != sharerInfoVO && null != sharerInfoVO.getCommission_ratio()) { if (null != sharerInfoVO && null != sharerInfoVO.getCommission_ratio()) {
weChatCommissionRatio = sharerInfoVO.getCommission_ratio(); weChatCommissionRatio = sharerInfoVO.getCommission_ratio();
log.info("商品:{},微信推客纬度佣金比例:{}", productId, weChatCommissionRatio);
} }
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment