会员积分代码提交
This commit is contained in:
parent
e53e9fc7f6
commit
7eae3c6f68
|
|
@ -5,10 +5,7 @@ import com.czg.account.vo.HandoverTotalVo;
|
||||||
import com.czg.log.annotation.OperationLog;
|
import com.czg.log.annotation.OperationLog;
|
||||||
import com.czg.resp.CzgResult;
|
import com.czg.resp.CzgResult;
|
||||||
import lombok.AllArgsConstructor;
|
import lombok.AllArgsConstructor;
|
||||||
import org.springframework.web.bind.annotation.GetMapping;
|
import org.springframework.web.bind.annotation.*;
|
||||||
import org.springframework.web.bind.annotation.PostMapping;
|
|
||||||
import org.springframework.web.bind.annotation.RequestMapping;
|
|
||||||
import org.springframework.web.bind.annotation.RestController;
|
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
@ -37,13 +34,16 @@ public class HandoverRecordController {
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 收银机-交班/关班
|
* 收银机-交班/关班
|
||||||
|
* @param isPrint 是否打印交班小票
|
||||||
*/
|
*/
|
||||||
@PostMapping("handover")
|
@PostMapping("handover")
|
||||||
@OperationLog("收银机-交班/关班")
|
@OperationLog("收银机-交班/关班")
|
||||||
//@SaAdminCheckPermission("handoverRecord:handover")
|
//@SaAdminCheckPermission("handoverRecord:handover")
|
||||||
public CzgResult<Void> handover() {
|
public CzgResult<Void> handover(@RequestParam Integer isPrint) {
|
||||||
Long id = handoverRecordService.handover();
|
Long id = handoverRecordService.handover();
|
||||||
// TODO 后续需要发生mq消息给打印机
|
if (isPrint == 1) {
|
||||||
|
// TODO 后续需要发生mq消息给打印机
|
||||||
|
}
|
||||||
return CzgResult.success();
|
return CzgResult.success();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -27,7 +27,6 @@ import com.czg.validator.ValidatorUtil;
|
||||||
import com.czg.validator.group.DefaultGroup;
|
import com.czg.validator.group.DefaultGroup;
|
||||||
import com.czg.validator.group.InsertGroup;
|
import com.czg.validator.group.InsertGroup;
|
||||||
import com.mybatisflex.core.paginate.Page;
|
import com.mybatisflex.core.paginate.Page;
|
||||||
import com.mybatisflex.core.query.QueryColumn;
|
|
||||||
import com.mybatisflex.core.query.QueryWrapper;
|
import com.mybatisflex.core.query.QueryWrapper;
|
||||||
import com.mybatisflex.spring.service.impl.ServiceImpl;
|
import com.mybatisflex.spring.service.impl.ServiceImpl;
|
||||||
import jakarta.servlet.http.HttpServletRequest;
|
import jakarta.servlet.http.HttpServletRequest;
|
||||||
|
|
@ -442,7 +441,7 @@ public class PointsExchangeRecordServiceImpl extends ServiceImpl<PointsExchangeR
|
||||||
@Override
|
@Override
|
||||||
public PointsExchangeSummaryVo total(PointsExchangeRecordParam param) {
|
public PointsExchangeSummaryVo total(PointsExchangeRecordParam param) {
|
||||||
QueryWrapper queryWrapper = buildQueryWrapper(param);
|
QueryWrapper queryWrapper = buildQueryWrapper(param);
|
||||||
queryWrapper.select(new QueryColumn("count(*) as count"), new QueryColumn("sum(extra_payment_amount) as totalAmount"));
|
queryWrapper.select("count(*) as count,sum(extra_payment_amount) as totalAmount");
|
||||||
PointsExchangeRecord summary = super.getOne(queryWrapper);
|
PointsExchangeRecord summary = super.getOne(queryWrapper);
|
||||||
PointsExchangeSummaryVo result = new PointsExchangeSummaryVo();
|
PointsExchangeSummaryVo result = new PointsExchangeSummaryVo();
|
||||||
result.setCount(summary.getCount());
|
result.setCount(summary.getCount());
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue