用户来源等修改

src/main/java/com/thinkgem/jeesite/modules/youka/dao/YoukaBenefitDao.java

@@ -16,7 +16,10 @@ public interface YoukaBenefitDao extends CrudDao<YoukaBenefit>{
     // 查询分润
     public List<YoukaBenefit> getBenefitListByOrderCode(YoukaBenefit request);
 
-    // 按照条件获取分润之和
+    // 按照条件获取分润之和（正常）
     YoukaBenefit getBenefitSum(YoukaBenefit youkaBenefit);
 
+    //按照条件获取分润之和（用户部分）
+    YoukaBenefit getBenefitSumUser(YoukaBenefit youkaBenefit);
+
 }

src/main/java/com/thinkgem/jeesite/modules/youka/dao/YoukaUserDao.java

@@ -25,4 +25,6 @@ public interface YoukaUserDao extends CrudDao<YoukaUser> {
     // 根据通道获取Submchid
     public List<UserSubMchId> getUserSubmchid(UserSubMchId userSubMchId);
 
+    public YoukaUser getUserByOrderCode(String orderCode);
+
 }

src/main/java/com/thinkgem/jeesite/modules/youka/entity/OrderEntity.java

@@ -31,7 +31,7 @@ public class OrderEntity extends DataEntity<OrderEntity> implements Serializable
 
     private String code;
 
-    private String benefitAmount; // 分润总金额
+    private String benefitAmount; // 分润金额
 
     private String benefitDescribe;// 分润去向
 

src/main/java/com/thinkgem/jeesite/modules/youka/service/UpgradeUserService.java

 package com.thinkgem.jeesite.modules.youka.service;
 
+import com.google.common.collect.Lists;
 import com.thinkgem.jeesite.common.service.CrudService;
 import com.thinkgem.jeesite.common.utils.StringUtils;
+import com.thinkgem.jeesite.modules.sys.entity.Office;
+import com.thinkgem.jeesite.modules.sys.entity.Role;
 import com.thinkgem.jeesite.modules.sys.entity.User;
+import com.thinkgem.jeesite.modules.sys.service.SystemService;
 import com.thinkgem.jeesite.modules.sys.utils.UserUtils;
 import com.thinkgem.jeesite.modules.youka.dao.UpgradeUserDao;
 import com.thinkgem.jeesite.modules.youka.dao.YoukaUserDao;
@@ -13,6 +17,9 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.util.ArrayList;
+import java.util.List;
+
 @Service
 @Transactional(readOnly = true)
 public class UpgradeUserService  extends CrudService<UpgradeUserDao, UpgradeUserEntity> {
@@ -20,26 +27,53 @@ public class UpgradeUserService  extends CrudService<UpgradeUserDao, UpgradeUser
     @Autowired
     private YoukaUserService youkaUserService;
 
+    @Autowired
+    private SystemService systemService;
+
 
     @Transactional(readOnly = false, propagation = Propagation.REQUIRES_NEW)
     public void examine(UpgradeUserEntity upgradeUserEntity){
+//        //升级钻石用户，建立新的前端账户
         YoukaUser youkaUser = youkaUserService.checkMobile(upgradeUserEntity.getMobile());
-        YoukaUser youkaUserNew = new YoukaUser();
-        youkaUserNew.setMobile(upgradeUserEntity.getAfterMobile());
-        youkaUserNew.setPassword(youkaUser.getPassword());
-        youkaUserNew.setRecommendedMobile(youkaUser.getRecommendedMobile());
-        youkaUserNew.setOrderCode(upgradeUserEntity.getOrderCode());
-        youkaUserNew.setLevel(upgradeUserEntity.getLevel());
-        User user = UserUtils.getUser();
-        if(StringUtils.isNotBlank(youkaUser.getRecommendedPath())){
-
-            youkaUserNew.setRecommendedPath(youkaUser.getRecommendedPath().substring(0,4));
-            if(StringUtils.isNotBlank(user.getName()) && user.getName().contains("userId:")){
-                youkaUserNew.setRecommendedPath(youkaUserNew.getRecommendedPath()+","+user.getName().substring(7)+",");
+//        YoukaUser youkaUserNew = new YoukaUser();
+//        youkaUserNew.setMobile(upgradeUserEntity.getAfterMobile());
+//        youkaUserNew.setPassword(youkaUser.getPassword());
+//        youkaUserNew.setRecommendedMobile(youkaUser.getRecommendedMobile());
+//        youkaUserNew.setOrderCode(upgradeUserEntity.getOrderCode());
+//        youkaUserNew.setLevel(upgradeUserEntity.getLevel());
+//        User user = UserUtils.getUser();
+//        if(StringUtils.isNotBlank(youkaUser.getRecommendedPath())){
+//
+//            youkaUserNew.setRecommendedPath(youkaUser.getRecommendedPath().substring(0,4));
+//            if(StringUtils.isNotBlank(user.getName()) && user.getName().contains("userId:")){
+//                youkaUserNew.setRecommendedPath(youkaUserNew.getRecommendedPath()+","+user.getName().substring(7)+",");
+//            }
+//        }
+
+//        youkaUserService.save(youkaUserNew);
+        //同时建立管理后台用户
+        User bUser = new User();
+        bUser.setCompany(new Office("48b56cabc6d64691b6f97c518bac76fd"));
+        bUser.setOffice(new Office("153fd0952728416aa9d3e712dc525bf5"));
+        bUser.setPassword(SystemService.entryptPassword(upgradeUserEntity.getAfterMobile()));//用户升级之后，管理后台密码为新的手机号码
+        bUser.setPhone(upgradeUserEntity.getAfterMobile());
+        List<Role> roleList = Lists.newArrayList();
+        List<String> roleIdList = new ArrayList<>();
+        roleIdList.add("5253e6070a7a456683d697a49980978a");
+//                user.preInsert();
+        for (Role r : systemService.findAllRole()){
+            if (roleIdList.contains(r.getId())){
+                roleList.add(r);
             }
         }
+        bUser.setRoleList(roleList);
+        bUser.setName("userId_"+youkaUser.getId());
+        bUser.setLoginName(youkaUser.getMobile());
+        bUser.setLoginFlag("1");
+        bUser.setNo("121323");
+        // 保存用户信息
+        systemService.saveUser(bUser);
 
-        youkaUserService.save(youkaUserNew);
 
         upgradeUserEntity.setStatus("2");
         upgradeUserEntity.preUpdate();

src/main/java/com/thinkgem/jeesite/modules/youka/service/YoukaBenefitService.java

@@ -4,10 +4,15 @@ import com.thinkgem.jeesite.common.persistence.Page;
 import com.thinkgem.jeesite.common.service.BaseService;
 import com.thinkgem.jeesite.common.service.CrudService;
 import com.thinkgem.jeesite.common.utils.DateUtils;
+import com.thinkgem.jeesite.modules.sys.entity.User;
+import com.thinkgem.jeesite.modules.sys.utils.UserUtils;
 import com.thinkgem.jeesite.modules.youka.dao.YoukaBenefitDao;
+import com.thinkgem.jeesite.modules.youka.dao.YoukaUserDao;
 import com.thinkgem.jeesite.modules.youka.entity.OrderEntity;
 import com.thinkgem.jeesite.modules.youka.entity.YoukaBenefit;
+import com.thinkgem.jeesite.modules.youka.entity.YoukaUser;
 import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -20,12 +25,20 @@ import java.util.Map;
 @Service
 @Transactional(readOnly = true)
 public class YoukaBenefitService extends CrudService<YoukaBenefitDao ,YoukaBenefit> {
+
+    @Autowired
+    private YoukaUserDao youkaUserDao;
+
+    @Autowired
+    private YoukaBenefitDao youkaBenefitDao;
+
     /**
      * 分润
+     *
      * @param request
      * @return
      */
-    public List<YoukaBenefit> getBenefitList(YoukaBenefit request){
+    public List<YoukaBenefit> getBenefitList(YoukaBenefit request) {
 
         return dao.findList(request);
 
@@ -33,17 +46,18 @@ public class YoukaBenefitService extends CrudService<YoukaBenefitDao ,YoukaBenef
 
 
     // 通过时间修改分润的状态
-    public Integer updateBenefitByDate(YoukaBenefit youkaBenefit){
+    public Integer updateBenefitByDate(YoukaBenefit youkaBenefit) {
         return dao.updateBenefitByDate(youkaBenefit);
     }
 
 
     /**
      * 余额
+     *
      * @param entity
      * @return
      */
-    public String getBalance(YoukaBenefit entity){
+    public String getBalance(YoukaBenefit entity) {
 
         // 总收益
         entity.setBenefitType("A");
@@ -54,28 +68,38 @@ public class YoukaBenefitService extends CrudService<YoukaBenefitDao ,YoukaBenef
         YoukaBenefit benefitEntityM = dao.getBenefitSum(entity);
 
         // 余额 = 总收益-总提现
-        if(benefitEntityA==null){
+        if (benefitEntityA == null) {
             return "0.00";
-        }else {
-            if(benefitEntityA.getAmount() == null){
+        } else {
+            if (benefitEntityA.getAmount() == null) {
                 benefitEntityA.setAmount("0.00");
             }
-            if(benefitEntityM == null){
+            if (benefitEntityM == null) {
                 return "0.00";
-            }else{
-                if(benefitEntityM.getAmount() == null ){
+            } else {
+                if (benefitEntityM.getAmount() == null) {
                     benefitEntityM.setAmount("0.00");
                 }
                 DecimalFormat df = new DecimalFormat("######0.00");
-               return (df.format(Double.valueOf(benefitEntityA.getAmount()) - Double.valueOf(benefitEntityM.getAmount())));
+                return (df.format(Double.valueOf(benefitEntityA.getAmount()) - Double.valueOf(benefitEntityM.getAmount())));
             }
         }
 
     }
 
 
+    public Page<YoukaBenefit> findPage(Page<YoukaBenefit> page, YoukaBenefit youkaBenefit) {
+        //不同类型用户所看到分润不同
+//        管理员看到的是所有的，王者，钻石看到的是自己的
+//        youkaUserDao
+        User user = UserUtils.getUser();
+        if (!StringUtils.isBlank(user.getOffice().getName())) {
+            youkaBenefit.setUserCode(user.getPhone());
+        }
+        if (user.getOffice().getName().equals("钻石用户")) {
+            youkaBenefit.setCode("B");
 
-    public Page<YoukaBenefit> findPage(Page<YoukaBenefit> page, YoukaBenefit youkaBenefit){
+        }
         Page<YoukaBenefit> pages = super.findPage(page,youkaBenefit);
         Map<String,String> map = new HashMap<>();
         if(page != null && pages.getList() != null && pages.getList().size()>0){
@@ -83,6 +107,7 @@ public class YoukaBenefitService extends CrudService<YoukaBenefitDao ,YoukaBenef
                 if(StringUtils.isNotBlank(map.get(youkaBenefit1.getUserCode()))){
                     youkaBenefit1.setBalance(map.get(youkaBenefit1.getUserCode()));
                 }else{
+                    //设置余额
                     youkaBenefit1.setBalance(this.getBalance(youkaBenefit1));
                     map.put(youkaBenefit1.getUserCode(),youkaBenefit1.getBalance());
                 }
@@ -91,4 +116,35 @@ public class YoukaBenefitService extends CrudService<YoukaBenefitDao ,YoukaBenef
         }
         return pages;
     }
+
+    public Page<YoukaBenefit> findPageUser(Page<YoukaBenefit> page, YoukaBenefit youkaBenefit){
+        //不同类型用户所看到分润不同
+//        管理员看到的是所有的，王者看到的是旗下所有钻石收益，钻石看到的是下一级推荐的收益
+//        youkaUserDao
+        User user = UserUtils.getUser();
+        if(!StringUtils.isBlank(user.getOffice().getName()) ){
+
+            if (user.getOffice().getName().equals("王者用户")){
+                youkaBenefit.setUserCode(user.getPhone());
+            }
+            if (user.getOffice().getName().equals("钻石用户")){
+                youkaBenefit.setUserCode(user.getPhone());
+
+            }
+        }
+        Page<YoukaBenefit> pages = super.findPage(page,youkaBenefit);
+        List<YoukaBenefit> list = page.getList();
+        if (list.size()>0){
+            for (YoukaBenefit entity:list) {
+                YoukaUser youkaUser = youkaUserDao.getUserByOrderCode(entity.getOrderEntity().getPayCode());
+                if (youkaUser!= null){
+                    OrderEntity orderEntity = entity.getOrderEntity();
+                    orderEntity.setNickname(youkaUser.getMobile());
+                    entity.setOrderEntity(orderEntity);
+                }
+            }
+        }
+
+        return pages;
+    }
 }

src/main/java/com/thinkgem/jeesite/modules/youka/web/YoukaBenefitController.java

@@ -36,10 +36,10 @@ public class YoukaBenefitController extends BaseController {
     @RequiresPermissions("youka:benefit:view")
     @RequestMapping(value = {"listByUser", ""})
     public String listByUser(YoukaBenefit youkaBenefit, HttpServletRequest request, HttpServletResponse response, Model model) {
-        Page<YoukaBenefit> page = youkaBenefitService.findPage(new Page<YoukaBenefit>(request, response), youkaBenefit);
+        Page<YoukaBenefit> page = youkaBenefitService.findPageUser(new Page<YoukaBenefit>(request, response), youkaBenefit);
         model.addAttribute("page", page);
         model.addAttribute("youkaBenefit", youkaBenefit);
-        model.addAttribute("balance",youkaBenefitService.getBalance(youkaBenefit));
+//        model.addAttribute("balance",youkaBenefitService.getBalance(youkaBenefit));
 
         return "modules/youka/benefit/benefitUserList";
     }
@@ -56,7 +56,7 @@ public class YoukaBenefitController extends BaseController {
     public String list(YoukaBenefit youkaBenefit, HttpServletRequest request, HttpServletResponse response, Model model) {
         Page<YoukaBenefit> page = youkaBenefitService.findPage(new Page<YoukaBenefit>(request, response), youkaBenefit);
         model.addAttribute("page", page);
-        model.addAttribute("youkaBenefit", youkaBenefit);
+//        model.addAttribute("youkaBenefit", youkaBenefit);
 
         return "modules/youka/benefit/benefitList";
     }

src/main/java/com/thinkgem/jeesite/modules/youka/web/YoukaUserController.java

@@ -4,6 +4,7 @@ import com.thinkgem.jeesite.common.config.Global;
 import com.thinkgem.jeesite.common.persistence.Page;
 import com.thinkgem.jeesite.common.utils.StringUtils;
 import com.thinkgem.jeesite.common.web.BaseController;
+import com.thinkgem.jeesite.modules.sys.entity.Office;
 import com.thinkgem.jeesite.modules.sys.entity.User;
 import com.thinkgem.jeesite.modules.sys.utils.UserUtils;
 import com.thinkgem.jeesite.modules.youka.entity.UpgradeUserEntity;
@@ -33,7 +34,7 @@ import javax.servlet.http.HttpServletResponse;
 
 @Controller
 @RequestMapping(value = "${adminPath}/youka/user")
-public class YoukaUserController  extends BaseController {
+public class YoukaUserController extends BaseController {
 
     @Autowired
     private YoukaUserService youkaUserService;
@@ -48,10 +49,10 @@ public class YoukaUserController  extends BaseController {
     private UpgradeUserService upgradeUserService;
 
     @ModelAttribute
-    public YoukaUser get(@RequestParam(required=false) String id) {
-        if (StringUtils.isNotBlank(id)){
+    public YoukaUser get(@RequestParam(required = false) String id) {
+        if (StringUtils.isNotBlank(id)) {
             return youkaUserService.get(id);
-        }else{
+        } else {
             return new YoukaUser();
         }
     }
@@ -59,6 +60,7 @@ public class YoukaUserController  extends BaseController {
 
     /**
      * 用户列表
+     *
      * @param youkaUser
      * @param request
      * @param response
@@ -68,6 +70,11 @@ public class YoukaUserController  extends BaseController {
     @RequiresPermissions("youka:user:view")
     @RequestMapping(value = {"list", ""})
     public String list(YoukaUser youkaUser, HttpServletRequest request, HttpServletResponse response, Model model) {
+        User user = UserUtils.getUser();
+        if (!StringUtils.isBlank(user.getOffice().getName()) &&(user.getOffice().getName().equals("王者用户") || user.getOffice().getName().equals("钻石用户"))) {
+            youkaUser.setLevel("A");
+            youkaUser.setMobile(user.getPhone());
+        }
         Page<YoukaUser> page = youkaUserService.findPage(new Page<YoukaUser>(request, response), youkaUser);
         model.addAttribute("page", page);
         return "modules/youka/userList";
@@ -76,6 +83,7 @@ public class YoukaUserController  extends BaseController {
 
     /**
      * 添加用户页面
+     *
      * @param youkaUser
      * @param model
      * @return
@@ -83,6 +91,15 @@ public class YoukaUserController  extends BaseController {
     @RequiresPermissions("youka:user:view")
     @RequestMapping(value = "form")
     public String form(YoukaUser youkaUser, Model model) {
+        User user = UserUtils.getUser();
+        //王者会员只能添加钻石会员
+        if (!StringUtils.isBlank(user.getOffice().getName()) && user.getOffice().getName().equals("王者用户")) {
+            model.addAttribute("userLevel", "A");
+        }
+        //王者会员只能添加钻石会员
+        if (!StringUtils.isBlank(user.getOffice().getName()) && user.getOffice().getName().equals("钻石用户")) {
+            model.addAttribute("userLevel", "B");
+        }
         model.addAttribute("youkaUser", youkaUser);
         return "modules/youka/userForm";
     }
@@ -90,6 +107,7 @@ public class YoukaUserController  extends BaseController {
 
     /**
      * 修改用户页面
+     *
      * @param youkaUser
      * @param model
      * @return
@@ -98,7 +116,7 @@ public class YoukaUserController  extends BaseController {
     @RequestMapping(value = "modify")
     public String modify(YoukaUser youkaUser, Model model) {
         model.addAttribute("youkaUser", youkaUser);
-        if(youkaUser != null && youkaUser.getCode() != null){
+        if (youkaUser != null && youkaUser.getCode() != null) {
             youkaUser.setYoukaUserDetail(youkaUserDetailService.getByUserCode(youkaUser.getCode()));
             YoukaCardEntity youkaCardEntity = new YoukaCardEntity();
             youkaCardEntity.setUserCode(youkaUser.getCode());
@@ -111,6 +129,7 @@ public class YoukaUserController  extends BaseController {
 
     /**
      * 实名认证页面
+     *
      * @param youkaUser
      * @param model
      * @return
@@ -119,7 +138,7 @@ public class YoukaUserController  extends BaseController {
     @RequestMapping(value = "real/name/audit")
     public String realNameAudit(YoukaUser youkaUser, Model model) {
         model.addAttribute("youkaUser", youkaUser);
-        if(youkaUser != null && youkaUser.getCode() != null){
+        if (youkaUser != null && youkaUser.getCode() != null) {
             youkaUser.setYoukaUserDetail(youkaUserDetailService.getByUserCode(youkaUser.getCode()));
         }
         return "modules/youka/userRealNameAudit";
@@ -127,13 +146,14 @@ public class YoukaUserController  extends BaseController {
 
     /**
      * 保存或修改用户
+     *
      * @param youkaUser
      * @param model
      * @return
      */
     @RequiresPermissions("youka:user:save")
     @RequestMapping(value = "save")
-    public String save(YoukaUser youkaUser, Model model, RedirectAttributes redirectAttributes){
+    public String save(YoukaUser youkaUser, Model model, RedirectAttributes redirectAttributes) {
         // 判断业务入参是否为空
         if (StringUtils.isBlank(youkaUser.getMobile()) || StringUtils.isBlank(youkaUser.getPassword())) {
             addMessage(model, "手机号或密码为空");
@@ -141,10 +161,10 @@ public class YoukaUserController  extends BaseController {
         }
 
         // 查询注册手机号是否存在
-        if(youkaUser.getId()==null || "".equals(youkaUser.getId())){
+        if (youkaUser.getId() == null || "".equals(youkaUser.getId())) {
             if (youkaUserService.checkMobile(youkaUser) != null) {
                 addMessage(model, "手机号已存在");
-                return form(youkaUser,model);
+                return form(youkaUser, model);
             }
         }
 
@@ -153,7 +173,7 @@ public class YoukaUserController  extends BaseController {
             youkaUserService.save(youkaUser);
             addMessage(redirectAttributes, "保存用户'" + youkaUser.getMobile() + "'成功");
             return "redirect:" + adminPath + "/youka/user/list?repage";
-        }catch (Exception e){
+        } catch (Exception e) {
 
             addMessage(redirectAttributes, "保存用户'" + youkaUser.getMobile() + "失败");
             e.printStackTrace();
@@ -163,6 +183,7 @@ public class YoukaUserController  extends BaseController {
 
     /**
      * 用户列表
+     *
      * @param upgradeUserEntity
      * @param request
      * @param response
@@ -173,11 +194,11 @@ public class YoukaUserController  extends BaseController {
     @RequestMapping(value = {"upgradeUserlist"})
     public String upgradeUserlist(UpgradeUserEntity upgradeUserEntity, HttpServletRequest request, HttpServletResponse response, Model model) {
         User user = UserUtils.getUser();
-        if(StringUtils.isNotBlank(user.getName()) && user.getName().contains("userId:")){
+        if (StringUtils.isNotBlank(user.getName()) && user.getName().contains("userId:")) {
             upgradeUserEntity.setA_userId(user.getName().substring(7));
         }
 
-        if(upgradeUserEntity == null){
+        if (upgradeUserEntity == null) {
             upgradeUserEntity = new UpgradeUserEntity();
         }
         // 查询升级成钻石会员得记录
@@ -190,7 +211,7 @@ public class YoukaUserController  extends BaseController {
 
     @RequiresPermissions("youka:user:view")
     @RequestMapping(value = {"examine"})
-    public String examine(UpgradeUserEntity upgradeUserEntity, Model model, RedirectAttributes redirectAttributes){
+    public String examine(UpgradeUserEntity upgradeUserEntity, Model model, RedirectAttributes redirectAttributes) {
         upgradeUserService.examine(upgradeUserEntity);
         addMessage(redirectAttributes, "保存用户'" + upgradeUserEntity.getMobile() + "'成功");
         return "redirect:" + adminPath + "/youka/user/upgradeUserlist?repage";

src/main/resources/mappings/modules/youka/YoukaBenefitDao.xml

@@ -4,17 +4,19 @@
 
 	<select id="findList" resultType="com.thinkgem.jeesite.modules.youka.entity.YoukaBenefit">
 		SELECT
-		o.pay_code AS "orderEntity.payCode",
+		DISTINCT o.code AS "orderEntity.payCode",
+		o.create_date AS  "orderEntity.createDate",
+		yu.nickname AS  "orderEntity.nickname",
 		o.pay_no AS "orderEntity.payNo",
 		o.pay_status AS "orderEntity.payStatus",
 		o.pay_type AS "orderEntity.payType",
 		o.pay_channel AS "orderEntity.payChannel",
 		o.`subject` AS "orderEntity.subject",
-		o.amount AS "orderEntity.amount",
+		yb.amount AS "orderEntity.benefitAmount",
 		sd.label AS "orderEntity.payChannelName",
 		yu.nickname AS nickname,
 		yu.mobile AS mobile,
-		yb.amount AS "amount",
+		o.amount AS "amount",
 		yb.benefit_type,
 		yb.user_code,
 		yb.create_date AS "createDate"
@@ -24,14 +26,34 @@
 		LEFT JOIN sys_dict sd ON sd.`VALUE` = o.pay_channel
 		LEFT JOIN youka_users yu ON yu.code = yb.user_code
 		WHERE o.del_flag = 0
+-- 		AND  o.pay_status = 2
+		<!--<if test="userCode != null and userCode != '' and code == 'A'">-->
+			<!--AND  yb.user_code IN (SELECT `code` FROM `youka_users` WHERE FIND_IN_SET(( SELECT a.id FROM youka_users a WHERE a.mobile = #{userCode} ), recommended_path );)-->
+		<!--</if>-->
 		<if test="userCode != null and userCode != ''">
-			AND yb.user_code = #{userCode}
+			AND yb.user_code = (SELECT code FROM  youka_users y1 WHERE y1.mobile = #{userCode})
+		<!--王者用户 获取的是钻石级别用户的所有收益百分比2% -->
+			<!--<if test='code != null and code != "" and code == "A"'>-->
+			<!--AND  yb.user_code IN (SELECT `code` FROM  `youka_users` y1 WHERE y1.recommended_mobile IN (SELECT y2.mobile FROM `youka_users` y2 WHERE y2.recommended_mobile = #{userCode} AND y2.`level` = "B"))-->
+			<!--</if>-->
+			<!--&lt;!&ndash;钻石用户 获取的是所有下一级用户的收益的百分比2% &ndash;&gt;-->
+			<!--<if test='code != null and code != "" and code == "B"'>-->
+			<!--AND  yb.user_code IN (SELECT y.code FROM youka_users y WHERE y.recommended_mobile = #{userCode})-->
+			<!--</if>-->
+			<!--AND yb.benefit_type = "A"-->
 		</if>
+
+		<!--<if test="userCode != null and userCode != '' and code == 'B'">-->
+			<!--AND  yb.user_code IN (SELECT y.code FROM youka_users y WHERE y.recommended_mobile = #{userCode})-->
+		<!--</if>-->
 		<if test="orderEntity!=null and orderEntity.payChannel != null and orderEntity.payChannel != ''">
 			AND o.pay_channel = #{payChannel}
 		</if>
 		<if test="orderEntity!=null and orderEntity.payStatus != null and orderEntity.payStatus != ''">
-			AND o.pay_status = #{payStatus}
+			AND o.pay_status = #{orderEntity.payStatus}
+		</if>
+		<if test="nickname != null and nickname !=''">
+			AND yu.nickname = #{nickname}
 		</if>
 		<if test="benefitType != null and benefitType != ''">
 			AND yb.benefit_type = #{benefitType}
@@ -98,5 +120,23 @@
 	</select>
 
 
+	<select id="getBenefitSumUser" resultType="com.thinkgem.jeesite.modules.youka.entity.YoukaBenefit">
+		SELECT
+		SUM(amount) AS amount
+		FROM youka_benefit
+		WHERE user_code = #{userCode}
+		AND del_flag = 0
+		AND benefit_type = #{benefitType}
+		<if test="benefitStatus != null and benefitStatus != ''">
+			AND benefit_status = #{benefitStatus}
+		</if>
+		<if test="startTime != null and startTime != ''">
+			AND create_date >= #{startTime}
+		</if>
+		<if test="endTime != null and endTime != ''">
+			AND create_date &lt;= #{endTime}
+		</if>
+	</select>
+
 
 </mapper>
\ No newline at end of file

src/main/resources/mappings/modules/youka/YoukaUserDao.xml

@@ -63,9 +63,6 @@
 					<if test="dbName == 'mssql'">'%'+#{nickname}+'%'</if>
 					<if test="dbName == 'mysql'">CONCAT('%', #{nickname}, '%')</if>
 			</if>
-			<if test="level != null and level != ''">
-				AND u.level = #{level}
-			</if>
 			<if test="recommendedMobile != null and recommendedMobile != ''">
 				AND u.recommended_mobile like
 				<if test="category.parentIds != null and category.parentIds != ''">
@@ -77,6 +74,10 @@
 			<if test="status != null and status != ''">
 				AND u.status  = #{status}
 			</if>
+			<if test="level != null and level != ''">
+					AND  u.code IN (SELECT y2.code FROM `youka_users` y2 WHERE y2.recommended_mobile = #{mobile})
+
+			</if>
 		</where>
 		<choose>
 			<when test="page !=null and page.orderBy != null and page.orderBy != ''">
@@ -253,4 +254,16 @@
 		WHERE  pay_channel = #{payChannel}
 		AND yu.level = #{level}
 	</select>
+
+	<select id="getUserByOrderCode" resultType="com.thinkgem.jeesite.modules.youka.entity.YoukaUser">
+		SELECT
+		<include refid="youkaUserColumns"/>
+		FROM
+		youka_users u
+		LEFT JOIN
+		youka_orders o
+		ON u.code = o.user_code
+		WHERE
+		o.code = #{orderCode}
+	</select>
 </mapper>
\ No newline at end of file

src/main/webapp/WEB-INF/views/modules/sys/userInfo.jsp

@@ -67,7 +67,7 @@
 		<div class="control-group">
 			<label class="control-label">电话:</label>
 			<div class="controls">
-				<form:input path="phone" htmlEscape="false" maxlength="50"/>
+				<form:input path="phone" htmlEscape="false" maxlength="50" readonly="true"/>
 			</div>
 		</div>
 		<div class="control-group">

src/main/webapp/WEB-INF/views/modules/youka/benefit/benefitUserList.jsp

@@ -2,17 +2,44 @@
 <%@ include file="/WEB-INF/views/include/taglib.jsp"%>
 <html>
 <head>
-	<title>订单管理</title>
+	<title>交易管理</title>
 	<meta name="decorator" content="default"/>
 	<script type="text/javascript">
 		$(document).ready(function() {
+            $.ajax({
+                url:"${ctx}/sys/dict/listDataByParent",
+                type: "POST",
+                data:
+                    {
+                        parentType:'pay_method',
+                        parentValue:$("#payMethod").attr("value"),
+                        type:'pay_channel'
+                    }
+                ,
+                async:false,
+                success: function(data){
+                    $("#payChannel").empty();
+                    // $("#payChannel").append('<option value="">全部</option>');
+                    for(var i in data){
 
+                        var payChannel = $("#payChannel").attr("title");
+                        var dict = data[i];
+                        if(payChannel == dict.value){
+                            $("#payChannel").append('<option selected=selected value=' + dict.value + '> ' + dict.label + '</option>');
+                        }else{
+                            $("#payChannel").append('<option value=' + dict.value + '> ' + dict.label + '</option>');
+                        }
+
+                    }
+
+                }
+            })
 
         });
 		function page(n,s){
 			if(n) $("#pageNo").val(n);
 			if(s) $("#pageSize").val(s);
-			$("#searchForm").attr("action","${ctx}/youka/order/list");
+			$("#searchForm").attr("action","${ctx}/youka/benefit/listByUser");
 			$("#searchForm").submit();
 	    	return false;
 	    }
@@ -21,79 +48,61 @@
 <body>
 
 	<ul class="nav nav-tabs">
-		<li class="active"><a href="${ctx}/youka/order/list">订单列表</a></li>
+		<li class="active"><a href="${ctx}/youka/benefit/listByUser">交易列表</a></li>
 	</ul>
-	<form:form id="searchForm" modelAttribute="orderEntity" action="${ctx}/youka/order/list" method="post" class="breadcrumb form-search ">
+	<form:form id="searchForm" modelAttribute="youkaBenefit" action="${ctx}/youka/benefit/listByUser" method="post" class="breadcrumb form-search ">
 		<input id="pageNo" name="pageNo" type="hidden" value="${page.pageNo}"/>
 		<input id="pageSize" name="pageSize" type="hidden" value="${page.pageSize}"/>
 		<sys:tableSort id="orderBy" name="orderBy" value="${page.orderBy}" callback="page();"/>
 		<ul class="ul-form">
-			<li><label>交易人：</label><form:input path="keywords"></form:input></li>
-			<li><label>支付方式：</label>
-				<form:select id="payMethod" path="payMethod" class="input-medium"><form:option value="" label=""/><form:options itemValue="value" itemLabel="label" items="${fns:getDictList('pay_method')}" htmlEscape="false"/></form:select>
-				<%--<form:select cssStyle="width: 100px;" id="payMethod" path="payMethod" items="${fns:getDictList('pay_method')}" itemLabel="label" itemValue="value" htmlEscape="true" />--%>
-			</li>
-			<li><label>支付渠道：</label>
-				<select title="${orderEntity.payChannel}" name="payChannel" id="payChannel" style="width: 150px;">
+			<li><label>交易人：</label><form:input path="nickname"></form:input></li>
+			<%--<li><label>支付渠道：</label>--%>
+				<%--<select title="${payChannel}" name="payChannel" id="payChannel" style="width: 150px;">--%>
 
-				</select>
-			</li>
+				<%--</select>--%>
+			<%--</li>--%>
 			<li><label>交易状态：</label>
-				<form:select path="payStatus" cssStyle="width: 100px">
-					<form:option value="">
-						全部状态
-					</form:option>
-					<form:option value="0">
-						待支付
-					</form:option>
-					<form:option value="1">
-						支付中
-					</form:option>
-					<form:option value="2">
-						已支付
-					</form:option>
-					<form:option value="3">
-						逾期取消
-					</form:option>
-					<form:option value="4">
-						支付失败
-					</form:option>
-				</form:select>
+				<form:select id="payStatus" path="orderEntity.payStatus" class="input-medium"><form:option value="" label=""/><form:options itemValue="value" itemLabel="label" items="${fns:getDictList('pay_status')}" htmlEscape="false"/></form:select>
 			</li>
+			<li><label>时间：</label>
+				<input id="startTime" name="startTime" type="text" readonly="readonly" maxlength="20" class="input-small Wdate"
+					   value="<fmt:formatDate value="${youkaBenefit.startTime}" pattern="yyyy-MM-dd"/>"
+					   onclick="WdatePicker({dateFmt:'yyyy-MM-dd',isShowClear:true});"/>
 
-			<li class="btns"><input id="btnSubmit" class="btn btn-primary" type="submit" value="查询" onclick="return page();"/>
-				<input id="btnExport" class="btn btn-primary" type="button" value="导出"/>
-				<%--<input id="btnImport" class="btn btn-primary" type="button" value="导入"/>--%>
+				<input id="endTime" name="endTime" type="text" readonly="readonly" maxlength="20" class="input-small Wdate"
+					   value="<fmt:formatDate value="${youkaBenefit.endTime}" pattern="yyyy-MM-dd"/>"
+					   onclick="WdatePicker({dateFmt:'yyyy-MM-dd',isShowClear:true});"/>
 			</li>
+
+			<li class="btns"><input id="btnSubmit" class="btn btn-primary" type="submit" value="查询" onclick="return page();"/>
+				<%--<input id="btnExport" class="btn btn-primary" type="button" value="导出"/>--%>
 			<li class="clearfix"></li>
 		</ul>
 	</form:form>
 	<sys:message content="${message}"/>
 	<table id="contentTable" class="table table-striped table-bordered table-condensed">
-		<thead><tr><th>序号</th><th>订单号</th><th class="sort-column login_name">交易时间</th><th class="sort-column name">交易人</th><th>交易平台</th><th>状态</th><th>订单金额</th><th>产生分润</th><th>分润去向</th></tr></thead>
+		<thead><tr><th>序号</th><th>订单号</th><th class="sort-column login_name">交易时间</th><th class="sort-column name">交易人电话</th><th>交易平台</th><th>状态</th><th>订单金额</th><th>产生分润</th></tr></thead>
 		<tbody>
-		<c:forEach items="${page.list}" var="order" varStatus="indexs">
+		<c:forEach items="${page.list}" var="benefit" varStatus="indexs">
 			<tr>
 				<td>${indexs.index}</td>
-				<td>${order.payCode}</td>
-				<td><fmt:formatDate value="${order.createDate}" type="both" dateStyle="full"/></td>
+				<td>${benefit.orderEntity.payCode}</td>
+				<td><fmt:formatDate value="${benefit.orderEntity.createDate}" type="both" dateStyle="full"/></td>
 				<td>
-						${order.nickname}
+						${benefit.orderEntity.nickname}
 				</td>
 				<td>
-					${order.payMethodName}-${order.payChannelName}
+					${benefit.orderEntity.payChannelName}
 				</td>
 				<td>
-					<c:if test="${order.payStatus eq '0'}">待支付</c:if>
-					<c:if test="${order.payStatus eq '1'}">支付中</c:if>
-					<c:if test="${order.payStatus eq '2'}">已支付</c:if>
-					<c:if test="${order.payStatus eq '3'}">逾期取消</c:if>
-					<c:if test="${order.payStatus eq '4'}">支付失败</c:if>
+					<c:if test="${benefit.orderEntity.payStatus eq '0'}">待支付</c:if>
+					<c:if test="${benefit.orderEntity.payStatus eq '1'}">支付中</c:if>
+					<c:if test="${benefit.orderEntity.payStatus eq '2'}">已支付</c:if>
+					<c:if test="${benefit.orderEntity.payStatus eq '3'}">逾期取消</c:if>
+					<c:if test="${benefit.orderEntity.payStatus eq '4'}">支付失败</c:if>
 				</td>
-				<td>${order.amount}</td>
-				<td>${order.benefitAmount}</td>
-				<td>${order.benefitDescribe}</td>
-
+				<td>${benefit.amount}</td>
+				<td>${benefit.orderEntity.benefitAmount}</td>
 			</tr>
 		</c:forEach>
 		</tbody>

src/main/webapp/WEB-INF/views/modules/youka/userForm.jsp

@@ -46,61 +46,48 @@
 				<sys:ckfinder input="nameImage" type="images" uploadPath="/photo" selectMultiple="false" maxWidth="100" maxHeight="100"/>
 			</div>
 		</div>
-
-		<div class="control-group">
-			<label class="control-label">来源:</label>
-			<div class="controls">
-				<form:select path="belongTo" cssStyle="width: 100px">
-					<form:option value="B">
-						佰邦达
-					</form:option>
-					<form:option value="S">
-						盛世互通
-					</form:option>
-					<%--<form:option value="B">--%>
-					<%--钻石会员--%>
-					<%--</form:option>--%>
-					<%--<form:option value="C">--%>
-					<%--黄金会员--%>
-					<%--</form:option>--%>
-					<%--<form:option value="D">--%>
-					<%--白银会员--%>
-					<%--</form:option>--%>
-					<%--<form:option value="E">--%>
-					<%--青铜会员--%>
-					<%--</form:option>--%>
-				</form:select>
+		<c:if test="${empty userLevel}">
+			<div class="control-group">
+				<label class="control-label">来源:</label>
+				<div class="controls">
+					<form:select path="belongTo" cssStyle="width: 100px">
+						<form:option value="B">
+							佰邦达
+						</form:option>
+						<form:option value="S">
+							盛世互通
+						</form:option>
+					</form:select>
+				</div>
 			</div>
-		</div>
+		</c:if>
+
 		<div class="control-group">
 			<label class="control-label">用户类型:</label>
 			<div class="controls">
 				<form:select path="level" cssStyle="width: 100px">
-					<%--<form:option value="S">--%>
-						<%--管理员--%>
-					<%--</form:option>--%>
-					<form:option value="A">
-						王者会员
-					</form:option>
-					<%--<form:option value="B">--%>
-						<%--钻石会员--%>
-					<%--</form:option>--%>
-					<%--<form:option value="C">--%>
-						<%--黄金会员--%>
-					<%--</form:option>--%>
-					<%--<form:option value="D">--%>
-						<%--白银会员--%>
-					<%--</form:option>--%>
-					<%--<form:option value="E">--%>
-						<%--青铜会员--%>
-					<%--</form:option>--%>
+					<c:if test="${empty userLevel}">
+						<form:option value="A">
+							王者会员
+						</form:option>
+					</c:if>
+					<c:if test="${userLevel=='A'}" >
+						<form:option value="B">
+							钻石会员
+						</form:option>
+					</c:if>
+					<c:if test="${userLevel=='B'}" >
+						<form:option value="E">
+							青铜会员
+						</form:option>
+					</c:if>
 				</form:select>
 			</div>
 		</div>
 		<div class="control-group">
 			<label class="control-label">手机号:</label>
 			<div class="controls">
-                <form:input path="mobile"  htmlEscape="false" maxlength="50" class="input-medium required" />
+                <form:input path="mobile" type="number"  htmlEscape="false" maxlength="50" class="input-medium required" />
 			</div>
 		</div>
 		<div class="control-group">
@@ -112,7 +99,7 @@
 		</div>
 
 		<div class="form-actions">
-			<shiro:hasPermission name="sys:user:edit"><input id="btnSubmit" class="btn btn-primary" type="submit" value="保 存"/>&nbsp;</shiro:hasPermission>
+			<input id="btnSubmit" class="btn btn-primary" type="submit" value="保 存"/>&nbsp;
 			<input id="btnCancel" class="btn" type="button" value="返 回" onclick="history.go(-1)"/>
 
 			<%--<div>--%>

src/main/webapp/WEB-INF/views/modules/youka/userList.jsp

@@ -121,11 +121,22 @@
 					<c:if test="${user.status eq '1'}">审核中</c:if>
 					<c:if test="${user.status eq '2'}">已实名</c:if>
 					<c:if test="${user.status eq '3'}">审核失败</c:if>
+					<c:if test="${user.status eq '5'}">后台添加高级别用户</c:if>
 				</td>
 				<td>${user.mobile}</td>
 				<td>
-					<c:if test="${user.belongTo eq 'B'}">佰邦达</c:if>
-					<c:if test="${user.belongTo eq 'S'}">盛世互通</c:if>
+
+					<c:choose>
+
+						<c:when test="${user.belongTo eq 'B'}"> 佰邦达
+						</c:when>
+						<c:when test="${user.belongTo eq 'S'}"> 盛世互通
+						</c:when>
+						<c:otherwise>  ${user.belongTo}
+						</c:otherwise>
+					</c:choose>
+					<%--<c:if test="${user.belongTo eq 'B'}">佰邦达</c:if>--%>
+					<%--<c:if test="${user.belongTo eq 'S'}">盛世互通</c:if>--%>
 				</td><%--
 				<td>${user.roleNames}</td> --%>
 				<shiro:hasPermission name="youka:rate:save"><td>
@@ -133,7 +144,7 @@
 					<a href="${ctx}/youka/user/real/name/audit?id=${user.id}" >审核</a>
 					<a href="${ctx}/youka/user/form?id=${user.id}">禁用</a>
 					<a href="${ctx}/youka/benefit/list?userCode=${user.code}">账户明细</a>
-					<a href="${ctx}/youka/user/form?id=${user.id}" onclick="return confirmx('确认要删除该用户吗？', this.href)">删除</a>
+					<%--<a href="${ctx}/youka/user/form?id=${user.id}" onclick="return confirmx('确认要删除该用户吗？', this.href)">删除</a>--%>
 				</td></shiro:hasPermission>
 			</tr>
 		</c:forEach>