新增赠送项目是否计算消耗控制

jyy

2021-06-12 393d296e43f0e5f11e524cab5446bcd3eee94e89

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

@@ -2,8 +2,8 @@

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.system.hive.bean.SysVipInfo;
import com.matrix.system.hive.dao.SysVipInfoDao;
import com.matrix.component.redis.RedisUserLoginUtils;
import com.matrix.core.pojo.AjaxResult;
import com.matrix.core.tools.StringUtils;
@@ -47,7 +47,7 @@
    private RedisUserLoginUtils redisUserLoginUtils;

    @Autowired
    private BizUserDao bizUserDao;
    private SysVipInfoDao sysVipInfoDao;

    @Autowired
    private ShopSalesmanOrderDao shopSalesmanOrderDao;
@@ -59,13 +59,13 @@
            @ApiResponse(code = 200, message = "ok", response = SalesOrderVo.class)
    })
    AjaxResult getInvitationuserList(@RequestBody @Validated SaleOrderDto saleOrderDto) {
        BizUser loginUser = redisUserLoginUtils.getLoginUser(BizUser.class);
        SysVipInfo loginUser = redisUserLoginUtils.getLoginUser(SysVipInfo.class);
        Page<SalesOrderVo> page=new Page<>(saleOrderDto.getPageNum(),saleOrderDto.getPageSize());
        if(StringUtils.isBlank(saleOrderDto.getSort())){
            saleOrderDto.setSort("create_time");
            saleOrderDto.setOrder("desc");
        }
        saleOrderDto.setUserId(loginUser.getOpenId());
        saleOrderDto.setUserId(loginUser.getId());
        IPage<SalesOrderVo> shopSalesmanApplyIPage = shopSalesmanOrderDao.selectSalesManOrder(page,  saleOrderDto);
        AjaxResult result=AjaxResult.buildSuccessInstance(shopSalesmanApplyIPage.getRecords());
        return result;