From 35c25585cf6fea9e29574a75a03c57381cbe19e1 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期一, 05 八月 2019 16:35:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/service/impl/brand/BrandClassShopServiceImpl.java | 15 +++++++++++++++
1 files changed, 15 insertions(+), 0 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/brand/BrandClassShopServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/brand/BrandClassShopServiceImpl.java
index b5f02c6..566f3bb 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/brand/BrandClassShopServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/brand/BrandClassShopServiceImpl.java
@@ -361,6 +361,14 @@
for (BrandClassShop brandClassShop : list) {
TaoBaoShop shop = brandClassShop.getShop();
if (shop != null) {
+
+ Integer userType = shop.getUserType();
+ if (userType == null || userType == 0) {
+ shop.setUserType(10);
+ } else {
+ shop.setUserType(11);
+ }
+
String shopLink = shop.getShopLink();
if (StringUtil.isNullOrEmpty(shopLink)) {
shop.setShopLink(TaoBaoUtil.getShopLink(shop.getId()));
@@ -398,6 +406,13 @@
BigDecimal shareRate = hongBaoManageService.getShareRate();
for (TaoBaoShopVO taoBaoShopVO : listInfo) {
+ Integer userType = taoBaoShopVO.getUserType();
+ if (userType == null || userType == 0) {
+ taoBaoShopVO.setUserType(10);
+ } else {
+ taoBaoShopVO.setUserType(11);
+ }
+
String shopLink = taoBaoShopVO.getShopLink();
if (StringUtil.isNullOrEmpty(shopLink)) {
taoBaoShopVO.setShopLink(TaoBaoUtil.getShopLink(taoBaoShopVO.getId()));
--
Gitblit v1.8.0