Merge remote-tracking branch 'origin/dev-tiande' into dev-tiande

ace-modules/ace-admin-api/src/main/java/com/github/wxiaoqi/security/admin/entity/BaseUserMemberLevel.java

@@ -44,6 +44,12 @@ public class BaseUserMemberLevel implements Serializable {
 	@ApiModelProperty(value = "等级")
     private Integer level;
 
+
+
+	@Column(name = "extract")
+	@ApiModelProperty(value = "提成比例")
+	private Integer extract;
+	
 	    //描述
     @Column(name = "describes")
 	@ApiModelProperty(value = "描述")

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/biz/AppUserSellingWaterBiz.java

@@ -4,8 +4,11 @@ import com.github.wxiaoqi.security.admin.bo.UserIncomeBo;
 import com.github.wxiaoqi.security.admin.dto.*;
 import com.github.wxiaoqi.security.admin.entity.*;
 import com.github.wxiaoqi.security.admin.mapper.AppUserSellingWaterMapper;
+import com.github.wxiaoqi.security.admin.mapper.BaseUserMemberLevelMapper;
+import com.github.wxiaoqi.security.admin.vo.AppUserVo;
 import com.github.wxiaoqi.security.admin.vo.SellingWalletPagVo;
 import com.github.wxiaoqi.security.admin.vo.SellingWalletVo;
+import com.github.wxiaoqi.security.admin.vo.UserMemberVo;
 import com.github.wxiaoqi.security.common.biz.BaseBiz;
 import com.github.wxiaoqi.security.common.vo.PageDataVO;
 import lombok.extern.slf4j.Slf4j;
@@ -56,6 +59,12 @@ public class AppUserSellingWaterBiz extends BaseBiz<AppUserSellingWaterMapper, A
     @Autowired
     MyWaterBiz myWaterBiz;
 
+    @Autowired
+    BaseUserMemberBiz userMemberBiz;
+
+    @Autowired
+    BaseUserMemberLevelMapper BaseUserMemberLevelMapper;
+
 
     //计算用户拥金
     @Transactional(rollbackFor = Exception.class, propagation = Propagation.REQUIRED)
@@ -106,6 +115,11 @@ public class AppUserSellingWaterBiz extends BaseBiz<AppUserSellingWaterMapper, A
         AppUserPosition position = positionBiz.getExtract(parentId);
         if (position != null) {
             positionId = position.getId();
+            if (position.getLevel() != null && position.getLevel() == 0){
+                Integer extract = position.getExtract();
+                extract=getMemberExtract(parentId,extract);
+                position.setExtract(extract);
+            }
         }
         AppUserPosition position1 = positionBiz.getExtract(userId);
         if (position != null) {
@@ -519,4 +533,23 @@ public class AppUserSellingWaterBiz extends BaseBiz<AppUserSellingWaterMapper, A
         }
     }
 
+    public  Integer getMemberExtract(Integer userId,Integer extract){
+        AppUserVo appUserVo = appUserDetailBiz.getUserInfoById(userId);
+        if (appUserVo.getIsMember() != null && appUserVo.getIsMember() == 1){
+            UserMemberVo userMemberVo = userMemberBiz.getMemberInfoByUserId(userId);
+            if (userMemberVo != null){
+                BaseUserMemberLevel memberLevel1=new BaseUserMemberLevel();
+                memberLevel1.setLevel(userMemberVo.getMemberLevel());
+                memberLevel1.setIsdel(0);
+                memberLevel1=BaseUserMemberLevelMapper.selectOne(memberLevel1);
+                if (memberLevel1 !=null  ){
+                    extract = memberLevel1.getExtract() == null ? extract : memberLevel1.getExtract();
+
+                }
+
+            }
+        }
+        return  extract;
+    }
+
 }
\ No newline at end of file

ace-modules/ace-admin/src/main/resources/mapper/AppUserDetailMapper.xml

@@ -117,7 +117,7 @@
     LEFT JOIN   app_user_detail  d ON d.userid = l.id
     LEFT JOIN app_user_login ul ON ul.id = d.inviter_account
     LEFT JOIN base_user_member m ON d.userid = m.user_id
-    LEFT JOIN xxfc_app.app_version_mark z ON z.mark = d.register_source
+    LEFT JOIN tiande_app.app_version_mark z ON z.mark = d.register_source
     LEFT JOIN
     (
 	SELECT

xx-tour/xx-tour-api/src/main/java/com/xxfc/platform/tour/vo/TourDepartVo.java

@@ -82,4 +82,6 @@ public class TourDepartVo {
 	@ApiModelProperty(value = "排序")
 	private Integer rank;
 
+	private String phone;
+
 }

xx-tour/xx-tour-server/src/main/resources/mapper/TourGoodSiteMapper.xml

@@ -36,12 +36,14 @@
         <result property="type" column="type"/>
         <result property="intro" column="intro"/>
         <result property="rank" column="rank"/>
+        <result property="phone" column="phone"/>
     </resultMap>
 
     <!-- 获取出行时间 -->
     <select id="getlistByGoodId"  resultMap="tourDepartVoMap">
-        SELECT *  FROM tour_good_site
-        WHERE good_id=#{goodId} and is_del=0
+        SELECT s.*,c.phone  FROM tour_good_site s
+        LEFT JOIN branch_company c ON s.company_id=c.id
+        WHERE s.good_id=113 and s.is_del=0
     </select>
     <update id="delSite">
         update  tour_good_site set  is_del=1