From a39422f2a8ce45dd6cf65701ed5f9e65391c46c1 Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期二, 23 七月 2019 11:03:35 +0800
Subject: [PATCH] Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div

---
 fanli/src/main/java/com/yeshi/fanli/service/impl/dynamic/DynamicInfoServiceImpl.java |   13 +++++++++++++
 1 files changed, 13 insertions(+), 0 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/dynamic/DynamicInfoServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/dynamic/DynamicInfoServiceImpl.java
index cde6ec7..c9ef08a 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/dynamic/DynamicInfoServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/dynamic/DynamicInfoServiceImpl.java
@@ -901,6 +901,19 @@
 			BigDecimal shareRate = hongBaoManageService.getShareRate();
 			
 			for (DynamicInfo dynamicInfo: list) {
+				
+				TaoBaoShop shop = dynamicInfo.getShop();
+				if (shop != null) {
+					Integer userType = shop.getUserType();
+					if (userType == null || userType == 0) {
+						shop.setUserType(10);
+					} else {
+						shop.setUserType(11);
+					}
+					dynamicInfo.setShop(shop);
+				}
+				
+				
 				List<GoodsPicture> imgs = dynamicInfo.getImgs();
 				if (imgs != null && imgs.size() > 0) {
 					for (GoodsPicture goodsPicture: imgs) {

--
Gitblit v1.8.0