新增申请成为分销员接口12

jyy

2021-03-15 b539251951250a16859d3ef42441de1052b37890

新增申请成为分销员接口12

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

@@ -6,7 +6,7 @@
import com.matrix.system.fenxiao.entity.ShopSalesmanOrder;
import com.matrix.system.shopXcx.api.dto.SaleOrderDto;
import com.matrix.system.shopXcx.vo.SalesOrderVo;
import io.lettuce.core.dynamic.annotation.Param;
import org.apache.ibatis.annotations.Param;

/**
 * @description 分销订单
@@ -21,6 +21,6 @@
     * @param saleOrderDto
     * @return
     */
    IPage<SalesOrderVo> selectSalesManOrder(Page<SalesOrderVo> page, @Param("record") SaleOrderDto saleOrderDto);
    IPage<SalesOrderVo> selectSalesManOrder(Page<SalesOrderVo> page,  @Param("record")SaleOrderDto saleOrderDto);

}

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

@@ -18,6 +18,7 @@
import io.swagger.annotations.ApiResponse;
import io.swagger.annotations.ApiResponses;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
@@ -52,15 +53,15 @@
    private ShopSalesmanOrderDao shopSalesmanOrderDao;


    @ApiOperation(value = "获取下级列表", notes = "keywords=1 推广订单，keywords=2 邀请订单")
    @ApiOperation(value = "获取推广订单", notes = "keywords=1 推广订单，keywords=2 邀请订单")
    @PostMapping(value = "/getOrderList")
    @ApiResponses({
            @ApiResponse(code = 200, message = "ok", response = SalesOrderVo.class)
    })
    AjaxResult getInvitationuserList(@RequestBody SaleOrderDto saleOrderDto) {
    AjaxResult getInvitationuserList(@RequestBody @Validated SaleOrderDto saleOrderDto) {
        BizUser loginUser = redisUserLoginUtils.getLoginUser(BizUser.class);
        Page<SalesOrderVo> page=new Page<>(saleOrderDto.getPageNum(),saleOrderDto.getPageSize());
        if(StringUtils.isNotBlank(saleOrderDto.getSort())){
        if(StringUtils.isBlank(saleOrderDto.getSort())){
            saleOrderDto.setSort("create_time");
            saleOrderDto.setOrder("desc");
        }

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

@@ -5,6 +5,7 @@
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import javax.validation.constraints.NotNull;
import java.util.Date;

@Data
@@ -34,6 +35,7 @@
    @ApiModelProperty(value = "订单金额")
    private Double  orderMoney;


    @ApiModelProperty(value = " 收益类型1，推广收益，2邀请收益")
    private Integer  revenueType;


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

@@ -55,10 +55,12 @@
        where
            a.sales_user_id=#{record.userId}
            and    a.revenue_type=#{record.revenueType}
        <if test="orderStatus!=null" >
        <if test="record.orderStatus!=null" >
            and a.order_status=#{record.orderStatus}
        </if>
        order by #{record.sort} #{record.order}
        <if test="record.sort!=null and record.order!=null" >
        order by ${record.sort} ${record.order}
        </if>

    </select>