添加打印机取餐码
This commit is contained in:
parent
117fd0dbd2
commit
4d7e6c3650
|
|
@ -35,4 +35,6 @@ public class OrderVo {
|
||||||
|
|
||||||
private BigDecimal totalNumber;
|
private BigDecimal totalNumber;
|
||||||
|
|
||||||
|
private String outNumber;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -428,7 +428,25 @@ public class CartService {
|
||||||
orderInfo.setIsBuyCoupon(isBuyYhq);
|
orderInfo.setIsBuyCoupon(isBuyYhq);
|
||||||
orderInfo.setIsUseCoupon(isuseYhq);
|
orderInfo.setIsUseCoupon(isuseYhq);
|
||||||
orderInfo.setUserCouponAmount(couponAmount);
|
orderInfo.setUserCouponAmount(couponAmount);
|
||||||
// orderInfo.setRemark(StringUtils.isBlank(jsonObject.getString("remark"))?"":jsonObject.getString("remark"));
|
|
||||||
|
JSONObject object=new JSONObject();
|
||||||
|
String outNumber= redisUtil.getMessage(RedisCst.OUT_NUMBER.concat(jsonObject.getString("shopId")));
|
||||||
|
Integer number=1;
|
||||||
|
if(Objects.isNull(outNumber)){
|
||||||
|
object.put("outNumber",number);
|
||||||
|
object.put("times",DateUtils.getDay());
|
||||||
|
}else {
|
||||||
|
object=JSONObject.parseObject(outNumber);
|
||||||
|
if(object.getString("times").equals(DateUtils.getDay())){
|
||||||
|
number=object.getInteger("outNumber")+1;
|
||||||
|
object.put("outNumber",number);
|
||||||
|
}else {
|
||||||
|
object.put("outNumber",number);
|
||||||
|
object.put("times",DateUtils.getDay());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
orderInfo.setOutNumber(number+"");
|
||||||
|
redisUtil.saveMessage(RedisCst.OUT_NUMBER.concat(jsonObject.getString("shopId")),object.toString());
|
||||||
orderInfoMapper.insert(orderInfo);
|
orderInfoMapper.insert(orderInfo);
|
||||||
orderId = orderInfo.getId();
|
orderId = orderInfo.getId();
|
||||||
}
|
}
|
||||||
|
|
@ -718,6 +736,27 @@ public class CartService {
|
||||||
orderInfo.setIsBuyCoupon(isBuyYhq);
|
orderInfo.setIsBuyCoupon(isBuyYhq);
|
||||||
orderInfo.setIsUseCoupon(isuseYhq);
|
orderInfo.setIsUseCoupon(isuseYhq);
|
||||||
orderInfo.setUserCouponAmount(couponAmount);
|
orderInfo.setUserCouponAmount(couponAmount);
|
||||||
|
|
||||||
|
JSONObject object=new JSONObject();
|
||||||
|
String outNumber= redisUtil.getMessage(RedisCst.OUT_NUMBER.concat(jsonObject.getString("shopId")));
|
||||||
|
Integer number=1;
|
||||||
|
if(Objects.isNull(outNumber)){
|
||||||
|
object.put("outNumber",number);
|
||||||
|
object.put("times",DateUtils.getDay());
|
||||||
|
}else {
|
||||||
|
object=JSONObject.parseObject(outNumber);
|
||||||
|
if(object.getString("times").equals(DateUtils.getDay())){
|
||||||
|
number=object.getInteger("outNumber")+1;
|
||||||
|
object.put("outNumber",number);
|
||||||
|
}else {
|
||||||
|
object.put("outNumber",number);
|
||||||
|
object.put("times",DateUtils.getDay());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
orderInfo.setOutNumber(number+"");
|
||||||
|
redisUtil.saveMessage(RedisCst.OUT_NUMBER.concat(jsonObject.getString("shopId")),object.toString());
|
||||||
|
|
||||||
|
|
||||||
orderInfoMapper.insert(orderInfo);
|
orderInfoMapper.insert(orderInfo);
|
||||||
orderId = orderInfo.getId();
|
orderId = orderInfo.getId();
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -207,6 +207,7 @@ public class OrderService {
|
||||||
orderVo.setOrderType(orderInfo.getOrderType());
|
orderVo.setOrderType(orderInfo.getOrderType());
|
||||||
orderVo.setOrderId(orderInfo.getId());
|
orderVo.setOrderId(orderInfo.getId());
|
||||||
orderVo.setSendType(orderInfo.getSendType());
|
orderVo.setSendType(orderInfo.getSendType());
|
||||||
|
orderVo.setOutNumber(orderInfo.getOutNumber());
|
||||||
|
|
||||||
return Result.success(CodeEnum.ENCRYPT, orderVo);
|
return Result.success(CodeEnum.ENCRYPT, orderVo);
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue