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

微信扫码支付报错fix

This commit is contained in:
SongZhang 2024-10-08 09:26:44 +08:00
parent 79e99e78a5
commit 21a8fd517e
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
eladmin-system/src/main/java/cn/ysk/cashier/controller/product/TbPlaceController.java
View File

@ -189,6 +189,7 @@ public class TbPlaceController {
@Log("代客下单 打印菜品单") @Log("代客下单 打印菜品单")
@ApiOperation("代客下单 打印菜品单") @ApiOperation("代客下单 打印菜品单")
@PostMapping("printDishes")
public ResponseEntity<Object> printDishes( public ResponseEntity<Object> printDishes(
@Validated @RequestBody BaseTableDTO baseTableDTO @Validated @RequestBody BaseTableDTO baseTableDTO
) { ) {

5
eladmin-system/src/main/java/cn/ysk/cashier/service/impl/shopimpl/TbShopTableServiceImpl.java
View File

@ -951,7 +951,7 @@ public class TbShopTableServiceImpl implements TbShopTableService {
String date = DateUtils.getSdfTimes(); String date = DateUtils.getSdfTimes();
Random random = new Random(); Random random = new Random();
int randomNum = random.nextInt(900) + 100; int randomNum = random.nextInt(900) + 100;
return StrUtil.isBlank(prefix) ? "DDPL" : prefix + date + randomNum; return StrUtil.isBlank(prefix) ? "DDPL" + date + randomNum : prefix + date + randomNum;
} }
public synchronized void addGlobalCode(String day, String clientType, String shopId) { public synchronized void addGlobalCode(String day, String clientType, String shopId) {
@ -1516,7 +1516,8 @@ public class TbShopTableServiceImpl implements TbShopTableService {
// orderInfo = tbPayServiceImpl.cashPay(payDTO); // orderInfo = tbPayServiceImpl.cashPay(payDTO);
break; break;
case "scanCode": case "scanCode":
orderInfo = tbPayServiceImpl.scanPay(payDTO.getShopId(), payDTO.getCode(), Integer.valueOf(orderInfo.getMerchantId()), Integer.valueOf(orderInfo.getMemberId()), finalAmount, orderInfo); orderInfo = tbPayServiceImpl.scanPay(payDTO.getShopId(), payDTO.getCode(), Integer.valueOf(orderInfo.getMerchantId()),
StrUtil.isNotBlank(orderInfo.getMemberId()) ? Integer.valueOf(orderInfo.getMemberId()) : null, finalAmount, orderInfo);
break; break;
case "deposit": case "deposit":
orderInfo = tbPayServiceImpl.memberAccountPay("", String.valueOf(payDTO.getShopId()), payDTO.getCode(), orderInfo, finalAmount); orderInfo = tbPayServiceImpl.memberAccountPay("", String.valueOf(payDTO.getShopId()), payDTO.getCode(), orderInfo, finalAmount);