dianliang/oil-station
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

no message

Browse Source
This commit is contained in:
DESKTOP-369JRHT\12997 2024-05-30 16:05:16 +08:00
parent aff136295e
commit 543eb2d35e
6 changed files with 18 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fuintBackend/fuint-application/src/main/java/com/fuint/business/printer/controller/printerController.java
View File

@ -78,7 +78,7 @@ public class printerController extends BaseController {
@RequestParam("additional_data") String additional_data, @RequestParam("additional_data") String additional_data,
@RequestParam("iv") String iv, @RequestParam("iv") String iv,
@RequestParam("signature") String signature){ @RequestParam("signature") String signature){
log.info("12222222222222222222222222"); log.info("------push-------");
return printerService.PostPush(ciphertext,nonce,tag,additional_data,iv,signature); return printerService.PostPush(ciphertext,nonce,tag,additional_data,iv,signature);
} }

14
fuintBackend/fuint-application/src/main/java/com/fuint/business/printer/service/impl/PrinterServiceImpl.java
View File

@ -66,15 +66,20 @@ public class PrinterServiceImpl implements PrinterService {
// 使用 Fastjson 将 JSON 字符串解析为 JSONObject // 使用 Fastjson 将 JSON 字符串解析为 JSONObject
JSONObject jsonObject = JSON.parseObject(decrypte); JSONObject jsonObject = JSON.parseObject(decrypte);
log.info("--回调支付--{}",jsonObject);
// 将 JSONObject 转换为 Map // 将 JSONObject 转换为 Map
Map<String, Object> map = jsonObject.getInnerMap(); Map<String, Object> map = jsonObject.getInnerMap();
//获取支付参数 //获取支付参数
Map<String, Object> orderPaymentMap = (Map<String, Object>) map.get("order_payment"); // Map<String, Object> orderPaymentMap = (Map<String, Object>) map.get("order_payment");
Map<String, Object> orderPaymentMap = (Map<String, Object>) map.get("order_other");
log.info("--回调支付--{}",orderPaymentMap.get("scanned_code").toString());
OrderPayment orderPayment = new OrderPayment(); 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()); 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(); code = orderPaymentMap.get("scanned_code").toString();
log.info("--获取打印回调--{}",jsonObject); log.info("--获取打印回调--{}",jsonObject);
} catch (Exception e) { } catch (Exception e) {
@ -148,7 +153,7 @@ public class PrinterServiceImpl implements PrinterService {
// HashMap<String, String> objectObjectHashMap = new HashMap<>(); // HashMap<String, String> objectObjectHashMap = new HashMap<>();
Map<String, Object> orderPaymentMap = new HashMap<>(); Map<String, Object> orderPaymentMap = new HashMap<>();
orderPaymentMap.put("pay_amount", payAmount); orderPaymentMap.put("pay_amount", payAmount.toString());
// orderPaymentMap.put("pay_amount", 0.01); // orderPaymentMap.put("pay_amount", 0.01);
orderPaymentMap.put("pay_amount_source", 3); orderPaymentMap.put("pay_amount_source", 3);
@ -162,6 +167,7 @@ public class PrinterServiceImpl implements PrinterService {
String json = gson.toJson(jsonDataMap); String json = gson.toJson(jsonDataMap);
String jsonData = "<JSON>"+json+"</JSON>"; String jsonData = "<JSON>"+json+"</JSON>";
// String jsonData = "<JSON>{\"order_payment\":{\"pay_amount\":\"1\",\"pay_amount_source\":3},\"processed_state\":0}</JSON>";
log.info("json:{}",jsonData); log.info("json:{}",jsonData);
String url=m.print(infoByStoreId.getMachineCode(),jsonData, System.currentTimeMillis()+random6.toString()); String url=m.print(infoByStoreId.getMachineCode(),jsonData, System.currentTimeMillis()+random6.toString());

1
fuintCashierWeb/src/views/details/index.vue
View File

@ -175,7 +175,6 @@
<div>赠送<span class="amount">{{ item.giftBalance }}</span>元</div> <div>赠送<span class="amount">{{ item.giftBalance }}</span>元</div>
</div> </div>
</div> </div>
<div style="width: 30%;margin-left: 13px;margin-top: 8px;" <div style="width: 30%;margin-left: 13px;margin-top: 8px;"
:class="activeKey === cardValueList.length ? 'select' : ''" :class="activeKey === cardValueList.length ? 'select' : ''"
@click="rechargeCard(cardValueList.length,-1)"> @click="rechargeCard(cardValueList.length,-1)">

2
pos-uni/pages/my/my.vue
View File

@ -25,7 +25,7 @@
<view class="h-box" @click="goServiceList()"> <view class="h-box" @click="goServiceList()">
======= =======
</view> --> </view> -->
<view class="h-box"> <view class="h-box" @click="goServiceList()">
<view class="">服务条款</view> <view class="">服务条款</view>
<u-icon name="arrow-right" size="18"></u-icon> <u-icon name="arrow-right" size="18"></u-icon>

1
pos-uni/pagesHome/orderList/orderList.vue
View File

@ -94,7 +94,6 @@
], ],
orderList: [], orderList: [],
baseUrl: config.baseUrl, baseUrl: config.baseUrl,
// baseUrl: 'https://www.tuofeng.cc/oilAdmin/static/uploadImages/20240529/e776bf37b3f843028846cbdf3fbd958d.jpg',
form: { form: {
page: 1, page: 1,
pageSize: 10, pageSize: 10,

8
pos-uni/pagesHome/outher/serviceList.vue
View File

@ -4,7 +4,9 @@
<headers :titles="titles"><u-icon name="arrow-left" color="#fff" size="22"></u-icon></headers> <headers :titles="titles"><u-icon name="arrow-left" color="#fff" size="22"></u-icon></headers>
<view class="box_"> <view class="box_">
<view class="title_">服务条款</view> <view class="title_">服务条款</view>
<view class="size_">委托方（甲方）：
<p>
委托方（甲方）：
法定代表人： 法定代表人：
@ -143,7 +145,9 @@
签约时间： 签约时间： 签约时间： 签约时间：
签订地点： 签订地点：</view> 签订地点： 签订地点：
</p>
<view class="size_"></view>
</view> </view>