20220505

xiaoyong931011

2022-05-05 3d50da1d07327b6038084482c46617e03d344b2c

20220505

 zq-erp/src/main/java/com/matrix/system/padApi/action/PadOrderAction.java

@@ -187,7 +187,7 @@

    @ApiOperation(value = "获取用户的可用充值卡", notes = "获取用户的可用充值卡")
    @GetMapping(value = "getUseMoneyCard/{vipId}")
    public AjaxResult getUseMoneyCard(Long vipId) {
    public AjaxResult getUseMoneyCard(@PathVariable Long vipId) {
        MoneyCardUse moneyCardUse = new MoneyCardUse();
        moneyCardUse.setVipId(vipId);
        moneyCardUse.setStatus(Dictionary.MONEYCARD_STATUS_YX);

 zq-erp/src/main/java/com/matrix/system/padApi/action/PadVipAction.java

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

import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.matrix.component.asyncmessage.AsyncMessageManager;
import com.matrix.core.constance.MatrixConstance;
import com.matrix.core.pojo.AjaxResult;
@@ -15,21 +17,23 @@
import com.matrix.system.constance.Dictionary;
import com.matrix.system.hive.action.BaseController;
import com.matrix.system.hive.action.util.QueryUtil;
import com.matrix.system.hive.bean.SysOrder;
import com.matrix.system.hive.bean.SysShopInfo;
import com.matrix.system.hive.bean.SysVipInfo;
import com.matrix.system.hive.bean.SysVipLevel;
import com.matrix.system.hive.dao.MoneyCardUseDao;
import com.matrix.system.hive.dao.ShoppingGoodsDao;
import com.matrix.system.hive.dao.SysVipLabelDao;
import com.matrix.system.hive.bean.*;
import com.matrix.system.hive.dao.*;
import com.matrix.system.hive.pojo.CzXkVo;
import com.matrix.system.hive.service.*;
import com.matrix.system.padApi.dto.PadProjectDto;
import com.matrix.system.padApi.dto.PadSkinDto;
import com.matrix.system.padApi.dto.PadVipListDto;
import com.matrix.system.score.dao.ScoreUseRecordDao;
import com.matrix.system.score.dao.ScoreVipDetailDao;
import com.matrix.system.shopXcx.api.dto.ScoreFlowDto;
import com.matrix.system.shopXcx.api.vo.ScoreUseRecordVo;
import com.matrix.system.shopXcx.mqTask.AsyncMessageRouting;
import com.matrix.system.wechart.templateMsg.UniformMsgParam;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
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.*;
@@ -157,6 +161,69 @@
        }
    }

    @Resource
    private SysProjUseService projUseService;

    @ApiOperation(value = "项目使用情况", notes = "")
    @PostMapping(value = "/projectList")
    public AjaxResult showTc(@RequestBody PadProjectDto padProjectDto) {

        int offset = (padProjectDto.getPageNum() - 1) * padProjectDto.getPageSize();
        int limit = padProjectDto.getPageSize();
        PaginationVO pageVo = new PaginationVO();
        pageVo.setOffset(offset);
        pageVo.setLimit(limit);

        SysProjUse sysProjUse = new SysProjUse();
        sysProjUse.setType(Dictionary.SHOPPING_GOODS_TYPE_XM);
        sysProjUse.setTaocanId(-1L);
        return new AjaxResult(AjaxResult.STATUS_SUCCESS,
                projUseService.findInPage(sysProjUse, pageVo), projUseService.findTotal(sysProjUse));
    }


    @Autowired
    private SysVipInfoDao sysVipInfoDao;

    @Autowired
    private ScoreUseRecordDao scoreUseRecordDao;

    @ApiOperation(value = "积分流水记录", notes = "")
    @PostMapping(value = "/flowList")
    @ApiResponses({
            @ApiResponse(code = 200, message = "ok", response = ScoreUseRecordVo.class)
    })
    public AjaxResult getFlowList(@RequestBody ScoreFlowDto scoreFlowDto) {
        SysVipInfo vipInfo = sysVipInfoDao.selectById(scoreFlowDto.getVipId());
        scoreFlowDto.setVipId(vipInfo.getId());
        Page<ScoreUseRecordVo> page=new Page<>(scoreFlowDto.getPageNum(),scoreFlowDto.getPageSize());
        IPage<ScoreUseRecordVo> shopScoreRecord = scoreUseRecordDao.selectFlowList(page,scoreFlowDto);
        AjaxResult result=AjaxResult.buildSuccessInstance(shopScoreRecord.getRecords(),shopScoreRecord.getTotal());
        return result;
    }



    @Autowired
    private SysSkinCheckRecordDao sysSkinCheckRecordDao;

    @ApiOperation(value = "皮肤检测记录", notes = "")
    @PostMapping(value = "/skinList")
    public @ResponseBody AjaxResult showList(@RequestBody PadSkinDto padSkinDto) {

        int offset = (padSkinDto.getPageNum() - 1) * padSkinDto.getPageSize();
        int limit = padSkinDto.getPageSize();
        PaginationVO pageVo = new PaginationVO();
        pageVo.setOffset(offset);
        pageVo.setLimit(limit);

        SysSkinCheckRecord sysSkinCheckRecord = new SysSkinCheckRecord();
        List<SysSkinCheckRecord> dataList = sysSkinCheckRecordDao.selectInPage(sysSkinCheckRecord, pageVo);
        AjaxResult result = new AjaxResult(AjaxResult.STATUS_SUCCESS, dataList,
                sysSkinCheckRecordDao.selectTotalRecord(sysSkinCheckRecord));
        return result;
    }

    /**
     * 充值 查询门店所有员工
     */

 zq-erp/src/main/java/com/matrix/system/padApi/dto/PadProjectDto.java

New file
@@ -0,0 +1,17 @@
package com.matrix.system.padApi.dto;

import com.matrix.system.app.dto.BasePageDto;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

@ApiModel(value = "PadProjectDto", description = "列表接收参数类")
@Data
public class PadProjectDto extends BasePageDto {

    @ApiModelProperty(hidden = true)
    private Long shopId;

    @ApiModelProperty(hidden = true)
    private Long companyId;
}

 zq-erp/src/main/java/com/matrix/system/padApi/dto/PadSkinDto.java

New file
@@ -0,0 +1,17 @@
package com.matrix.system.padApi.dto;

import com.matrix.system.app.dto.BasePageDto;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

@ApiModel(value = "PadSkinDto", description = "列表接收参数类")
@Data
public class PadSkinDto extends BasePageDto {

    @ApiModelProperty(hidden = true)
    private Long shopId;

    @ApiModelProperty(hidden = true)
    private Long companyId;
}

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

@@ -101,13 +101,15 @@
    @Autowired
    private SysOrderItemDao orderItemDao;

    @Resource
    private MoneyCardUseService cardUseService;
    @Test
    public void findOrderById() {
        Long id = 675L;
//        SysUsers user = WebUtil.getSessionAttribute(MatrixConstance.LOGIN_KEY);
        SysOrder order = orderService.findById(id);
        order.setItems(orderItemDao.selectByOrderId(id));
        System.out.println(order);
        Long vipId = 111L;
        MoneyCardUse moneyCardUse = new MoneyCardUse();
        moneyCardUse.setVipId(vipId);
        moneyCardUse.setStatus(Dictionary.MONEYCARD_STATUS_YX);
        List<MoneyCardUse> cards = cardUseService.findByModel(moneyCardUse);
    }
    @Test
    public void testFrist(){