店铺管理-店铺配置:打印机设置相关接口

This commit is contained in:
谭凯凯
2024-10-12 15:50:40 +08:00
committed by Tankaikai
parent 1e4223aa10
commit e720fc7b15

View File

@@ -1923,6 +1923,7 @@ public class PayService {
return Result.fail(CodeEnum.ORDERNOEXIST);
}
if (StrUtil.isNotBlank(remark)) {
orderInfo.setDiscountAmount(orderInfo.getOrderAmount().subtract(amount));
orderInfo.setRemark(remark);
tbOrderInfoMapper.updateByPrimaryKey(orderInfo);
}
@@ -1940,6 +1941,7 @@ public class PayService {
orderInfo.setPayType(payType);
orderInfo.setPayAmount(amount);
orderInfo.setOrderAmount(amount);
orderInfo.setDiscountAmount(BigDecimal.ZERO);
orderInfo.setSendType("QR");
orderInfo.setStatus("WAIT_PAY");
orderInfo.setMerchantId(shopInfo.getMerchantId());
@@ -1983,7 +1985,7 @@ public class PayService {
String reqbody = "店铺收款码";
PublicResp<JspayResp> publicResp = thirdPayService.jspay(url, thirdApply.getAppId(), thirdApply.getAppToken(),
reqbody, reqbody, orderInfo.getOrderAmount().multiply(new BigDecimal(100)).longValue(),
reqbody, reqbody, amount.multiply(new BigDecimal(100)).longValue(),
payType, thirdApply.getSmallAppid(), userId, ip,
DateUtils.getSsdfTimes(), thirdApply.getStoreId(), backUrl, backUrl);