diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/printer/controller/printerController.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/printer/controller/printerController.java index 10c16e20d..a09180137 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/printer/controller/printerController.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/printer/controller/printerController.java @@ -78,7 +78,7 @@ public class printerController extends BaseController { @RequestParam("additional_data") String additional_data, @RequestParam("iv") String iv, @RequestParam("signature") String signature){ - log.info("12222222222222222222222222"); + log.info("------push-------"); return printerService.PostPush(ciphertext,nonce,tag,additional_data,iv,signature); } diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/printer/service/impl/PrinterServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/printer/service/impl/PrinterServiceImpl.java index 50bf3268a..91276ef65 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/printer/service/impl/PrinterServiceImpl.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/printer/service/impl/PrinterServiceImpl.java @@ -66,15 +66,20 @@ public class PrinterServiceImpl implements PrinterService { // 使用 Fastjson 将 JSON 字符串解析为 JSONObject JSONObject jsonObject = JSON.parseObject(decrypte); + log.info("--回调支付--{}",jsonObject); // 将 JSONObject 转换为 Map Map map = jsonObject.getInnerMap(); //获取支付参数 - Map orderPaymentMap = (Map) map.get("order_payment"); +// Map orderPaymentMap = (Map) map.get("order_payment"); + Map orderPaymentMap = (Map) map.get("order_other"); + log.info("--回调支付--{}",orderPaymentMap.get("scanned_code").toString()); + OrderPayment orderPayment = new OrderPayment(); - orderPayment.setOrderPayment(orderPaymentMap.get("pay_amount").toString()); +// orderPayment.setOrderPayment(orderPaymentMap.get("pay_amount").toString()); orderPayment.setScannedCode(orderPaymentMap.get("scanned_code").toString()); - RedisUtil.set(orderPaymentMap.get("scanned_code").toString(), orderPaymentMap.get("pay_amount").toString(), 100); +// RedisUtil.set(orderPaymentMap.get("scanned_code").toString(), orderPaymentMap.get("pay_amount").toString(), 100); + RedisUtil.set(orderPaymentMap.get("scanned_code").toString(), 100); code = orderPaymentMap.get("scanned_code").toString(); log.info("--获取打印回调--{}",jsonObject); } catch (Exception e) { @@ -148,7 +153,7 @@ public class PrinterServiceImpl implements PrinterService { // HashMap objectObjectHashMap = new HashMap<>(); Map orderPaymentMap = new HashMap<>(); - orderPaymentMap.put("pay_amount", payAmount); + orderPaymentMap.put("pay_amount", payAmount.toString()); // orderPaymentMap.put("pay_amount", 0.01); orderPaymentMap.put("pay_amount_source", 3); @@ -162,6 +167,7 @@ public class PrinterServiceImpl implements PrinterService { String json = gson.toJson(jsonDataMap); String jsonData = ""+json+""; +// String jsonData = "{\"order_payment\":{\"pay_amount\":\"1\",\"pay_amount_source\":3},\"processed_state\":0}"; log.info("json:{}",jsonData); String url=m.print(infoByStoreId.getMachineCode(),jsonData, System.currentTimeMillis()+random6.toString()); diff --git a/fuintCashierWeb/src/views/details/index.vue b/fuintCashierWeb/src/views/details/index.vue index 616885019..2c9363c97 100644 --- a/fuintCashierWeb/src/views/details/index.vue +++ b/fuintCashierWeb/src/views/details/index.vue @@ -175,7 +175,6 @@
赠送{{ item.giftBalance }}
-
diff --git a/pos-uni/pages/my/my.vue b/pos-uni/pages/my/my.vue index 16024fa55..d2f77ae9f 100644 --- a/pos-uni/pages/my/my.vue +++ b/pos-uni/pages/my/my.vue @@ -25,7 +25,7 @@ ======= --> - + 服务条款 diff --git a/pos-uni/pagesHome/orderList/orderList.vue b/pos-uni/pagesHome/orderList/orderList.vue index 5dd6a4ae3..2e45df3ea 100644 --- a/pos-uni/pagesHome/orderList/orderList.vue +++ b/pos-uni/pagesHome/orderList/orderList.vue @@ -94,7 +94,6 @@ ], orderList: [], baseUrl: config.baseUrl, - // baseUrl: 'https://www.tuofeng.cc/oilAdmin/static/uploadImages/20240529/e776bf37b3f843028846cbdf3fbd958d.jpg', form: { page: 1, pageSize: 10, diff --git a/pos-uni/pagesHome/outher/serviceList.vue b/pos-uni/pagesHome/outher/serviceList.vue index a934d0921..2d74eb386 100644 --- a/pos-uni/pagesHome/outher/serviceList.vue +++ b/pos-uni/pagesHome/outher/serviceList.vue @@ -4,7 +4,9 @@ 服务条款 - 委托方(甲方): + +

+ 委托方(甲方): 法定代表人: @@ -143,7 +145,9 @@ 签约时间: 签约时间: - 签订地点: 签订地点: + 签订地点: 签订地点: +

+