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

修改店铺二维码收款

Browse Source
This commit is contained in:
yijiegong
2024-09-19 09:54:00 +08:00
parent d7f2d5afc1
commit f768f7f473
3 changed files with 127 additions and 151 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1854,7 +1854,7 @@ public class PayService {
return "QR" + date + randomNum;
}
public Result createOrder(String ip, String userId, String payType, String shopId, BigDecimal amount) throws JsonProcessingException {
public Result createOrder(String ip, String userId, String payType, String shopId, String orderId, BigDecimal amount) throws JsonProcessingException {
if (ObjectUtil.isNull(userId) || ObjectUtil.isEmpty(userId) || ObjectUtil.isEmpty(payType) ||
ObjectUtil.isNull(payType) || ObjectUtil.isNull(shopId) || ObjectUtil.isEmpty(shopId) ||
@@ -1868,31 +1868,36 @@ public class PayService {
return Result.fail(CodeEnum.SHOPINFONOEXIST);
}
TbOrderInfo orderInfo;
TbOrderInfo orderInfo = new TbOrderInfo();
if (StrUtil.isNotBlank(orderId)) {
orderInfo = tbOrderInfoMapper.selectByPrimaryKey(Integer.valueOf(orderId));
} else {
orderInfo = new TbOrderInfo();
String orderNo = generateOrderNumber();
orderInfo.setOrderNo(orderNo);
orderInfo.setSettlementAmount(amount);
orderInfo.setPackFee(BigDecimal.ZERO);
orderInfo.setOriginAmount(amount);
orderInfo.setPayAmount(amount);
orderInfo.setAmount(amount);
orderInfo.setRefundAmount(BigDecimal.ZERO);
orderInfo.setPayType(payType);
orderInfo.setPayAmount(amount);
orderInfo.setOrderAmount(amount);
orderInfo.setSendType("QR");
orderInfo.setStatus("WAIT_PAY");
orderInfo.setMerchantId(shopInfo.getMerchantId());
orderInfo.setShopId(shopId);
orderInfo.setRefundAble(Byte.valueOf("1"));
orderInfo.setSystemTime(System.currentTimeMillis());
orderInfo.setCreatedAt(System.currentTimeMillis());
orderInfo.setIsAccepted(Byte.valueOf("1"));
orderInfo.setTradeDay(DateUtils.getDay());
String orderNo = generateOrderNumber();
orderInfo.setOrderNo(orderNo);
orderInfo.setSettlementAmount(amount);
orderInfo.setPackFee(BigDecimal.ZERO);
orderInfo.setOriginAmount(amount);
orderInfo.setPayAmount(amount);
orderInfo.setAmount(amount);
orderInfo.setRefundAmount(BigDecimal.ZERO);
orderInfo.setPayType(payType);
orderInfo.setPayAmount(amount);
orderInfo.setOrderAmount(amount);
orderInfo.setSendType("QR");
orderInfo.setStatus("WAIT_PAY");
orderInfo.setMerchantId(shopInfo.getMerchantId());
orderInfo.setShopId(shopId);
orderInfo.setRefundAble(Byte.valueOf("1"));
orderInfo.setSystemTime(System.currentTimeMillis());
orderInfo.setCreatedAt(System.currentTimeMillis());
orderInfo.setIsAccepted(Byte.valueOf("1"));
orderInfo.setTradeDay(DateUtils.getDay());
tbOrderInfoMapper.insert(orderInfo);
tbOrderInfoMapper.insert(orderInfo);
}
TbOrderPayment payment = tbOrderPaymentMapper.selectByOrderId(orderInfo.getId().toString());