czg_team
/
cashier-client
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

配置测试环境支付成功回调

This commit is contained in:
谭凯凯 2024-10-12 16:00:06 +08:00 committed by Tankaikai
parent e720fc7b15
commit 5781ed9c13
1 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/main/java/com/chaozhanggui/system/cashierservice/service/PayService.java
View File

@ -150,7 +150,7 @@ public class PayService {
mpShopTableMapper.update(null, new LambdaUpdateWrapper<TbShopTable>()
.eq(TbShopTable::getQrcode, orderInfo.getTableId())
.set(TbShopTable::getStatus, TableStateEnum.IDLE.getState()));
}else {
} else {
mpShopTableMapper.update(null, new LambdaUpdateWrapper<TbShopTable>()
.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();