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

支付订单增加remark字段

This commit is contained in:
yijiegong 2024-09-19 13:44:56 +08:00
parent f768f7f473
commit 1ad6aa3de7
3 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/chaozhanggui/system/cashierservice/controller/PayController.java
View File

@ -293,7 +293,7 @@ public class PayController {
public Result createOrder(HttpServletRequest request, @RequestBody PaymentReq paymentReq) {
try {
return payService.createOrder(IpUtil.getIpAddr(request), paymentReq.getUserId(), paymentReq.getPayType(),
paymentReq.getShopId(), paymentReq.getOrderId(), paymentReq.getPayAmount());
paymentReq.getShopId(), paymentReq.getOrderId(), paymentReq.getPayAmount(), paymentReq.getRemark());
} catch (JsonProcessingException e) {
e.printStackTrace();
}

2
src/main/java/com/chaozhanggui/system/cashierservice/model/PaymentReq.java
View File

@ -27,4 +27,6 @@ public class PaymentReq implements Serializable {
private String userId;
private String shopId;
private String remark;
}

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

@ -1854,7 +1854,8 @@ public class PayService {
return "QR" + date + randomNum;
}
public Result createOrder(String ip, String userId, String payType, String shopId, String orderId, BigDecimal amount) throws JsonProcessingException {
public Result createOrder(String ip, String userId, String payType, String shopId, String orderId,
BigDecimal amount, String remark) throws JsonProcessingException {
if (ObjectUtil.isNull(userId) || ObjectUtil.isEmpty(userId) || ObjectUtil.isEmpty(payType) ||
ObjectUtil.isNull(payType) || ObjectUtil.isNull(shopId) || ObjectUtil.isEmpty(shopId) ||
@ -1872,6 +1873,13 @@ public class PayService {
if (StrUtil.isNotBlank(orderId)) {
orderInfo = tbOrderInfoMapper.selectByPrimaryKey(Integer.valueOf(orderId));
if (ObjectUtil.isNull(orderInfo)) {
return Result.fail(CodeEnum.ORDERNOEXIST);
}
if (StrUtil.isNotBlank(remark)) {
orderInfo.setRemark(remark);
tbOrderInfoMapper.updateByPrimaryKey(orderInfo);
}
} else {
orderInfo = new TbOrderInfo();
@ -1895,11 +1903,11 @@ public class PayService {
orderInfo.setCreatedAt(System.currentTimeMillis());
orderInfo.setIsAccepted(Byte.valueOf("1"));
orderInfo.setTradeDay(DateUtils.getDay());
orderInfo.setRemark(remark);
tbOrderInfoMapper.insert(orderInfo);
}
TbOrderPayment payment = tbOrderPaymentMapper.selectByOrderId(orderInfo.getId().toString());
if (ObjectUtil.isEmpty(payment) || payment == null) {
payment = new TbOrderPayment();