Merge branch 'test6.8.2' of http://git.yoho.cn/ufo/ufo-platform into test6.8.2

@@ -33,7 +33,7 @@
             and brand.brand_name like concat('%', #{productDetails.brandName}, '%')
             and brand.brand_name like concat('%', #{productDetails.brandName}, '%')
         </if>
         </if>
         <if test="productDetails.sortName != null and productDetails.sortName != ''">
         <if test="productDetails.sortName != null and productDetails.sortName != ''">
-            and sort1.sort_name like concat('%', #{productDetails.sortName}, '%')
+            and (sort1.sort_name like concat('%', #{productDetails.sortName}, '%') or sort2.sort_name like concat('%', #{productDetails.sortName}, '%'))
         </if>
         </if>
     </sql>
     </sql>
 
 

@@ -224,8 +224,14 @@ public class TradeBillsServiceImpl implements ITradeBillsService {
 		LOGGER.info("call ufo-RealNameAuthorize4PlatformController userRealNameAuthorize.getAliPayAccount interface is {}, result is {}", jsonObject.toJSONString());
 		LOGGER.info("call ufo-RealNameAuthorize4PlatformController userRealNameAuthorize.getAliPayAccount interface is {}, result is {}", jsonObject.toJSONString());
 		if(200==jsonObject.getIntValue("code")){
 		if(200==jsonObject.getIntValue("code")){
 			JSONObject data=jsonObject.getJSONObject("data");
 			JSONObject data=jsonObject.getJSONObject("data");
-			if(data!=null&&data.get("alipayAccount")!=null){
-				return data.getString("alipayAccount");
+			if(data!=null){
+				if(data.get("alipayUid")!=null&&StringUtils.isNotBlank(data.getString("alipayUid"))){
+					return data.getString("alipayUid");
+				}else if(data.get("alipayAccount")!=null&&StringUtils.isNotBlank(data.getString("alipayAccount"))){
+					return data.getString("alipayAccount");
+				}else{
+					return "";
+				}
 			}
 			}
 		}
 		}
 		return "";
 		return "";

@@ -50,7 +50,7 @@ public class ResourceServiceImpl implements IResourceService{
         }
         }
         List<ResourceGetBo> resourceGetBoList = new ArrayList<>();
         List<ResourceGetBo> resourceGetBoList = new ArrayList<>();
         for(Resources res : resourcesList){
         for(Resources res : resourcesList){
-            ResourceGetBo bo = new ResourceGetBo(res.getId(), res.getName(), "APP",
+            ResourceGetBo bo = new ResourceGetBo(res.getId(), res.getName(), Integer.valueOf(1).equals(res.getPlatformId()) ? "APP" : "小程序",
                     res.getCode(), res.getCreateTime());
                     res.getCode(), res.getCreateTime());
             resourceGetBoList.add(bo);
             resourceGetBoList.add(bo);
         }
         }