diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/service/PayService.java b/src/main/java/com/chaozhanggui/system/cashierservice/service/PayService.java index 8ea479a..be57cb8 100644 --- a/src/main/java/com/chaozhanggui/system/cashierservice/service/PayService.java +++ b/src/main/java/com/chaozhanggui/system/cashierservice/service/PayService.java @@ -150,7 +150,7 @@ public class PayService { mpShopTableMapper.update(null, new LambdaUpdateWrapper() .eq(TbShopTable::getQrcode, orderInfo.getTableId()) .set(TbShopTable::getStatus, TableStateEnum.IDLE.getState())); - }else { + } else { mpShopTableMapper.update(null, new LambdaUpdateWrapper() .eq(TbShopTable::getQrcode, orderInfo.getTableId()) .set(TbShopTable::getStatus, TableStateEnum.CLEANING.getState())); @@ -1900,6 +1900,19 @@ public class PayService { return "QR" + date + randomNum; } + /** + * {"userId":"ojC-S6iKBL7sHUb-E0UYq-Q1J4AA","shopId":"11","payType":"WECHAT","payAmount":"0.01","remark":"","orderId":"5835"} + * + * @param ip + * @param userId + * @param payType + * @param shopId + * @param orderId + * @param amount + * @param remark + * @return + * @throws JsonProcessingException + */ public Result createOrder(String ip, String userId, String payType, String shopId, String orderId, BigDecimal amount, String remark) throws JsonProcessingException { @@ -1922,11 +1935,11 @@ public class PayService { if (ObjectUtil.isNull(orderInfo)) { return Result.fail(CodeEnum.ORDERNOEXIST); } + orderInfo.setDiscountAmount(orderInfo.getOrderAmount().subtract(amount)); if (StrUtil.isNotBlank(remark)) { - orderInfo.setDiscountAmount(orderInfo.getOrderAmount().subtract(amount)); orderInfo.setRemark(remark); - tbOrderInfoMapper.updateByPrimaryKey(orderInfo); } + tbOrderInfoMapper.updateByPrimaryKey(orderInfo); } else { orderInfo = new TbOrderInfo();