|
@@ -112,18 +112,19 @@ class FragmentPayType private constructor(): FragmentBasic(), View.OnClickListen
|
|
|
DFSLog.w("barcodeId:$barcodeId")
|
|
|
}
|
|
|
|
|
|
- // 获取云订单(本地需要缓存,避免重复生成订单)
|
|
|
- var posTrx: PosTrx? = SPUtil.findWayneOrder(dc)
|
|
|
- if (posTrx == null) {
|
|
|
- val resultReportPayment = SystemApi.generateOrder(dc, posItemUniqueId)
|
|
|
- if (resultReportPayment.success && resultReportPayment.data != null && !resultReportPayment.data.id.isNullOrEmpty()) {
|
|
|
- posTrx = resultReportPayment.data
|
|
|
- SPUtil.addWayneOrder(dc, posTrx)
|
|
|
- } else {
|
|
|
- dialog.dismiss()
|
|
|
- (requireActivity() as MainActivity).fragmentRouter.resumeFragmentToolbarTimer()
|
|
|
- DFSToastUtil.fail(StringUtil.get(R.string.fail_behave_reason, StringUtil.get(R.string.make_cloud_order), resultReportPayment.message))
|
|
|
- }
|
|
|
+ // 获取云订单(本地需要缓存,避免重复生成订单),2025-07 ,从接口处理,不需要再缓存
|
|
|
+// var posTrx: PosTrx? = SPUtil.findWayneOrder(dc)
|
|
|
+// if (posTrx == null) {
|
|
|
+//
|
|
|
+// }
|
|
|
+ var posTrx:PosTrx? = null
|
|
|
+ val resultReportPayment = SystemApi.generateOrder(dc, posItemUniqueId)
|
|
|
+ if (resultReportPayment.success && resultReportPayment.data != null && !resultReportPayment.data.id.isNullOrEmpty()) {
|
|
|
+ posTrx = resultReportPayment.data
|
|
|
+ } else {
|
|
|
+ dialog.dismiss()
|
|
|
+ (requireActivity() as MainActivity).fragmentRouter.resumeFragmentToolbarTimer()
|
|
|
+ DFSToastUtil.fail(StringUtil.get(R.string.fail_behave_reason, StringUtil.get(R.string.make_cloud_order), resultReportPayment.message))
|
|
|
}
|
|
|
|
|
|
// 锁定订单
|