填充员工
This commit is contained in:
@@ -11,6 +11,7 @@ import com.czg.account.entity.*;
|
|||||||
import com.czg.account.service.*;
|
import com.czg.account.service.*;
|
||||||
import com.czg.config.RedisCst;
|
import com.czg.config.RedisCst;
|
||||||
import com.czg.constants.ParamCodeCst;
|
import com.czg.constants.ParamCodeCst;
|
||||||
|
import com.czg.exception.CzgException;
|
||||||
import com.czg.market.service.OrderInfoService;
|
import com.czg.market.service.OrderInfoService;
|
||||||
import com.czg.order.entity.OrderDetail;
|
import com.czg.order.entity.OrderDetail;
|
||||||
import com.czg.order.entity.OrderInfo;
|
import com.czg.order.entity.OrderInfo;
|
||||||
@@ -760,8 +761,10 @@ public abstract class PrinterHandler {
|
|||||||
? orderInfo.getDiscountAllAmount().toPlainString()
|
? orderInfo.getDiscountAllAmount().toPlainString()
|
||||||
: "0.00");
|
: "0.00");
|
||||||
if (orderInfo.getStaffId() != null) {
|
if (orderInfo.getStaffId() != null) {
|
||||||
ShopStaff detail = shopStaffService.detail(orderInfo.getShopId(), orderInfo.getStaffId());
|
ShopStaff detail = shopStaffService.getOne(new QueryWrapper().eq(ShopStaff::getId, orderInfo.getStaffId()).eq(ShopStaff::getShopId, orderInfo.getShopId()));
|
||||||
printInfoDTO.setOperator(detail.getName());
|
if (detail != null) {
|
||||||
|
printInfoDTO.setOperator(detail.getName());
|
||||||
|
}
|
||||||
}
|
}
|
||||||
if ("结算单".equals(printTitle)) {
|
if ("结算单".equals(printTitle)) {
|
||||||
if (StrUtil.isNotBlank(orderInfo.getPayType())) {
|
if (StrUtil.isNotBlank(orderInfo.getPayType())) {
|
||||||
@@ -776,7 +779,7 @@ public abstract class PrinterHandler {
|
|||||||
case "free_pay" -> printInfoDTO.setPayType("霸王餐支付");
|
case "free_pay" -> printInfoDTO.setPayType("霸王餐支付");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
printInfoDTO.setTradeDate(DateUtil.format(orderInfo.getPaidTime(), "yyyy-MM-dd HH:mm:ss"));
|
printInfoDTO.setTradeDate(DateUtil.format(orderInfo.getPaidTime(), "yyyy/MM/dd HH:mm:ss"));
|
||||||
}
|
}
|
||||||
return printInfoDTO;
|
return printInfoDTO;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -324,6 +324,8 @@ public class OrderInfoCustomServiceImpl implements OrderInfoCustomService {
|
|||||||
.eq(CashierCart::getTableCode, param.getTableCode())
|
.eq(CashierCart::getTableCode, param.getTableCode())
|
||||||
);
|
);
|
||||||
if ("after-pay".equals(orderInfo.getPayMode())) {
|
if ("after-pay".equals(orderInfo.getPayMode())) {
|
||||||
|
//
|
||||||
|
log.info("后付费生成订单{},第{}", orderInfo.getId(), orderInfo.getPlaceNum());
|
||||||
printerHandler.orderHandler(orderInfo.getId().toString(), PrinterHandler.PrintTypeEnum.GUEST_ORDER, orderInfo.getPlaceNum());
|
printerHandler.orderHandler(orderInfo.getId().toString(), PrinterHandler.PrintTypeEnum.GUEST_ORDER, orderInfo.getPlaceNum());
|
||||||
//发送打票信息 后付费推送多次 需要处理
|
//发送打票信息 后付费推送多次 需要处理
|
||||||
//orderId_0_0 订单ID_先付后付(1先付0后付)_订单状态 0未完成 1完成
|
//orderId_0_0 订单ID_先付后付(1先付0后付)_订单状态 0未完成 1完成
|
||||||
|
|||||||
Reference in New Issue
Block a user