Merge remote-tracking branch 'origin/score_shop' into score_shop

xiaoyong931011

2021-03-11 7387cb3e2f9e8b588c7be30b129faeee4050034d

Merge remote-tracking branch 'origin/score_shop' into score_shop

# Conflicts:
#	zq-erp/src/main/java/com/matrix/system/fenxiao/dao/ShopSalesmanApplyDao.java

 zq-erp/src/main/java/com/matrix/system/fenxiao/dao/ShopSalesmanApplyDao.java

@@ -1,10 +1,7 @@
package com.matrix.system.fenxiao.dao;

import java.util.List;

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.matrix.system.fenxiao.entity.ShopSalesmanApply;
import com.matrix.system.fenxiao.vo.ShopSalesmanApplyVo;

/**
 * @description 推广员申请记录
@@ -15,4 +12,6 @@

    List<ShopSalesmanApplyVo> selectFenXiaoUserApplyByCompanyId(@Param("companyId")Long companyId);

    IPage<SalesmanVo> selectInvitationuserInPage(Page<SalesmanVo> page, @Param("openId") String openId);

}

 zq-erp/src/main/java/com/matrix/system/fenxiao/service/ShopSalesmanApplyService.java

@@ -62,7 +62,7 @@
                checkApply.getApplyStatus()==ShopSalesmanApply.APPLY_STATUS_WTG){

            ShopSalesmanApply shopSalesmanApply=new ShopSalesmanApply();
            shopSalesmanApply.setUserId(loginUser.getUserId());
            shopSalesmanApply.setUserId(openId);
            shopSalesmanApply.setCreateBy(loginUser.getNickName());
            shopSalesmanApply.setApplyWay(ShopSalesmanApply.APPLY_WAY_SELF);


 zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/WxSalesmanAction.java

@@ -1,6 +1,8 @@
package com.matrix.system.shopXcx.api.action;

import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.matrix.biz.bean.BizUser;
import com.matrix.biz.dao.BizUserDao;
import com.matrix.component.redis.RedisUserLoginUtils;
@@ -11,6 +13,7 @@
import com.matrix.core.tools.MD5Util;
import com.matrix.core.tools.PropertiesUtil;
import com.matrix.core.tools.StringUtils;
import com.matrix.system.app.dto.BasePageDto;
import com.matrix.system.common.bean.BusParameterSettings;
import com.matrix.system.common.constance.AppConstance;
import com.matrix.system.common.dao.BusParameterSettingsDao;
@@ -20,6 +23,7 @@
import com.matrix.system.fenxiao.entity.ShopSalesmanApply;
import com.matrix.system.fenxiao.service.ShopSalesmanApplyService;
import com.matrix.system.shopXcx.api.WeChatApiTools;
import com.matrix.system.shopXcx.vo.SalesmanVo;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiResponse;
@@ -195,6 +199,19 @@



    @ApiOperation(value = "获取下级列表", notes = "")
    @PostMapping(value = "/getInvitationuserList")
    @ApiResponses({
            @ApiResponse(code = 200, message = "ok", response = BasePageDto.class)
    })
    AjaxResult getInvitationuserList(@RequestBody BasePageDto pageDto) {
        BizUser loginUser = redisUserLoginUtils.getLoginUser(BizUser.class);
        Page<SalesmanVo> page=new Page<>(pageDto.getPageNum(),pageDto.getPageSize());
        IPage<SalesmanVo> shopSalesmanApplyIPage = salesmanApplyDao.selectInvitationuserInPage(page, loginUser.getOpenId());
        AjaxResult result=AjaxResult.buildSuccessInstance(shopSalesmanApplyIPage.getRecords());
        return result;

    }




 zq-erp/src/main/java/com/matrix/system/shopXcx/vo/SalesmanVo.java

New file
@@ -0,0 +1,31 @@
package com.matrix.system.shopXcx.vo;

import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

@Data
@ApiModel(value = "SalesmanVo", description = " 销售员信息返回参数类")
public class SalesmanVo {

    @ApiModelProperty(value = "昵称")
    private String nickName;


    @ApiModelProperty(value = "头像")
    private String avatarUrl;


    @ApiModelProperty(value = "手机号码")
    private String  phoneNumber;

    @ApiModelProperty(value = "贡献订单数")
    private String  orderCount;


    @ApiModelProperty(value = "贡献收益")
    private Double   revenueAmount;



}

 zq-erp/src/main/resources/mybatis/mapper/fenxiao/ShopSalesmanApplyDao.xml

@@ -34,4 +34,27 @@
            <result property="companyId" column="company_id" />
    </resultMap>

    <select id="selectInvitationuserInPage" resultType="com.matrix.system.shopXcx.vo.SalesmanVo">
        SELECT
            a.nick_name,
            a.avatar_url,
            a.phone_number,
            (
                SELECT
                    IFNULL(sum(IFNULL( b.amount, 0 )),0)
                FROM
                    shop_salesman_order b
                WHERE
                    b.user_id = a.open_id
                  AND b.sales_user_id = #{openId}
            ) AS revenueAmount,
            ( SELECT count( * ) FROM shop_salesman_order c WHERE c.user_id = a.open_id AND c.sales_user_id = #{openId} ) AS orderCount
        FROM
            biz_user a
        WHERE
            a.parent_open_id = #{openId}
          AND a.is_sales = 1
    </select>


</mapper>

 zq-erp/src/test/java/com/matrix/SourceFlowTests.java

@@ -1,11 +1,12 @@
package com.matrix;

import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.matrix.core.tools.StringUtils;
import com.matrix.system.constance.Dictionary;
import com.matrix.system.fenxiao.dao.ShopSalesmanApplyDao;
import com.matrix.system.hive.bean.*;
import com.matrix.system.hive.dao.*;
import com.matrix.system.hive.service.CodeService;
import com.matrix.system.hive.service.SysOrderService;
import com.matrix.system.shopXcx.vo.SalesmanVo;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.springframework.beans.factory.annotation.Autowired;
@@ -171,4 +172,13 @@
        }
    }

    @Autowired
    private ShopSalesmanApplyDao salesmanApplyDao;

    @Test
    public void inPageTest() {
        Page<SalesmanVo> page = new Page<>(1, 10);
        salesmanApplyDao.selectInvitationuserInPage(page, "oLdgp47g7SXJnmti1iDzQaJpXNz4");
    }

}