1.代客下单 打印菜品小票
This commit is contained in:
@@ -594,6 +594,7 @@ public class OrderService {
|
|||||||
orderInfo.setProductAmount(saleAmount);
|
orderInfo.setProductAmount(saleAmount);
|
||||||
orderInfo.setTradeDay(DateUtils.getDay());
|
orderInfo.setTradeDay(DateUtils.getDay());
|
||||||
orderInfo.setUserId(orderVo.getUserId());
|
orderInfo.setUserId(orderVo.getUserId());
|
||||||
|
orderInfo.setUseType(StrUtil.isNotBlank(orderVo.getTableId()) ? "postPay" : "afterPay");
|
||||||
tbOrderInfoMapper.updateByPrimaryKeySelective(orderInfo);
|
tbOrderInfoMapper.updateByPrimaryKeySelective(orderInfo);
|
||||||
} else {
|
} else {
|
||||||
orderInfo = new TbOrderInfo(orderNo, totalAmount, packAMount, totalAmount, saleAmount, totalAmount, feeAmount, "",
|
orderInfo = new TbOrderInfo(orderNo, totalAmount, packAMount, totalAmount, saleAmount, totalAmount, feeAmount, "",
|
||||||
@@ -602,9 +603,10 @@ public class OrderService {
|
|||||||
orderInfo.setMasterId(masterId);
|
orderInfo.setMasterId(masterId);
|
||||||
orderInfo.setRemark(orderVo.getRemark());
|
orderInfo.setRemark(orderVo.getRemark());
|
||||||
orderInfo.setUserId(orderVo.getUserId());
|
orderInfo.setUserId(orderVo.getUserId());
|
||||||
|
orderInfo.setUseType(StrUtil.isNotBlank(orderVo.getTableId()) ? "postPay" : "afterPay");
|
||||||
|
|
||||||
if (StrUtil.isNotBlank(orderVo.getTableId())) {
|
if (StrUtil.isNotBlank(orderVo.getTableId())) {
|
||||||
orderInfo.setTableId(orderVo.getTableId());
|
orderInfo.setTableId(orderVo.getTableId());
|
||||||
orderInfo.setUseType("postPay");
|
|
||||||
}
|
}
|
||||||
if (Objects.nonNull(tbToken)){
|
if (Objects.nonNull(tbToken)){
|
||||||
orderInfo.setTokenId(tbToken.getId());
|
orderInfo.setTokenId(tbToken.getId());
|
||||||
|
|||||||
@@ -520,6 +520,10 @@
|
|||||||
<if test="staffId != null and staffId!=''">
|
<if test="staffId != null and staffId!=''">
|
||||||
staff_id = #{staffId,jdbcType=INTEGER},
|
staff_id = #{staffId,jdbcType=INTEGER},
|
||||||
</if>
|
</if>
|
||||||
|
|
||||||
|
<if test="useType != null and useType!=''">
|
||||||
|
use_type = #{useType,jdbcType=VARCHAR},
|
||||||
|
</if>
|
||||||
</set>
|
</set>
|
||||||
where id = #{id,jdbcType=INTEGER}
|
where id = #{id,jdbcType=INTEGER}
|
||||||
</update>
|
</update>
|
||||||
|
|||||||
Reference in New Issue
Block a user