From 543eb2d35ebd80ec8692e13d74337e523ed7852e Mon Sep 17 00:00:00 2001 From: "DESKTOP-369JRHT\\12997" <9> Date: Thu, 30 May 2024 16:05:16 +0800 Subject: [PATCH 1/2] no message --- .../printer/controller/printerController.java | 2 +- .../printer/service/impl/PrinterServiceImpl.java | 14 ++++++++++---- fuintCashierWeb/src/views/details/index.vue | 1 - pos-uni/pages/my/my.vue | 2 +- pos-uni/pagesHome/orderList/orderList.vue | 1 - pos-uni/pagesHome/outher/serviceList.vue | 8 ++++++-- 6 files changed, 18 insertions(+), 10 deletions(-) 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 @@ 签约时间： 签约时间： - 签订地点： 签订地点： + 签订地点： 签订地点： +

+ From 8ee3862433455b56fef5c8e457210c922418fe39 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BD=90=E5=A4=A9=E5=A4=A7=E5=9C=A3?= <17615834396@163.com> Date: Thu, 30 May 2024 16:06:55 +0800 Subject: [PATCH 2/2] pos --- .../fuyou/service/impl/FyPayServiceImpl.java | 17 +- .../impl/CardFuelRecordServiceImpl.java | 15 +- .../service/CardValueOrdersService.java | 2 + .../impl/CardValueOrdersServiceImpl.java | 26 + .../FavorableRecordsController.java | 2 - .../impl/FavorableRecordsServiceImpl.java | 6 + .../controller/PrintDeviceInfoController.java | 94 --- .../printer/controller/printerController.java | 306 --------- .../printer/entity/PrintDeviceInfo.java | 83 --- .../fuint/business/printer/entity/Test.java | 51 -- .../printer/mapper/PrintDeviceInfoMapper.java | 90 --- .../mapper/xml/PrintDeviceInfoMapper.xml | 217 ------- .../service/PrintDeviceInfoService.java | 58 -- .../printer/service/PrinterService.java | 36 -- .../impl/PrintDeviceInfoServiceImpl.java | 96 --- .../service/impl/PrinterServiceImpl.java | 474 -------------- .../business/printer/template/Handover.java | 599 ------------------ .../business/printer/template/Prient.java | 68 -- .../template/PrintCardValueReport.java | 51 -- .../template/PrintFuelDieselReport.java | 55 -- .../printer/template/PrintIntegralReport.java | 54 -- .../printer/template/PrintOilOrderReport.java | 100 --- .../template/RePrintOilOrderReport.java | 95 --- .../fuint/business/printer/unit/ApiConst.java | 96 --- .../fuint/business/printer/unit/HttpUtil.java | 254 -------- .../fuint/business/printer/unit/LAVApi.java | 476 -------------- .../fuint/business/printer/unit/Methods.java | 352 ---------- .../business/printer/unit/TestSrvlet.java | 118 ---- .../business/printer/vo/OrderPayment.java | 11 - .../service/impl/SysDictTypeServiceImpl.java | 26 +- 30 files changed, 77 insertions(+), 3851 deletions(-) delete mode 100644 fuintBackend/fuint-application/src/main/java/com/fuint/business/printer/controller/PrintDeviceInfoController.java delete mode 100644 fuintBackend/fuint-application/src/main/java/com/fuint/business/printer/controller/printerController.java delete mode 100644 fuintBackend/fuint-application/src/main/java/com/fuint/business/printer/entity/PrintDeviceInfo.java delete mode 100644 fuintBackend/fuint-application/src/main/java/com/fuint/business/printer/entity/Test.java delete mode 100644 fuintBackend/fuint-application/src/main/java/com/fuint/business/printer/mapper/PrintDeviceInfoMapper.java delete mode 100644 fuintBackend/fuint-application/src/main/java/com/fuint/business/printer/mapper/xml/PrintDeviceInfoMapper.xml delete mode 100644 fuintBackend/fuint-application/src/main/java/com/fuint/business/printer/service/PrintDeviceInfoService.java delete mode 100644 fuintBackend/fuint-application/src/main/java/com/fuint/business/printer/service/PrinterService.java delete mode 100644 fuintBackend/fuint-application/src/main/java/com/fuint/business/printer/service/impl/PrintDeviceInfoServiceImpl.java delete mode 100644 fuintBackend/fuint-application/src/main/java/com/fuint/business/printer/service/impl/PrinterServiceImpl.java delete mode 100644 fuintBackend/fuint-application/src/main/java/com/fuint/business/printer/template/Handover.java delete mode 100644 fuintBackend/fuint-application/src/main/java/com/fuint/business/printer/template/Prient.java delete mode 100644 fuintBackend/fuint-application/src/main/java/com/fuint/business/printer/template/PrintCardValueReport.java delete mode 100644 fuintBackend/fuint-application/src/main/java/com/fuint/business/printer/template/PrintFuelDieselReport.java delete mode 100644 fuintBackend/fuint-application/src/main/java/com/fuint/business/printer/template/PrintIntegralReport.java delete mode 100644 fuintBackend/fuint-application/src/main/java/com/fuint/business/printer/template/PrintOilOrderReport.java delete mode 100644 fuintBackend/fuint-application/src/main/java/com/fuint/business/printer/template/RePrintOilOrderReport.java delete mode 100644 fuintBackend/fuint-application/src/main/java/com/fuint/business/printer/unit/ApiConst.java delete mode 100644 fuintBackend/fuint-application/src/main/java/com/fuint/business/printer/unit/HttpUtil.java delete mode 100644 fuintBackend/fuint-application/src/main/java/com/fuint/business/printer/unit/LAVApi.java delete mode 100644 fuintBackend/fuint-application/src/main/java/com/fuint/business/printer/unit/Methods.java delete mode 100644 fuintBackend/fuint-application/src/main/java/com/fuint/business/printer/unit/TestSrvlet.java delete mode 100644 fuintBackend/fuint-application/src/main/java/com/fuint/business/printer/vo/OrderPayment.java diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/api/fuyou/service/impl/FyPayServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/api/fuyou/service/impl/FyPayServiceImpl.java index e8a61a940..e4737a78b 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/api/fuyou/service/impl/FyPayServiceImpl.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/api/fuyou/service/impl/FyPayServiceImpl.java @@ -21,9 +21,12 @@ import com.fuint.business.marketingActivity.cardFule.entity.CardFuelRecord; import com.fuint.business.marketingActivity.cardFule.service.CardFuelRecordService; import com.fuint.business.marketingActivity.cardValue.entity.CardValueRecord; import com.fuint.business.marketingActivity.cardValue.service.CardValueRecordService; +import com.fuint.business.marketingActivity.cardValueOrders.service.CardValueOrdersService; import com.fuint.business.order.entity.*; import com.fuint.business.order.service.*; +import com.fuint.business.userManager.entity.UserBalance; import com.fuint.business.userManager.service.LJUserService; +import com.fuint.business.userManager.service.UserBalanceService; import com.fuint.business.userManager.vo.LJUserVo; import com.fuint.common.dto.AccountInfo; import com.fuint.common.util.TokenUtil; @@ -57,6 +60,12 @@ public class FyPayServiceImpl implements FyPayService { @Resource private IntegralSettingsService integralSettingsService; + @Resource + private UserBalanceService userBalanceService; + + @Resource + private CardValueOrdersService cardValueOrdersService; + /** * 条码支付 * @@ -185,6 +194,7 @@ public class FyPayServiceImpl implements FyPayService { List returnRecords = returnRecordService.selectReturnRecordByOrderNo(orderNo); Date date = new Date(); if (reqMap.get("trans_stat").equals("SUCCESS")) { + payStatus = "paid"; if (!ObjectUtil.isEmpty(oilOrder)) { // 油品订单 @@ -281,6 +291,7 @@ public class FyPayServiceImpl implements FyPayService { if ("CVR".equals(type)) { payStates = "paid"; receiveParameter.setType("2"); + if (ObjectUtil.isNotEmpty(goodsOrder) && ObjectUtil.isNotEmpty(goodsOrder.getUserId())) { receiveParameter.setUserId(goodsOrder.getUserId()); } @@ -290,6 +301,7 @@ public class FyPayServiceImpl implements FyPayService { } if ("CFR".equals(type)) { payStates = "paid"; + cardValueOrdersService.updateBalance(orderNo,payStatus); } if ("IOS".equals(type)) { // 积分商城 payStates = "paid"; @@ -338,6 +350,7 @@ public class FyPayServiceImpl implements FyPayService { } if ("CFR".equals(type)) { payStates = "payFail"; + cardValueOrdersService.updateBalance(orderNo,payStatus); } if ("IOS".equals(type)) { payStates = "payFail"; @@ -383,6 +396,8 @@ public class FyPayServiceImpl implements FyPayService { } if ("CVR".equals(type) && !ObjectUtil.isEmpty(map1.get("orderId"))) { // 储值卡 + + Integer id = Integer.parseInt(map1.get("orderId")); cardValueRecordService.editPayStatus(id, payStates); @@ -397,7 +412,7 @@ public class FyPayServiceImpl implements FyPayService { // 囤油卡 Integer id = Integer.parseInt(map1.get("orderId")); cardFuelRecordService.editPayStatus(id, payStates); - + cardValueOrdersService.updateBalance(orderNo,payStatus); CardFuelRecord cardFuelRecord = cardFuelRecordService.queryById(id); receiveParameter.setType("5"); if (cardFuelRecord.getMtUserId() != null) { diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFule/service/impl/CardFuelRecordServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFule/service/impl/CardFuelRecordServiceImpl.java index 9a42ce94e..e47a04ecf 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFule/service/impl/CardFuelRecordServiceImpl.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFule/service/impl/CardFuelRecordServiceImpl.java @@ -220,8 +220,16 @@ public class CardFuelRecordServiceImpl implements CardFuelRecordService { CardFuelRecord cardFuelRecord = new CardFuelRecord(); if (ObjectUtils.isNotEmpty(cardFuelRecords)){ - Optional max = cardFuelRecords.stream().max(Comparator.comparing(CardFuelRecord::getLockupPrice)); - cardFuelRecord = max.get(); + ArrayList list = new ArrayList<>(); + for (CardFuelRecord fuelRecord : cardFuelRecords) { + if (ObjectUtils.isNotEmpty(fuelRecord.getLockupPrice())){ + list.add(fuelRecord); + } + } + if (ObjectUtils.isNotEmpty(list)){ + Optional max = list.stream().max(Comparator.comparing(CardFuelRecord::getLockupPrice)); + cardFuelRecord = max.get(); + } } CardFuelDiesel cardFuelDiesel = cardFuelDieselService.getById(cardFuelRecord.getCardFuelId()); @@ -291,6 +299,9 @@ public class CardFuelRecordServiceImpl implements CardFuelRecordService { map.put("privateKey", merchantConfig.getPrivateKey()); map.put("type", "CFR"); map.put("orderId", cardFuelRecordDTO.getId().toString()); + map.put("userId", cardFuelRecordDTO.getMtUserId().toString()); + map.put("storeId", cardFuelRecordDTO.getStoreId().toString()); + map.put("storeId", nowAccountInfo.getStoreId().toString()); // 调用支付接口 try { fyPayService.pay(map); diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValueOrders/service/CardValueOrdersService.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValueOrders/service/CardValueOrdersService.java index 807b852f1..d83b5ce45 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValueOrders/service/CardValueOrdersService.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValueOrders/service/CardValueOrdersService.java @@ -33,5 +33,7 @@ public interface CardValueOrdersService extends IService { * @param status 支付状态 */ void updateOrderStatus(String orderNo,String status); + + void updateBalance(String orderNo,String status); } diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValueOrders/service/impl/CardValueOrdersServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValueOrders/service/impl/CardValueOrdersServiceImpl.java index d6306f584..d20d1110a 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValueOrders/service/impl/CardValueOrdersServiceImpl.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValueOrders/service/impl/CardValueOrdersServiceImpl.java @@ -7,6 +7,8 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.fuint.business.marketingActivity.cardValueOrders.entity.CardValueOrders; import com.fuint.business.marketingActivity.cardValueOrders.mapper.CardValueOrdersMapper; import com.fuint.business.marketingActivity.cardValueOrders.service.CardValueOrdersService; +import com.fuint.business.userManager.entity.UserBalance; +import com.fuint.business.userManager.service.UserBalanceService; import com.fuint.common.dto.AccountInfo; import com.fuint.common.util.TokenUtil; import org.springframework.stereotype.Service; @@ -24,6 +26,9 @@ public class CardValueOrdersServiceImpl extends ServiceImpl favorableRecordsList = page1.getRecords(); + for (FavorableRecords favorableRecords1 : favorableRecordsList) { + + } return page1; } diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/printer/controller/PrintDeviceInfoController.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/printer/controller/PrintDeviceInfoController.java deleted file mode 100644 index aca2e1b32..000000000 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/printer/controller/PrintDeviceInfoController.java +++ /dev/null @@ -1,94 +0,0 @@ -package com.fuint.business.printer.controller; - -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.fuint.business.printer.entity.PrintDeviceInfo; -import com.fuint.business.printer.service.PrintDeviceInfoService; -import com.fuint.framework.web.BaseController; -import com.fuint.framework.web.ResponseObject; -import org.springframework.web.bind.annotation.*; -import io.lettuce.core.dynamic.annotation.Param; - - -import javax.annotation.Resource; - -/** - * (PrintDeviceInfo)表控制层 - * - * @author wangh - * @since 2024-04-29 17:31:02 - */ -@RestController -@RequestMapping("/business/printDeviceInfo") -public class PrintDeviceInfoController extends BaseController { - /** - * 服务对象 - */ - @Resource - private PrintDeviceInfoService printDeviceInfoService; - - /** - * 分页查询 - * - * @param printDeviceInfo 筛选条件 - * @param pageNo 分页对象 - * @return 查询结果 - */ - @GetMapping("queryByPage") - public ResponseObject queryByPage(@RequestParam(value = "pageNo",defaultValue = "1") Integer pageNo, - @RequestParam(value = "pageSize",defaultValue = "10") Integer pageSize, - @Param("printDeviceInfo") PrintDeviceInfo printDeviceInfo) { - Page page = new Page(pageNo, pageSize); - IPage iPageList = this.printDeviceInfoService.queryByPage(page, printDeviceInfo); - return getSuccessResult(iPageList); - } - - - - /** - * 通过主键查询单条数据 - * - * @param id 主键 - * @return 单条数据 - */ - @GetMapping("{id}") - public ResponseObject queryById(@PathVariable("id") Integer id) { - return getSuccessResult(this.printDeviceInfoService.queryById(id)); - } - - /** - * 新增数据 - * - * @param printDeviceInfo 实体 - * @return 新增结果 - */ - @PostMapping - public ResponseObject add(@RequestBody PrintDeviceInfo printDeviceInfo) { - return getSuccessResult(this.printDeviceInfoService.insert(printDeviceInfo)); - } - - /** - * 编辑数据 - * - * @param printDeviceInfo 实体 - * @return 编辑结果 - */ - @PutMapping - public ResponseObject edit(@RequestBody PrintDeviceInfo printDeviceInfo) { - - return getSuccessResult(this.printDeviceInfoService.update(printDeviceInfo)); - } - - /** - * 删除数据 - * - * @param id 主键 - * @return 删除是否成功 - */ - @DeleteMapping - public ResponseObject deleteById(Integer id) { - return getSuccessResult(this.printDeviceInfoService.deleteById(id)); - } - -} - 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 deleted file mode 100644 index 3aba10ed1..000000000 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/printer/controller/printerController.java +++ /dev/null @@ -1,306 +0,0 @@ -package com.fuint.business.printer.controller; - - -import cn.hutool.core.util.ObjectUtil; -import com.alibaba.fastjson.JSON; -import com.alibaba.fastjson.JSONObject; -import com.alipay.api.internal.util.codec.Base64; -import com.fuint.business.printer.entity.Test; -import com.fuint.business.printer.service.PrinterService; -import com.fuint.business.printer.template.*; -import com.fuint.business.printer.unit.Methods; -import com.fuint.business.printer.vo.OrderPayment; -import com.fuint.common.dto.AccountInfo; -import com.fuint.common.util.Constants; -import com.fuint.common.util.RedisUtil; -import com.fuint.common.util.TokenUtil; -import com.fuint.framework.web.BaseController; -import com.fuint.framework.web.ResponseObject; -import com.google.gson.Gson; -import com.google.gson.GsonBuilder; -//import com.yly.print_sdk_librar.RequestMethod; -import lombok.extern.slf4j.Slf4j; -import org.springframework.boot.autoconfigure.cache.CacheProperties; -import org.springframework.web.bind.annotation.*; -import org.springframework.web.servlet.config.annotation.EnableWebMvc; - -import javax.annotation.Resource; -import javax.crypto.Cipher; -import javax.crypto.spec.GCMParameterSpec; -import javax.crypto.spec.SecretKeySpec; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import java.io.IOException; -import java.io.PrintWriter; -import java.math.BigDecimal; -import java.nio.charset.StandardCharsets; -import java.security.GeneralSecurityException; -import java.security.KeyFactory; -import java.security.PublicKey; -import java.security.Signature; -import java.security.spec.X509EncodedKeySpec; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -@RestController -@RequestMapping("/business/printer") -//@EnableWebMvc -@Slf4j -public class printerController extends BaseController { - - @Resource - PrinterService printerService; - - @GetMapping("callback") - public Map callback(Map map){ - log.info("------print/callback-------"); - Map objectObjectHashMap = new HashMap<>(); - objectObjectHashMap.put("message","ok"); - return objectObjectHashMap; - } - - @GetMapping("push") - public Map push( Map map){ - log.info("------接收GET回调-------"); - Map objectObjectHashMap = new HashMap<>(); - objectObjectHashMap.put("message","ok"); - return objectObjectHashMap; - } - - @PostMapping("push") - public Map PostPush( - @RequestParam("ciphertext") String ciphertext, - @RequestParam("nonce") String nonce, - @RequestParam("tag") String tag, - @RequestParam("additional_data") String additional_data, - @RequestParam("iv") String iv, - @RequestParam("signature") String signature){ - log.info("12222222222222222222222222"); - - return printerService.PostPush(ciphertext,nonce,tag,additional_data,iv,signature); - } - - @GetMapping("returnCode") - public ResponseObject returnCode(String payAmount) { - return getSuccessResult(printerService.returnCode(payAmount)); - } - -// -// public static final String publicKey = "MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuiQQsY9lbZhtRoZIaBVN\n" + -// "XKuAme47UCUv3RG2AYJXKQ/TyXBBY0JULSf4637Ug7JqGR1ohHFpY9XotG5J/7Ne\n" + -// "safQApAz8QHKOa6+jqS0edafegjE7P0KqfQWvjUIbhAl5iXmiGLA/R6zLXxk8+PU\n" + -// "toRu1rmzMPCsbGRG0uHOZ0nYez1LSM4k4k8o4/dl7NDr2CqXrfYQCEvGAAJay/bg\n" + -// "h1B05cqFNuhQGvv55EX377QVZX7V0ZipIZhlzoh8pA0ZpzW/KndZ+pRYw6cPLvey\n" + -// "qymRnTlCSQUDYQRlxaDppPbZcU1Krb9tZUmhJp+R9l73tJX8yN5wzbq6HATZbD1v\n" + -// "BwIDAQAB"; - - -// @GetMapping("getToken") -// public ResponseObject getToken(){ -//// Methods.() -// //初始化控制器类 -// Methods m=Methods.getInstance(); -// //初始化终端信息 -// m.init("1038835098", "1595cb28ea30e98908e6334e735f4b8a"); -// //获取token -// m.getFreedomToken(); -// System.out.println("123123123123123"); -// return getSuccessResult(""); -// } - private static final String APP_KEY = "1073000501"; - private static final String APP_SECRET = "e0292ae66d9d21feaa895370d3a875aa"; - - // 授权 - @GetMapping("scancodemodel") - public ResponseObject scancodemodel(){ - AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo(); - String token = printerService.getToken(nowAccountInfo.getStoreId()); -// String token = printerService.getToken(138); - return getSuccessResult(token); - - } - - // 发起网络支付 - @GetMapping("printIndex") - public ResponseObject printIndex(BigDecimal payAmount) { - - - -// Methods m=Methods.getInstance(); -// m.init("26845ee50f13467cacbaa099489a2fc152abd6f5"); -// -// m.init(APP_KEY, APP_SECRET); -// -//// m.addPrinter("4004872261", "628023865417"); -// Integer random6 = (int) ((Math.random() * 9 + 1) * 100000); -// HashMap objectObjectHashMap = new HashMap<>(); -//// {"order_payment":{"pay_amount":"支付金额","pay_amount_source":3},"processed_state":0} -// -// -// Map orderPaymentMap = new HashMap<>(); -// orderPaymentMap.put("pay_amount", payAmount); -//// orderPaymentMap.put("pay_amount", 0.01); -// orderPaymentMap.put("pay_amount_source", 3); -// -// Map processedStateMap = new HashMap<>(); -// processedStateMap.put("processed_state", 0); -// -// Map jsonDataMap = new HashMap<>(); -// jsonDataMap.put("order_payment", orderPaymentMap); -// jsonDataMap.putAll(processedStateMap); -// -// Gson gson = new GsonBuilder().setPrettyPrinting().create(); -// String json = gson.toJson(jsonDataMap); -// -// String a = ""+json+""; -// log.info("json:{}",a); -// -// String url=m.print("4004872261",a, System.currentTimeMillis()+random6.toString()); -// -// // 使用 Fastjson 将 JSON 字符串解析为 JSONObject -// JSONObject jsonObject = JSON.parseObject(url); -// -// // 将 JSONObject 转换为 Map -// Map map = jsonObject.getInnerMap(); -// //获取支付参数 -// log.info("url:{}",url); -// return getSuccessResult(map.get("error_description")); - String s = printerService.printIndex(payAmount, TokenUtil.getNowAccountInfo().getStoreId()); - return getSuccessResult(s); - - } - - - @GetMapping("doGet") - public void doGet(HttpServletRequest request, HttpServletResponse response) - throws ServletException, IOException { - - Methods m=Methods.getInstance(); -// m.init(APP_KEY,APP_SECRET); - m.init("26845ee50f13467cacbaa099489a2fc152abd6f5"); - - - response.setContentType("text/html"); - PrintWriter out = response.getWriter(); - //测试数据 - List testList = new ArrayList(); - Test t1 = new Test("麻辣牛肉", 23.00, 1,"1"); - Test t2 = new Test("麻辣牛肉", 23.00, 2,"2"); - Test t3 = new Test("精品千层肚", 24.00, 3,"3"); - Test t4 = new Test("麻辣牛肉", 23.00, 2,"1"); - Test t5 = new Test("极品鲜毛肚", 26.00, 2,"1"); - Test t6 = new Test("极品鲜毛肚", 26.00, 1,"2"); - Test t7 = new Test("极品鲜毛肚", 26.00, 3,"2"); - Test t8 = new Test("极品鲜毛肚", 26.00, 1,"1"); - Test t9 = new Test("极品鲜毛肚", 26.00, 2,"3"); - testList.add(t1); - testList.add(t2); - testList.add(t3); - testList.add(t4); - testList.add(t5); - testList.add(t6); - testList.add(t7); - testList.add(t8); - testList.add(t9); - Prient.setTestList(testList); - - //关键代码，自己的程序发送请求 - //初始化控制器类 -// Methods m=Methods.getInstance(); - //初始化终端信息 - m.init(APP_KEY, APP_SECRET); - //获取token -// m.getFreedomToken(); - //刷新token -// m.refreshToken(); - //添加授权 - m.addPrinter("4004872261", "628023865417"); - //打印 - //终端编号 打印内容 订单号 - //生成6位随机数 - Integer random6 = (int) ((Math.random() * 9 + 1) * 100000); - String url=m.print("4004872261", Prient.print(), "Z"+System.currentTimeMillis()+random6.toString()); - response.sendRedirect(url); - out.flush(); - out.close(); - } - - @PostMapping("getHandover") - public void getHandover(@RequestBody Map handover) { -// Methods m=Methods.getInstance(); -// m.init("26845ee50f13467cacbaa099489a2fc152abd6f5"); -// -// m.init(APP_KEY, APP_SECRET); -// Handover.setHandover(handover); -// // m.addPrinter("4004872261", "628023865417"); -// Integer random6 = (int) ((Math.random() * 9 + 1) * 100000); -// String url=m.print("4004872261", Handover.printHandover(), "Z"+System.currentTimeMillis()+random6.toString()); - printerService.getHandover(handover,TokenUtil.getNowAccountInfo().getStoreId()); - } - - - /** - * 收银台商品打印 - * @param oilOrder - */ - @PostMapping("printOilOrderReport") - public void oilOrderReport(@RequestBody Map oilOrder) { -// log.info("handover:{}",handover.toString()); -// Methods m=Methods.getInstance(); -// m.init("26845ee50f13467cacbaa099489a2fc152abd6f5"); -// -// m.init(APP_KEY, APP_SECRET); -// PrintOilOrderReport.setHandover(handover); -// Integer random6 = (int) ((Math.random() * 9 + 1) * 100000); -// String url=m.print("4004872261", PrintOilOrderReport.printOilOrder(), "Z"+System.currentTimeMillis()+random6.toString()); - printerService.oilOrderReport(oilOrder,TokenUtil.getNowAccountInfo().getStoreId()); - - } - - @PostMapping("rePrintOilOrderReport") - public void reOilOrderReport(@RequestBody Map oilOrder) { - printerService.reOilOrderReport(oilOrder,TokenUtil.getNowAccountInfo().getStoreId()); - } - /** - * 余额充值订单 - * @param cardValue - */ - @PostMapping("printCardValueReport") - public void printCardValueReport(@RequestBody Map cardValue) { -// log.info("handover:{}",cardValue.toString()); -// Methods m=Methods.getInstance(); -// m.init("26845ee50f13467cacbaa099489a2fc152abd6f5"); -// -// m.init(APP_KEY, APP_SECRET); -// PrintCardValueReport.setHandover(cardValue); -// Integer random6 = (int) ((Math.random() * 9 + 1) * 100000); -// String url=m.print("4004872261", PrintCardValueReport.printOilOrder(), "Z"+System.currentTimeMillis()+random6.toString()); - printerService.printCardValueReport(cardValue, TokenUtil.getNowAccountInfo().getStoreId()); - - } - /** - * 油卡充值订单 - * @param fuelDiesel - */ - @PostMapping("printFuelDieselReport") - public void printFuelDieselReport(@RequestBody Map fuelDiesel) { -// log.info("handover:{}",fuelDiesel.toString()); -// Methods m=Methods.getInstance(); -// m.init("26845ee50f13467cacbaa099489a2fc152abd6f5"); -// -// m.init(APP_KEY, APP_SECRET); -// PrintFuelDieselReport.setHandover(fuelDiesel); -// Integer random6 = (int) ((Math.random() * 9 + 1) * 100000); -// String url=m.print("4004872261", PrintFuelDieselReport.printFeulOrder(), "Z"+System.currentTimeMillis()+random6.toString()); - printerService.printFuelDieselReport(fuelDiesel,TokenUtil.getNowAccountInfo().getStoreId()); - - } - @PostMapping("printIntegralReport") - public void printIntegralReport(@RequestBody Map integral) { - printerService.printIntegralReport(integral,TokenUtil.getNowAccountInfo().getStoreId()); - - } -} diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/printer/entity/PrintDeviceInfo.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/printer/entity/PrintDeviceInfo.java deleted file mode 100644 index ee8c684ea..000000000 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/printer/entity/PrintDeviceInfo.java +++ /dev/null @@ -1,83 +0,0 @@ -package com.fuint.business.printer.entity; - -import java.util.Date; -import com.fuint.repository.model.base.BaseEntity; -import lombok.Data; - -/** - * (PrintDeviceInfo)实体类 - * - * @author wangh - * @since 2024-04-29 17:31:03 - */ -@Data -public class PrintDeviceInfo extends BaseEntity { - private static final long serialVersionUID = -94445696460905744L; - - private Integer id; -/** - * 设备终端号 - */ - private String machineCode; -/** - * 设备密钥 - */ - private String msign; -/** - * 设备名称 - */ - private String deviceName; -/** - * 用户id - */ - private String userId; -/** - * 应用id(APP_KEY) - */ - private String appKey; -/** - * 应用密钥(APP_SECRET) - */ - private String appSecret; -/** - * 应用公钥(key) - */ - private String appPublicKey; -/** - * 平台公钥(publicKey) - */ - private String platformPublicKey; -/** - * token - */ - private String accessToken; -/** - * 付款二维码：域名+storeId - */ - private String payment; - private Boolean isAcquiesce; - -/** - * 店铺id - */ - private Integer storeId; - - - - - - - - - - - - - - - - - - -} - diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/printer/entity/Test.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/printer/entity/Test.java deleted file mode 100644 index ec51fa6d9..000000000 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/printer/entity/Test.java +++ /dev/null @@ -1,51 +0,0 @@ -package com.fuint.business.printer.entity; - -/** - * 菜品对象 - * @author admin - * - */ -public class Test { - // 菜品名称 - private String name; - // 价格 - private double money; - // 数量 - private Integer num; - //菜品分类 - private String fenlei; - public Test() { - super(); - } - public Test(String name, double money, Integer num,String fenlei) { - super(); - this.name = name; - this.money = money; - this.num = num; - this.fenlei=fenlei; - } - public String getName() { - return name; - } - public void setName(String name) { - this.name = name; - } - public double getMoney() { - return money; - } - public void setMoney(double money) { - this.money = money; - } - public Integer getNum() { - return num; - } - public void setNum(Integer num) { - this.num = num; - } - public String getFenlei() { - return fenlei; - } - public void setFenlei(String fenlei) { - this.fenlei = fenlei; - } -} diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/printer/mapper/PrintDeviceInfoMapper.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/printer/mapper/PrintDeviceInfoMapper.java deleted file mode 100644 index 6b6aaae60..000000000 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/printer/mapper/PrintDeviceInfoMapper.java +++ /dev/null @@ -1,90 +0,0 @@ -package com.fuint.business.printer.mapper; - -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.fuint.business.printer.entity.PrintDeviceInfo; -import org.apache.ibatis.annotations.Param; -import org.springframework.data.domain.Pageable; -import java.util.List; - -/** - * (PrintDeviceInfo)表数据库访问层 - * - * @author wangh - * @since 2024-04-29 17:31:02 - */ -public interface PrintDeviceInfoMapper { - - /** - * 通过ID查询单条数据 - * - * @param id 主键 - * @return 实例对象 - */ - PrintDeviceInfo queryById(Integer id); - PrintDeviceInfo getInfoByStoreId(Integer storeId); - - /** - * 查询指定行数据 - * - * @param printDeviceInfo 查询条件 - * @param page 分页对象 - * @return 对象列表 - */ - IPage queryAllByLimit(@Param("page") Page page, @Param("printDeviceInfo") PrintDeviceInfo printDeviceInfo); - - /** - * 统计总行数 - * - * @param printDeviceInfo 查询条件 - * @return 总行数 - */ - long count(PrintDeviceInfo printDeviceInfo); - - /** - * 新增数据 - * - * @param printDeviceInfo 实例对象 - * @return 影响行数 - */ - int insert(PrintDeviceInfo printDeviceInfo); - - /** - * 批量新增数据（MyBatis原生foreach方法） - * - * @param entities List 实例对象列表 - * @return 影响行数 - */ - int insertBatch(@Param("entities") List entities); - - /** - * 批量新增或按主键更新数据（MyBatis原生foreach方法） - * - * @param entities List 实例对象列表 - * @return 影响行数 - * @throws org.springframework.jdbc.BadSqlGrammarException 入参是空List的时候会抛SQL语句错误的异常，请自行校验入参 - */ - int insertOrUpdateBatch(@Param("entities") List entities); - - /** - * 修改数据 - * - * @param printDeviceInfo 实例对象 - * @return 影响行数 - */ - int update(PrintDeviceInfo printDeviceInfo); - - /** - * 通过主键删除数据 - * - * @param id 主键 - * @return 影响行数 - */ - int deleteById(Integer id); - int updateIsAcquiesce(Integer storeId); - int getIsAcquiesceByStoreId(Integer storeId); - - - -} - diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/printer/mapper/xml/PrintDeviceInfoMapper.xml b/fuintBackend/fuint-application/src/main/java/com/fuint/business/printer/mapper/xml/PrintDeviceInfoMapper.xml deleted file mode 100644 index 00673b47e..000000000 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/printer/mapper/xml/PrintDeviceInfoMapper.xml +++ /dev/null @@ -1,217 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - insert into print_device_info(is_acquiesce,machine_code,msign,device_name,user_id,app_key,app_secret,app_public_key,platform_public_key,access_token,payment,create_time,update_time,create_by,update_by,store_id ) - values (#{is_acquiesce},#{machineCode},#{msign},#{deviceName},#{userId}, - #{appKey},#{appSecret},#{appPublicKey},#{platformPublicKey},#{accessToken},#{payment}, - #{createTime},#{updateTime},#{createBy},#{updateBy},#{storeId}) - - - - insert into print_device_info(machine_code,msign,device_name,user_id,app_key,app_secret,app_public_key,platform_public_key,access_token,payment,create_time,update_time,create_by,update_by,store_id ) - values - - ( - #{entity.machineCode}#{entity.msign}#{entity.deviceName}#{entity.userId}#{entity.appKey}#{entity.appSecret}#{entity.appPublicKey}#{entity.platformPublicKey}#{entity.accessToken}#{entity.payment}#{entity.createTime}#{entity.updateTime}#{entity.createBy}#{entity.updateBy}#{entity.storeId} - ) - - - - - insert into print_device_info(machine_code,msign,device_name,user_id,app_key,app_secret,app_public_key,platform_public_key,access_token,payment,create_time,update_time,create_by,update_by,store_id ) - values - - (#{entity.machineCode}#{entity.msign}#{entity.deviceName}#{entity.userId}#{entity.appKey}#{entity.appSecret}#{entity.appPublicKey}#{entity.platformPublicKey}#{entity.accessToken}#{entity.payment}#{entity.createTime}#{entity.updateTime}#{entity.createBy}#{entity.updateBy}#{entity.storeId}) - - on duplicate key update -machine_code = values(machine_code)msign = values(msign)device_name = values(device_name)user_id = values(user_id)app_key = values(app_key)app_secret = values(app_secret)app_public_key = values(app_public_key)platform_public_key = values(platform_public_key)access_token = values(access_token)payment = values(payment)create_time = values(create_time)update_time = values(update_time)create_by = values(create_by)update_by = values(update_by)store_id = values(store_id) - - - - - update print_device_info - - - machine_code = #{machineCode}, - - - msign = #{msign}, - - - device_name = #{deviceName}, - - - user_id = #{userId}, - - - app_key = #{appKey}, - - - app_secret = #{appSecret}, - - - app_public_key = #{appPublicKey}, - - - platform_public_key = #{platformPublicKey}, - - - access_token = #{accessToken}, - - - payment = #{payment}, - - - create_time = #{createTime}, - - - update_time = #{updateTime}, - - - create_by = #{createBy}, - - - update_by = #{updateBy}, - - - store_id = #{storeId}, - - - is_acquiesce = #{isAcquiesce}, - - - where id = #{id} - - - - - delete from print_device_info where id = #{id} - - - update print_device_info set is_acquiesce = false where store_id = #{storeId} - - - - - - diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/printer/service/PrintDeviceInfoService.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/printer/service/PrintDeviceInfoService.java deleted file mode 100644 index 6d3d16914..000000000 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/printer/service/PrintDeviceInfoService.java +++ /dev/null @@ -1,58 +0,0 @@ -package com.fuint.business.printer.service; - -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.fuint.business.printer.entity.PrintDeviceInfo; -import io.lettuce.core.dynamic.annotation.Param; - - -/** - * (PrintDeviceInfo)表服务接口 - * - * @author wangh - * @since 2024-04-29 17:31:03 - */ -public interface PrintDeviceInfoService { - - /** - * 通过ID查询单条数据 - * - * @param id 主键 - * @return 实例对象 - */ - PrintDeviceInfo queryById(Integer id); - - /** - * 分页查询 - * - * @param printDeviceInfo 筛选条件 - * @param page 分页对象 - * @return 查询结果 - */ - IPage queryByPage(@Param("page") Page page, PrintDeviceInfo printDeviceInfo); - - /** - * 新增数据 - * - * @param printDeviceInfo 实例对象 - * @return 实例对象 - */ - PrintDeviceInfo insert(PrintDeviceInfo printDeviceInfo); - - /** - * 修改数据 - * - * @param printDeviceInfo 实例对象 - * @return 实例对象 - */ - PrintDeviceInfo update(PrintDeviceInfo printDeviceInfo); - - /** - * 通过主键删除数据 - * - * @param id 主键 - * @return 是否成功 - */ - boolean deleteById(Integer id); - -} diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/printer/service/PrinterService.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/printer/service/PrinterService.java deleted file mode 100644 index c6cbf89c3..000000000 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/printer/service/PrinterService.java +++ /dev/null @@ -1,36 +0,0 @@ -package com.fuint.business.printer.service; - -import org.springframework.web.bind.annotation.RequestParam; - -import java.math.BigDecimal; -import java.util.Map; - -public interface PrinterService { - - Map PostPush( - @RequestParam("ciphertext") String ciphertext, - @RequestParam("nonce") String nonce, - @RequestParam("tag") String tag, - @RequestParam("additional_data") String additional_data, - @RequestParam("iv") String iv, - @RequestParam("signature") String signature); - - String returnCode(String payAmount); - - String getToken(Integer storeId); - - String printIndex(BigDecimal payAmount,Integer storeId); - - void getHandover(Map handover,Integer storeId); - void oilOrderReport(Map handover,Integer storeId); - void reOilOrderReport(Map oilOrder, Integer storeId); - void printTagReport(Map integral,Integer storeId); - - - void printCardValueReport(Map printCardValue,Integer storeId); - void printFuelDieselReport(Map printCardValue,Integer storeId); - - - void printIntegralReport(Map integral, Integer storeId); - -} diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/printer/service/impl/PrintDeviceInfoServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/printer/service/impl/PrintDeviceInfoServiceImpl.java deleted file mode 100644 index 7785f2af8..000000000 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/printer/service/impl/PrintDeviceInfoServiceImpl.java +++ /dev/null @@ -1,96 +0,0 @@ -package com.fuint.business.printer.service.impl; - -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.fuint.business.printer.entity.PrintDeviceInfo; -import com.fuint.business.printer.mapper.PrintDeviceInfoMapper; -import com.fuint.business.printer.service.PrintDeviceInfoService; -import org.springframework.stereotype.Service; -import com.fuint.common.util.TokenUtil; -import io.lettuce.core.dynamic.annotation.Param; -import com.fuint.common.dto.AccountInfo; - - - -import javax.annotation.Resource; - -/** - * (PrintDeviceInfo)表服务实现类 - * - * @author wangh - * @since 2024-04-29 17:31:03 - */ -@Service("printDeviceInfoService") -public class PrintDeviceInfoServiceImpl implements PrintDeviceInfoService { - @Resource - private PrintDeviceInfoMapper printDeviceInfoMapper; - - /** - * 通过ID查询单条数据 - * - * @param id 主键 - * @return 实例对象 - */ - @Override - public PrintDeviceInfo queryById(Integer id) { - return this.printDeviceInfoMapper.queryById(id); - } - - /** - * 分页查询 - * - * @param printDeviceInfo 筛选条件 - * @param page 分页对象 - * @return 查询结果 - */ - @Override - public IPage queryByPage(@Param("page") Page page, PrintDeviceInfo printDeviceInfo) { - AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo(); - printDeviceInfo.setStoreId(nowAccountInfo.getStoreId()); - return this.printDeviceInfoMapper.queryAllByLimit(page, printDeviceInfo); - } - - /** - * 新增数据 - * - * @param printDeviceInfo 实例对象 - * @return 实例对象 - */ - @Override - public PrintDeviceInfo insert(PrintDeviceInfo printDeviceInfo) { - AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo(); - printDeviceInfo.setStoreId(nowAccountInfo.getStoreId()); - if (printDeviceInfo.getIsAcquiesce()) { - printDeviceInfoMapper.updateIsAcquiesce(nowAccountInfo.getStoreId()); - } - this.printDeviceInfoMapper.insert(printDeviceInfo); - return printDeviceInfo; - } - - /** - * 修改数据 - * - * @param printDeviceInfo 实例对象 - * @return 实例对象 - */ - @Override - public PrintDeviceInfo update(PrintDeviceInfo printDeviceInfo) { - if (printDeviceInfo.getIsAcquiesce()) { - AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo(); - printDeviceInfoMapper.updateIsAcquiesce(nowAccountInfo.getStoreId()); - } - this.printDeviceInfoMapper.update(printDeviceInfo); - return this.queryById(printDeviceInfo.getId()); - } - - /** - * 通过主键删除数据 - * - * @param id 主键 - * @return 是否成功 - */ - @Override - public boolean deleteById(Integer id) { - return this.printDeviceInfoMapper.deleteById(id) > 0; - } -} 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 deleted file mode 100644 index 50bf3268a..000000000 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/printer/service/impl/PrinterServiceImpl.java +++ /dev/null @@ -1,474 +0,0 @@ -package com.fuint.business.printer.service.impl; - -import cn.hutool.core.util.ObjectUtil; -import com.alibaba.fastjson.JSON; -import com.alibaba.fastjson.JSONObject; -import com.alipay.api.internal.util.codec.Base64; -import com.fuint.business.printer.entity.PrintDeviceInfo; -import com.fuint.business.printer.mapper.PrintDeviceInfoMapper; -import com.fuint.business.printer.service.PrintDeviceInfoService; -import com.fuint.business.printer.service.PrinterService; -import com.fuint.business.printer.template.*; -import com.fuint.business.printer.unit.Methods; -import com.fuint.business.printer.vo.OrderPayment; -import com.fuint.common.util.RedisUtil; -import com.google.gson.Gson; -import com.google.gson.GsonBuilder; -import com.yly.print_sdk_library.RequestMethod; -import lombok.extern.slf4j.Slf4j; -import org.springframework.context.annotation.Lazy; -import org.springframework.stereotype.Service; -import org.springframework.web.bind.annotation.RequestBody; - -import javax.annotation.Resource; -import javax.crypto.Cipher; -import javax.crypto.spec.GCMParameterSpec; -import javax.crypto.spec.SecretKeySpec; -import java.math.BigDecimal; -import java.nio.charset.StandardCharsets; -import java.security.GeneralSecurityException; -import java.security.KeyFactory; -import java.security.PublicKey; -import java.security.Signature; -import java.security.spec.X509EncodedKeySpec; -import java.util.HashMap; -import java.util.Map; - -@Slf4j -@Service -public class PrinterServiceImpl implements PrinterService { - - private static String code = new String(); - - public static final String publicKey = "MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuiQQsY9lbZhtRoZIaBVN\n" + - "XKuAme47UCUv3RG2AYJXKQ/TyXBBY0JULSf4637Ug7JqGR1ohHFpY9XotG5J/7Ne\n" + - "safQApAz8QHKOa6+jqS0edafegjE7P0KqfQWvjUIbhAl5iXmiGLA/R6zLXxk8+PU\n" + - "toRu1rmzMPCsbGRG0uHOZ0nYez1LSM4k4k8o4/dl7NDr2CqXrfYQCEvGAAJay/bg\n" + - "h1B05cqFNuhQGvv55EX377QVZX7V0ZipIZhlzoh8pA0ZpzW/KndZ+pRYw6cPLvey\n" + - "qymRnTlCSQUDYQRlxaDppPbZcU1Krb9tZUmhJp+R9l73tJX8yN5wzbq6HATZbD1v\n" + - "BwIDAQAB"; - - - @Resource - PrintDeviceInfoService printDeviceInfoService; - @Resource - PrintDeviceInfoMapper printDeviceInfoMapper; - - @Override - public Map PostPush(String ciphertext, String nonce, String tag, String additional_data, String iv, String signature) { - System.out.println("PostMapping"+ciphertext); - code = new String(); - Map objectObjectHashMap = new HashMap<>(); - objectObjectHashMap.put("message","ok"); - verifySign(ciphertext,signature); - try { - String decrypte = decrypte(ciphertext, iv, tag); - // 使用 Fastjson 将 JSON 字符串解析为 JSONObject - JSONObject jsonObject = JSON.parseObject(decrypte); - - // 将 JSONObject 转换为 Map - Map map = jsonObject.getInnerMap(); - //获取支付参数 - Map orderPaymentMap = (Map) map.get("order_payment"); - OrderPayment orderPayment = new OrderPayment(); - 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); - code = orderPaymentMap.get("scanned_code").toString(); - log.info("--获取打印回调--{}",jsonObject); - } catch (Exception e) { - throw new RuntimeException(e); - } - return objectObjectHashMap; - } - - @Override - public String returnCode(String payAmount) { - String thisCode = code; - code = new String(); - if (ObjectUtil.isEmpty(thisCode)) { - return "300"; - } - // if (RedisUtil.get(thisCode)) { - return thisCode; - // }else { - // return getSuccessResult("301"); - // } - - } - - - @Override - public String getToken(Integer storeId) { - PrintDeviceInfo infoByStoreId = printDeviceInfoMapper.getInfoByStoreId(storeId); - if (ObjectUtil.isEmpty(infoByStoreId)){ - return "error"; - } - RequestMethod.getInstance().init(infoByStoreId.getAppKey(),infoByStoreId.getAppSecret()); - - try { -// String resJson = RequestMethod.getInstance().scanCodeModel_msign("4004872261", "628023865417"); - String resJson = RequestMethod.getInstance().scanCodeModel_msign(infoByStoreId.getMachineCode(), infoByStoreId.getMsign()); - log.info("--yilianyunAccessToken--{}",resJson); - - JSONObject jsonObject = JSONObject.parseObject(resJson); - String errorDescription = jsonObject.getString("error_description"); // success - if ("success".equals(errorDescription)) { - JSONObject body = jsonObject.getJSONObject("body"); - String accessToken = body.getString("access_token"); - RedisUtil.set("scancodemodel+"+storeId,accessToken,60*60*24); - return accessToken; - } - } catch (Exception e) { - e.printStackTrace(); - throw new RuntimeException(e); - } - return "error"; - } - - - @Override - public String printIndex(BigDecimal payAmount,Integer storeId){ - Methods m=Methods.getInstance(); - Object accessToken = RedisUtil.get("scancodemodel+" + storeId); - if (ObjectUtil.isNotEmpty(accessToken)) { - m.init(accessToken.toString()); - } else { - String token = getToken(storeId); - if ("error".equals(token)) { - throw new RuntimeException("获取参数失败,无法打印"); - }else { - m.init(token); - } - } - PrintDeviceInfo infoByStoreId = printDeviceInfoMapper.getInfoByStoreId(storeId); - m.init(infoByStoreId.getAppKey(), infoByStoreId.getAppSecret()); - Integer random6 = (int) ((Math.random() * 9 + 1) * 100000); - -// HashMap objectObjectHashMap = new HashMap<>(); - Map orderPaymentMap = new HashMap<>(); - orderPaymentMap.put("pay_amount", payAmount); -// orderPaymentMap.put("pay_amount", 0.01); - - orderPaymentMap.put("pay_amount_source", 3); - Map processedStateMap = new HashMap<>(); - processedStateMap.put("processed_state", 0); - Map jsonDataMap = new HashMap<>(); - jsonDataMap.put("order_payment", orderPaymentMap); - jsonDataMap.putAll(processedStateMap); - - Gson gson = new GsonBuilder().setPrettyPrinting().create(); - String json = gson.toJson(jsonDataMap); - - String jsonData = ""+json+""; - log.info("json:{}",jsonData); - - String url=m.print(infoByStoreId.getMachineCode(),jsonData, System.currentTimeMillis()+random6.toString()); - - // 使用 Fastjson 将 JSON 字符串解析为 JSONObject - JSONObject jsonObject = JSON.parseObject(url); - - // 将 JSONObject 转换为 Map - Map map = jsonObject.getInnerMap(); - //获取支付参数 - log.info("url:{}",url); - if (ObjectUtil.isNotEmpty(url)) { - String error = jsonObject.getString("error"); - if ("18".equals(error)) { - getToken(storeId); - printIndex(payAmount,storeId); - } - - } - return map.get("error_description").toString(); - } - - // 打印交接班 - public void getHandover(Map handover,Integer storeId) { - PrintDeviceInfo infoByStoreId = printDeviceInfoMapper.getInfoByStoreId(storeId); - - Methods m=Methods.getInstance(); - Object accessToken = RedisUtil.get("scancodemodel+" + storeId); - if (ObjectUtil.isNotEmpty(accessToken)) { - m.init(accessToken.toString()); - } else { - String token = getToken(storeId); - if ("error".equals(token)) { - throw new RuntimeException("获取参数失败,无法打印"); - }else { - m.init(token); - } - } - m.init(infoByStoreId.getAppKey(), infoByStoreId.getAppSecret()); - Handover.setHandover(handover); - Integer random6 = (int) ((Math.random() * 9 + 1) * 100000); - String url=m.print(infoByStoreId.getMachineCode(), Handover.printHandover(), "Z"+System.currentTimeMillis()+random6.toString()); - - } - - public void oilOrderReport(Map oilOrder,Integer storeId) { - PrintDeviceInfo infoByStoreId = printDeviceInfoMapper.getInfoByStoreId(storeId); - - Methods m=Methods.getInstance(); - Object accessToken = RedisUtil.get("scancodemodel+" + storeId); - if (ObjectUtil.isNotEmpty(accessToken)) { - m.init(accessToken.toString()); - } else { - String token = getToken(storeId); - if ("error".equals(token)) { - throw new RuntimeException("获取参数失败,无法打印"); - }else { - m.init(token); - } } - m.init(infoByStoreId.getAppKey(), infoByStoreId.getAppSecret()); - PrintOilOrderReport.setHandover(oilOrder); - Integer random6 = (int) ((Math.random() * 9 + 1) * 100000); - String url=m.print(infoByStoreId.getMachineCode(), PrintOilOrderReport.printOilOrder(), "Z"+System.currentTimeMillis()+random6.toString()); - if (ObjectUtil.isNotEmpty(url)) { - // 使用 Fastjson 将 JSON 字符串解析为 JSONObject - JSONObject jsonObject = JSON.parseObject(url); - - String error = jsonObject.getString("error"); - if ("18".equals(error)) { - getToken(storeId); - reOilOrderReport(oilOrder,storeId); - } - - } - } - public void reOilOrderReport(Map oilOrder,Integer storeId) { - PrintDeviceInfo infoByStoreId = printDeviceInfoMapper.getInfoByStoreId(storeId); - - Methods m=Methods.getInstance(); - Object accessToken = RedisUtil.get("scancodemodel+" + storeId); - if (ObjectUtil.isNotEmpty(accessToken)) { - m.init(accessToken.toString()); - } else { - String token = getToken(storeId); - if ("error".equals(token)) { - throw new RuntimeException("获取参数失败,无法打印"); - }else { - m.init(token); - } - } - m.init(infoByStoreId.getAppKey(), infoByStoreId.getAppSecret()); - RePrintOilOrderReport.setHandover(oilOrder); - Integer random6 = (int) ((Math.random() * 9 + 1) * 100000); - String url=m.print(infoByStoreId.getMachineCode(), RePrintOilOrderReport.rePrintOilOrder(), "Z"+System.currentTimeMillis()+random6.toString()); - if (ObjectUtil.isNotEmpty(url)) { - // 使用 Fastjson 将 JSON 字符串解析为 JSONObject - JSONObject jsonObject = JSON.parseObject(url); - - String error = jsonObject.getString("error"); - if ("18".equals(error)) { - getToken(storeId); - reOilOrderReport(oilOrder,storeId); - } - - } - - } - - public void printCardValueReport(Map cardValue,Integer storeId) { - PrintDeviceInfo infoByStoreId = printDeviceInfoMapper.getInfoByStoreId(storeId); - - log.info("handover:{}",cardValue.toString()); - Methods m=Methods.getInstance(); - Object accessToken = RedisUtil.get("scancodemodel+" + storeId); - if (ObjectUtil.isNotEmpty(accessToken)) { - m.init(accessToken.toString()); - } else { - String token = getToken(storeId); - if ("error".equals(token)) { - throw new RuntimeException("获取参数失败,无法打印"); - }else { - m.init(token); - } - } - m.init(infoByStoreId.getAppKey(), infoByStoreId.getAppSecret()); - PrintCardValueReport.setHandover(cardValue); - Integer random6 = (int) ((Math.random() * 9 + 1) * 100000); - String url=m.print(infoByStoreId.getMachineCode(), PrintCardValueReport.printOilOrder(), "Z"+System.currentTimeMillis()+random6.toString()); - if (ObjectUtil.isNotEmpty(url)) { - // 使用 Fastjson 将 JSON 字符串解析为 JSONObject - JSONObject jsonObject = JSON.parseObject(url); - - String error = jsonObject.getString("error"); - if ("18".equals(error)) { - getToken(storeId); - reOilOrderReport(cardValue,storeId); - } - - } - } - public void printFuelDieselReport(Map fuelDiesel,Integer storeId) { - PrintDeviceInfo infoByStoreId = printDeviceInfoMapper.getInfoByStoreId(storeId); - - log.info("handover:{}",fuelDiesel.toString()); - Methods m=Methods.getInstance(); - Object accessToken = RedisUtil.get("scancodemodel+" + storeId); - if (ObjectUtil.isNotEmpty(accessToken)) { - m.init(accessToken.toString()); - } else { - String token = getToken(storeId); - if ("error".equals(token)) { - throw new RuntimeException("获取参数失败,无法打印"); - }else { - m.init(token); - } - } - m.init(infoByStoreId.getAppKey(), infoByStoreId.getAppSecret()); - PrintFuelDieselReport.setHandover(fuelDiesel); - Integer random6 = (int) ((Math.random() * 9 + 1) * 100000); - String url=m.print(infoByStoreId.getMachineCode(), PrintFuelDieselReport.printFeulOrder(), "Z"+System.currentTimeMillis()+random6.toString()); - if (ObjectUtil.isNotEmpty(url)) { - // 使用 Fastjson 将 JSON 字符串解析为 JSONObject - JSONObject jsonObject = JSON.parseObject(url); - - String error = jsonObject.getString("error"); - if ("18".equals(error)) { - getToken(storeId); - reOilOrderReport(fuelDiesel,storeId); - } - - } - } - - public void printIntegralReport(Map integral,Integer storeId) { - PrintDeviceInfo infoByStoreId = printDeviceInfoMapper.getInfoByStoreId(storeId); - - log.info("handover:{}",integral.toString()); - Methods m=Methods.getInstance(); - Object accessToken = RedisUtil.get("scancodemodel+" + storeId); - if (ObjectUtil.isNotEmpty(accessToken)) { - m.init(accessToken.toString()); - } else { - String token = getToken(storeId); - if ("error".equals(token)) { - throw new RuntimeException("获取参数失败,无法打印"); - }else { - m.init(token); - } - } - m.init(infoByStoreId.getAppKey(), infoByStoreId.getAppSecret()); - PrintIntegralReport.setHandover(integral); - Integer random6 = (int) ((Math.random() * 9 + 1) * 100000); - String url=m.print(infoByStoreId.getMachineCode(), PrintIntegralReport.printIntegral(), "Z"+System.currentTimeMillis()+random6.toString()); - if (ObjectUtil.isNotEmpty(url)) { - // 使用 Fastjson 将 JSON 字符串解析为 JSONObject - JSONObject jsonObject = JSON.parseObject(url); - - String error = jsonObject.getString("error"); - if ("18".equals(error)) { - getToken(storeId); - reOilOrderReport(integral,storeId); - } - - } - } - public void printTagReport(Map integral,Integer storeId) { - PrintDeviceInfo infoByStoreId = printDeviceInfoMapper.getInfoByStoreId(storeId); - - log.info("handover:{}",integral.toString()); - Methods m=Methods.getInstance(); - Object accessToken = RedisUtil.get("scancodemodel+" + storeId); - if (ObjectUtil.isNotEmpty(accessToken)) { - m.init(accessToken.toString()); - } else { - String token = getToken(storeId); - if ("error".equals(token)) { - throw new RuntimeException("获取参数失败,无法打印"); - }else { - m.init(token); - } - } - m.init(infoByStoreId.getAppKey(), infoByStoreId.getAppSecret()); -// PrintIntegralReport.setHandover(integral); - - StringBuilder sb=new StringBuilder(); - sb.append("
收款码打印\r\n
"); - sb.append("------------------------------------\r\n"); - sb.append("油枪：￥"+integral.get("gunName")+"\r\n"); - sb.append("升数：￥"+integral.get("oilNum")+"\r\n"); - sb.append("价格：￥"+integral.get("payAmount")+"\r\n"); - sb.append("------------------------------------\r\n"); - sb.append("
谢谢惠顾，欢迎下次光临！
"); - - Integer random6 = (int) ((Math.random() * 9 + 1) * 100000); - String url=m.print(infoByStoreId.getMachineCode(), sb.toString(), "Z"+System.currentTimeMillis()+random6.toString()); - if (ObjectUtil.isNotEmpty(url)) { - // 使用 Fastjson 将 JSON 字符串解析为 JSONObject - JSONObject jsonObject = JSON.parseObject(url); - - String error = jsonObject.getString("error"); - if ("18".equals(error)) { - getToken(storeId); - reOilOrderReport(integral,storeId); - } - - } - } - - - public void verifySign(String ciphertext, String signature) { - // 交易报文中ciphertext与signature - byte[] signatureByte = Base64.decodeBase64String(signature); - byte[] publicKeyByte = Base64.decodeBase64String(publicKey); - try { - System.out.println("验签结果：" + verify(ciphertext.getBytes(), signatureByte, publicKeyByte)); - boolean verify = verify(ciphertext.getBytes(), signatureByte, publicKeyByte); - } catch (GeneralSecurityException e) { - e.printStackTrace(); - } - } - - /** - * 第二步：解析参数 - */ - public String decrypte(String ciphertext, - String iv, - String tag) throws Exception { - // 交易报文中ciphertext与tag和iv -// String ciphertext = ""; -// String tag = ""; -// String iv = ""; - // 应用设置 -> K8推送 -> 设置 -> 接口加签名方式（密钥） -> 应用公钥 - String key = "e0292ae66d9d21feaa895370d3a875aa"; - try { - String plaintext = decrypte(Base64.decodeBase64String(ciphertext), key.getBytes(), iv.getBytes(), Base64.decodeBase64String(tag)); - System.out.println(plaintext); - return plaintext; - } catch (Exception e) { - throw new Exception(e); - } - } - - private static boolean verify(byte[] data, byte[] signature, byte[] publicKey) throws GeneralSecurityException { - X509EncodedKeySpec pubKeySpec = new X509EncodedKeySpec(publicKey); - KeyFactory keyFactory = KeyFactory.getInstance("RSA"); - PublicKey pubKey = keyFactory.generatePublic(pubKeySpec); - Signature sig = Signature.getInstance("SHA256withRSA"); - sig.initVerify(pubKey); - sig.update(data); - return sig.verify(signature); - } - - /** - * AES-GCM-256对称解密 - */ - private static String decrypte(byte[] encryptedBytes, byte[] keyBytes, byte[] ivBytes, byte[] tagBytes) throws Exception { - - SecretKeySpec secretKey = new SecretKeySpec(keyBytes, "AES"); - Cipher cipher = Cipher.getInstance("AES/GCM/NoPadding"); - GCMParameterSpec gcmParameterSpec = new GCMParameterSpec(128, ivBytes); - cipher.init(Cipher.DECRYPT_MODE, secretKey, gcmParameterSpec); - cipher.updateAAD("transaction".getBytes(StandardCharsets.UTF_8)); - cipher.update(encryptedBytes); - byte[] decryptedBytes = cipher.doFinal(tagBytes); - String decryptedString = new String(decryptedBytes, StandardCharsets.UTF_8); - byte[] content = Base64.decodeBase64String(decryptedString); - return new String(content); - } - -} diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/printer/template/Handover.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/printer/template/Handover.java deleted file mode 100644 index 2c77a3da7..000000000 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/printer/template/Handover.java +++ /dev/null @@ -1,599 +0,0 @@ -package com.fuint.business.printer.template; - -import cn.hutool.core.util.ObjectUtil; -import com.fuint.business.printer.entity.Test; -import com.fuint.common.util.TscLibDll; - -import java.math.BigDecimal; -import java.util.*; - -/** - * 小票模板 - * - * @author admin - * - */ -public class Handover { - // 菜品集合--传入一个商品集合 - public static List testList = new ArrayList(); - public static Map handover = new HashMap<>(); - public static double ZMoney=0; - public static double YMoney=20; - public static double SMoney=500; - // 设置小票打印 - public static String printHandover(){ - //字符串拼接 - StringBuilder sb=new StringBuilder(); - sb.append("
交班统计\r\n
"); -// sb.append("
----------------------\r\n
"); - sb.append("--------------------------------\r\n"); - - sb.append(baseInfo()); - sb.append("--------------------------------\r\n"); - sb.append("--------------------------------\r\n"); - - sb.append(orderSummary()); - sb.append("--------------------------------\r\n"); - - sb.append(paymentAggregationMap()); - sb.append("--------------------------------\r\n"); - sb.append(oilNumberStatisticsMap()); - sb.append("--------------------------------\r\n"); - - sb.append(greaseGunStatisticsMap()); - sb.append("--------------------------------\r\n"); - - sb.append(employeeStatisticsMap()); - sb.append("--------------------------------\r\n"); - - sb.append(billingDetailsMap()); - sb.append("--------------------------------\r\n"); - - sb.append(returnedToTheAccountMap()); - sb.append("--------------------------------\r\n"); - - - -// sb.append("
----------------------\r\n
"); - sb.append("
谢谢惠顾，欢迎下次光临！
"); - return sb.toString(); - } - public static List getTestList() { - return testList; - } - public static void setTestList(List testList) { - Handover.testList = testList; - } - - public static Map getHandover() { - return handover; - } - public static void setHandover(Map handover) { - Handover.handover = handover; - } - // 数据解析组装 - - public static String baseInfo() { - StringBuilder sb=new StringBuilder(); - Map baseInfo = (Map)handover.get("baseInfo"); - sb.append("油站名称：\t" + Optional.ofNullable(baseInfo.get("storeName")).orElse("未知油站") + "\r\n"); - sb.append("收银员：\t"+ Optional.ofNullable(baseInfo.get("realName")).orElse("未知姓名")+"\r\n"); - sb.append("交班方式：\t"+Optional.ofNullable(baseInfo.get("handoverType")).orElse("未知")+"\r\n"); - sb.append("开始时间：\t"+Optional.ofNullable(baseInfo.get("startTime")).orElse("-")+"\r\n"); - sb.append("结束时间：\t"+Optional.ofNullable(baseInfo.get("endTime")).orElse("-")+"\r\n"); - sb.append("--------------------------------\r\n"); - sb.append("当前版本：\t"+"V1.0.1\r\n"); - return sb.toString(); - } - - public static String orderSummary() { - StringBuilder sb=new StringBuilder(); - sb.append("**订单汇总**\r\n"); - - Map orderSummary = (Map)handover.get("orderSummary"); - - sb.append("订单汇总\r\n"); - sb.append(""); - - String[] type = { - "油品订单(订单):", "油品订单(退款):￥", "油品订单(实收):￥", - "会员储值(订单):￥", "会员储值(实收):￥", "储值赠送(订单):￥", "储值赠送(实际):￥", - "存油储值(订单):￥", "存油储值(实收):￥", - "普通收款(订单):￥", "普通收款(退款):￥", "普通收款(实收):￥", - }; - String[] price = { - "oilOrder", "oilRefund", "oilPaid", - "cardOrder", "cardPaid", "cardGiftOrder","cardGiftPaid", - "fuelOrder", "fuelPaid", - "goodsOrder", "goodsRefund", "goodsPaid", - }; - for (int i = 0; i < type.length; i++) { - sb.append(""); - sb.append(""); - sb.append(""); - sb.append(""); - } - sb.append("
类型金额
"+type[i]+""+Optional.ofNullable(orderSummary.get(price[i])).orElse("0")+"
"); - return sb.toString(); - - } - - public static String paymentAggregationMap() { - StringBuilder sb=new StringBuilder(); - - List> paymentAggregationMap = (List>)handover.get("paymentAggregation"); - - List> paymentAggregationAll = paymentAggregation("all", paymentAggregationMap); - sb.append("**退款汇总**\r\n"); - - sb.append(""); - - - if (ObjectUtil.isNotEmpty(paymentAggregationAll)) { - for (Map stringObjectMap : paymentAggregationAll) { - if (Double.parseDouble(stringObjectMap.get("refundAmount").toString()) > 0) { - sb.append(""); - sb.append(""); - sb.append(""); - sb.append(""); - } - } - } - sb.append("
支付方式退款金额
"+calculatePaymentMethod(stringObjectMap.get("payType").toString())+""+Optional.ofNullable(stringObjectMap.get("refundAmount")).orElse("0")+"
"); - sb.append("合计：" + refundAggregateTotal(paymentAggregationAll) + "\r\n"); - sb.append("--------------------------------\r\n"); - - sb.append("**实收汇总**\r\n"); - - sb.append(""); - if (ObjectUtil.isNotEmpty(paymentAggregationAll)) { - for (Map stringObjectMap : paymentAggregationAll) { - sb.append(""); - sb.append(""); - } - } - sb.append("
支付方式金额
"+calculatePaymentMethod(stringObjectMap.get("payType").toString()).toString()+""+Optional.ofNullable(stringObjectMap.get("paidAmount")).orElse("0").toString()+"
"); - sb.append("合计：\t" + totalTotalOfActualReceipts(paymentAggregationAll) + "\r\n"); - - - sb.append("--------------------------------\r\n"); - - sb.append("**油品订单**\r\n"); - - sb.append(""); - List> paymentAggregationOil = paymentAggregation("oil", paymentAggregationMap); - - if (ObjectUtil.isNotEmpty(paymentAggregationOil)) { - for (Map stringObjectMap : paymentAggregationOil) { - sb.append(""); - sb.append(""); - } - } - sb.append("
支付方式金额
"+calculatePaymentMethod(stringObjectMap.get("payType").toString())+""+Optional.ofNullable(stringObjectMap.get("paidAmount")).orElse("0")+"
"); - sb.append("合计：\t" + totalOilOrders(paymentAggregationOil)+ "\r\n"); - sb.append("--------------------------------\r\n"); - - sb.append("**商品订单**\r\n"); - sb.append(""); - List> paymentAggregationGoods = paymentAggregation("goods", paymentAggregationMap); - if (ObjectUtil.isNotEmpty(paymentAggregationGoods)) { - for (Map stringObjectMap : paymentAggregationGoods) { - sb.append(""); - sb.append(""); - - } - } - sb.append("
支付方式金额
"+calculatePaymentMethod(stringObjectMap.get("payType").toString())+""+""+Optional.ofNullable(stringObjectMap.get("paidAmount")).orElse("0")+"
"); - sb.append("合计：\t" + totalOfProductOrders(paymentAggregationAll) + "\r\n"); - sb.append("--------------------------------\r\n"); - - sb.append("**会员储值**\r\n"); - sb.append(""); - List> paymentAggregationFg = paymentAggregation("fg", paymentAggregationMap); - - if (ObjectUtil.isNotEmpty(paymentAggregationFg)) { - for (Map stringObjectMap : paymentAggregationFg) { - sb.append(""); - sb.append(""); - - } - } - sb.append("
支付方式金额
"+calculatePaymentMethod(stringObjectMap.get("payType").toString())+""+""+Optional.ofNullable(stringObjectMap.get("paidAmount")).orElse("0")+"
"); - sb.append("合计：\t" + totalMemberStoredValue(paymentAggregationFg) + "\r\n"); - - sb.append("--------------------------------\r\n"); - - sb.append("**积分商城**\r\n"); - sb.append(""); - List> paymentAggregationPoint = paymentAggregation("point", paymentAggregationMap); - - if (ObjectUtil.isNotEmpty(paymentAggregationPoint)) { - for (Map stringObjectMap : paymentAggregationPoint) { - TscLibDll.INSTANCE.sendcommand(calculatePaymentMethod(stringObjectMap.get("payType").toString())+":\t￥"+Optional.ofNullable(stringObjectMap.get("paidAmount")).orElse("0")); - sb.append(""); - sb.append(""); - - } - } - sb.append("
支付方式金额
"+calculatePaymentMethod(stringObjectMap.get("payType").toString())+""+""+Optional.ofNullable(stringObjectMap.get("paidAmount")).orElse("0")+"
"); - sb.append("合计：\t" + pointsMallStatistics(paymentAggregationAll) + "\r\n"); - - return sb.toString(); - - } - - - public static String oilNumberStatisticsMap() { - StringBuilder sb=new StringBuilder(); - sb.append("**油号统计**\r\n"); - - List> oilNumberStatisticsMap = (List>)handover.get("oilNumberStatistics"); - sb.append(""); - - if (ObjectUtil.isNotEmpty(oilNumberStatisticsMap)) { - for (Map stringObjectMap : oilNumberStatisticsMap) { - sb.append(""); - sb.append(""); - sb.append(""); - sb.append(""); - } - } - sb.append("
油号笔数升数金额
"+Optional.ofNullable(stringObjectMap.get("oilName")).orElse("未知")+""+""+Optional.ofNullable(stringObjectMap.get("numberOfDeals")).orElse("未知")+""+""+Optional.ofNullable(stringObjectMap.get("oilNum")).orElse("未知")+""+""+Optional.ofNullable(stringObjectMap.get("paidAmount")).orElse("0")+"
"); - sb.append("合计：\t" + totalOilNumberStatistics(oilNumberStatisticsMap) + "\r\n"); - - - sb.append(""); - - if (ObjectUtil.isNotEmpty(oilNumberStatisticsMap)) { - for (Map stringObjectMap : oilNumberStatisticsMap) { - TscLibDll.INSTANCE.sendcommand( - Optional.ofNullable(stringObjectMap.get("oilName")).orElse("未知") - +"\t￥"+Optional.ofNullable(stringObjectMap.get("paidDiscount")).orElse("0")); - - - sb.append(""); - sb.append(""); - - } - } - sb.append("
油品金额
"+Optional.ofNullable(stringObjectMap.get("oilName")).orElse("未知")+""+""+Optional.ofNullable(stringObjectMap.get("paidDiscount")).orElse("0")+"
"); - sb.append("合计：\t" + discountStatisticsTotal(oilNumberStatisticsMap) + "\r\n"); - return sb.toString(); - } - - - public static String greaseGunStatisticsMap() { - StringBuilder sb=new StringBuilder(); - sb.append("**油号统计**\r\n"); - - // 油枪统计 - List> greaseGunStatisticsMap = (List>)handover.get("greaseGunStatistics"); - sb.append(""); - if (ObjectUtil.isNotEmpty(greaseGunStatisticsMap)) { - for (Map stringObjectMap : greaseGunStatisticsMap) { - sb.append(""); - sb.append(""); - sb.append(""); - sb.append(""); - } - } - - sb.append("
油枪笔数升数金额
"+Optional.ofNullable(stringObjectMap.get("gunName")).orElse("未知")+""+""+Optional.ofNullable(stringObjectMap.get("numberOfDeals")).orElse("0")+""+""+Optional.ofNullable(stringObjectMap.get("oilNum")).orElse("0")+""+""+Optional.ofNullable(stringObjectMap.get("paidAmount")).orElse("0")+"
"); - sb.append("合计：\t" + totalOfOilGunStatistics(greaseGunStatisticsMap) + "\r\n"); - - return sb.toString(); - } - - public static String employeeStatisticsMap() { - StringBuilder sb=new StringBuilder(); - - List> employeeStatisticsMap = (List>)handover.get("employeeStatistics"); - sb.append("**员工统计**\r\n"); - sb.append(""); - if (ObjectUtil.isNotEmpty(employeeStatisticsMap)) { - for (Map stringObjectMap : employeeStatisticsMap) { - sb.append(""); - sb.append(""); - sb.append(""); - } - } - - sb.append("
员工姓名笔数金额
"+Optional.ofNullable(stringObjectMap.get("name")).orElse("未知")+""+""+Optional.ofNullable(stringObjectMap.get("numberOfDeals")).orElse("0")+""+""+Optional.ofNullable(stringObjectMap.get("paidAmount")).orElse("0")+"
"); - sb.append("合计：\t" + totalOfEmployeeStatistics(employeeStatisticsMap) + "\r\n"); - - return sb.toString(); - } - - - public static String billingDetailsMap() { - StringBuilder sb=new StringBuilder(); - - List> billingDetailsMap = (List>)handover.get("billingDetails"); - sb.append("**挂账统计**\r\n"); - sb.append("·····挂账详情·····\r\n"); - sb.append(""); - if (ObjectUtil.isNotEmpty(billingDetailsMap)) { - for (Map stringObjectMap : billingDetailsMap) { - sb.append(""); - sb.append(""); - sb.append(""); - } - } - - sb.append("
挂账单位笔数
"+Optional.ofNullable(stringObjectMap.get("name")).orElse("未知")+""+""+Optional.ofNullable(stringObjectMap.get("numberOfDeals")).orElse("0")+""+""+Optional.ofNullable(stringObjectMap.get("amount")).orElse("0")+"
"); - sb.append("合计：\t" + statisticsOfAccountDetails(billingDetailsMap) + "\r\n"); - - return sb.toString(); - } - - - public static String returnedToTheAccountMap() { - StringBuilder sb=new StringBuilder(); - - List> returnedToTheAccountMap = (List>)handover.get("returnedToTheAccount"); - sb.append("······归还详情······\r\n"); - sb.append(""); - if (ObjectUtil.isNotEmpty(returnedToTheAccountMap)) { - for (Map stringObjectMap : returnedToTheAccountMap) { - sb.append(""); - sb.append(""); - sb.append(""); - } - } - - sb.append("
挂账单位笔数金额
"+Optional.ofNullable(stringObjectMap.get("name")).orElse("未知")+""+""+Optional.ofNullable(stringObjectMap.get("numberOfDeals")).orElse("0")+""+""+Optional.ofNullable(stringObjectMap.get("amount")).orElse("0")+"
"); - sb.append("合计：\t" + postedAccountReturnStatistics(returnedToTheAccountMap) + "\r\n"); - - return sb.toString(); - } - public void printLocally() { - - - // 支付方式汇总 - // 油号统计 - // 油枪统计 -// List> greaseGunStatisticsMap = (List>)handover.get("greaseGunStatistics"); - // 员工统计 - // 挂账详情 - List> billingDetailsMap = (List>)handover.get("billingDetails"); - // 挂账归还 - List> returnedToTheAccountMap = (List>)handover.get("returnedToTheAccount"); - - - - } - // 订单汇总 - // 退款汇总 - public static List> paymentAggregation(String flag, List> paymentAggregation) { - List> count = new ArrayList<>(); - - if (ObjectUtil.isNotEmpty(paymentAggregation)) { - for (Map res : paymentAggregation) { - if ("fg".equals(flag)) { - if ("card".equals(res.get("flag")) || "fuel".equals(res.get("flag"))) { - boolean flag2 = false; - for (Map coun : count) { - if (Objects.equals(res.get("payType"), coun.get("payType"))) { - coun.put("paidAmount", Double.valueOf(coun.get("paidAmount").toString()) + Double.valueOf(res.get("paidAmount").toString())); - flag2 = true; - } - } - if (!flag2) { - // 创建新的对象，以防修改原始数据 - Map newRes = new HashMap<>(res); - count.add(newRes); - } - } - } else if (Objects.equals(res.get("flag"), flag)) { - count.add(res); - } - } - } - - return count; - } - - public static String calculatePaymentMethod(String payType) { - switch (payType) { - case "ALIPAY": - return "支付宝"; - case "WECHAT": - return "微信"; - case "UNIONPAY": - return "银联二维码"; - case "CASH": - return "现金"; - default: - return "其他"; - } - } - - //退款汇总合计 - public static String refundAggregateTotal(List> paymentAggregation) { - BigDecimal totalRefundAmount = BigDecimal.ZERO; - - if (paymentAggregation != null && !paymentAggregation.isEmpty()) { - for (Map payment : paymentAggregation) { - if ("all".equals(payment.get("flag"))) { - BigDecimal refundAmount = new BigDecimal(String.valueOf(payment.get("refundAmount"))); - totalRefundAmount = totalRefundAmount.add(refundAmount); - } - } - } - - return totalRefundAmount.toString(); - } - - //实收汇总合计 - public static BigDecimal totalTotalOfActualReceipts(List> paymentAggregation) { - BigDecimal totalPaidAmount = BigDecimal.ZERO; - - if (paymentAggregation != null && !paymentAggregation.isEmpty()) { - for (Map payment : paymentAggregation) { - if ("all".equals(payment.get("flag"))) { - BigDecimal paidAmount = new BigDecimal(String.valueOf(payment.get("paidAmount"))); - totalPaidAmount = totalPaidAmount.add(paidAmount); - } - } - } - - return totalPaidAmount; - } - - //油品订单合计 - public static String totalOilOrders(List> paymentAggregation) { - BigDecimal totalOilAmount = BigDecimal.ZERO; - - if (paymentAggregation != null && !paymentAggregation.isEmpty()) { - for (Map payment : paymentAggregation) { - if ("oil".equals(payment.get("flag"))) { - BigDecimal paidAmount = new BigDecimal(String.valueOf(payment.get("paidAmount"))); - totalOilAmount = totalOilAmount.add(paidAmount); - } - } - } - return totalOilAmount.toString(); - } - - public static String totalOfProductOrders(List> paymentAggregation) { - BigDecimal totalProductAmount = BigDecimal.ZERO; - - if (paymentAggregation != null && !paymentAggregation.isEmpty()) { - for (Map payment : paymentAggregation) { - if ("goods".equals(payment.get("flag"))) { - BigDecimal paidAmount = new BigDecimal(String.valueOf(payment.get("paidAmount"))); - totalProductAmount = totalProductAmount.add(paidAmount); - } - } - } - - return totalProductAmount.toString(); - } - // 会员储值合计 - public static BigDecimal totalMemberStoredValue(List> paymentAggregation) { - BigDecimal totalStoredValue = BigDecimal.ZERO; - - if (paymentAggregation != null && !paymentAggregation.isEmpty()) { - for (Map payment : paymentAggregation) { - if ("card".equals(payment.get("flag")) || "fuel".equals(payment.get("flag"))) { - BigDecimal paidAmount = new BigDecimal(String.valueOf(payment.get("paidAmount"))); - totalStoredValue = totalStoredValue.add(paidAmount); - } - } - } - - return totalStoredValue; - } - - // 积分商城统计 - public static BigDecimal pointsMallStatistics(List> paymentAggregation) { - BigDecimal totalPointsMallAmount = BigDecimal.ZERO; - - if (paymentAggregation != null && !paymentAggregation.isEmpty()) { - for (Map payment : paymentAggregation) { - if ("point".equals(payment.get("flag"))) { - BigDecimal paidAmount = new BigDecimal(String.valueOf(payment.get("paidAmount"))); - totalPointsMallAmount = totalPointsMallAmount.add(paidAmount); - } - } - } - - return totalPointsMallAmount; - } - - // 油号统计合计 - public static BigDecimal totalOilNumberStatistics(List> oilNumberStatistics) { - BigDecimal totalOilNumberAmount = BigDecimal.ZERO; - - if (oilNumberStatistics != null && !oilNumberStatistics.isEmpty()) { - for (Map statistics : oilNumberStatistics) { - BigDecimal paidAmount = new BigDecimal(String.valueOf(statistics.get("paidAmount"))); - totalOilNumberAmount = totalOilNumberAmount.add(paidAmount); - } - } - - return totalOilNumberAmount; - } - - // 优惠统计合计 - public static BigDecimal discountStatisticsTotal(List> oilNumberStatistics) { - BigDecimal totalDiscountAmount = BigDecimal.ZERO; - - if (oilNumberStatistics != null && !oilNumberStatistics.isEmpty()) { - for (Map statistics : oilNumberStatistics) { - BigDecimal paidDiscount = new BigDecimal(String.valueOf(statistics.get("paidDiscount"))); - totalDiscountAmount = totalDiscountAmount.add(paidDiscount); - } - } - - return totalDiscountAmount; - } - - // 油枪统计合计 - public static BigDecimal totalOfOilGunStatistics(List> greaseGunStatistics) { - BigDecimal totalOilGunAmount = BigDecimal.ZERO; - - if (greaseGunStatistics != null && !greaseGunStatistics.isEmpty()) { - for (Map statistics : greaseGunStatistics) { - BigDecimal paidAmount = new BigDecimal(String.valueOf(statistics.get("paidAmount"))); - totalOilGunAmount = totalOilGunAmount.add(paidAmount); - } - } - - return totalOilGunAmount; - } - - // 员工统计合计 - public static BigDecimal totalOfEmployeeStatistics(List> employeeStatistics) { - BigDecimal totalEmployeeAmount = BigDecimal.ZERO; - - if (employeeStatistics != null && !employeeStatistics.isEmpty()) { - for (Map statistics : employeeStatistics) { - BigDecimal paidAmount = new BigDecimal(String.valueOf(statistics.get("paidAmount"))); - totalEmployeeAmount = totalEmployeeAmount.add(paidAmount); - } - } - - return totalEmployeeAmount; - } - - // 挂账详情统计 - public static BigDecimal statisticsOfAccountDetails(List> billingDetails) { - BigDecimal totalAccountDetailsAmount = BigDecimal.ZERO; - - if (billingDetails != null && !billingDetails.isEmpty()) { - for (Map details : billingDetails) { - BigDecimal amount = new BigDecimal(String.valueOf(details.get("amount"))); - totalAccountDetailsAmount = totalAccountDetailsAmount.add(amount); - } - } - - return totalAccountDetailsAmount; - } - - // 挂账归还统计 - public static BigDecimal postedAccountReturnStatistics(List> returnedToTheAccount) { - BigDecimal totalReturnAmount = BigDecimal.ZERO; - - if (returnedToTheAccount != null && !returnedToTheAccount.isEmpty()) { - for (Map returnDetails : returnedToTheAccount) { - BigDecimal amount = new BigDecimal(String.valueOf(returnDetails.get("amount"))); - totalReturnAmount = totalReturnAmount.add(amount); - } - } - - return totalReturnAmount; - } - - // 实收汇总 - // 油品订单 - // 商品订单 - // 会员储值 - // 积分商城 - // 油号统计 - // 优惠统计 - // 油枪统计 - // 员工统计 - // 挂账统计 - -} diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/printer/template/Prient.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/printer/template/Prient.java deleted file mode 100644 index a3ca39658..000000000 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/printer/template/Prient.java +++ /dev/null @@ -1,68 +0,0 @@ -package com.fuint.business.printer.template; - -import com.fuint.business.printer.entity.Test; - -import java.util.ArrayList; -import java.util.List; - -/** - * 小票模板 - * - * @author admin - * - */ -public class Prient{ - // 菜品集合--传入一个商品集合 - public static List testList = new ArrayList(); - public static double ZMoney=0; - public static double YMoney=20; - public static double SMoney=500; - // 设置小票打印 - public static String print(){ - //字符串拼接 - StringBuilder sb=new StringBuilder(); - sb.append("
点菜清单\r\n
"); - sb.append("------------------------------------\r\n"); - sb.append("点餐员：测试打印\r\n"); - sb.append("电话：13408086368\r\n"); - sb.append("用餐时间：2015-04-09 13:01-13:30\r\n"); - sb.append("用餐地址：打印测试\r\n"); - sb.append("------------------------------------\r\n"); - sb.append(""); - sb.append(""); - sb.append(""); - sb.append(""); - sb.append(""); - sb.append(""); - for (Test test : testList) { - ZMoney=ZMoney+(test.getMoney()*test.getNum()); - sb.append(""); - sb.append(""); - sb.append(""); - sb.append(""); - sb.append(""); - } - sb.append("
"); - sb.append("菜品"); - sb.append(""); - sb.append("单价"); - sb.append(""); - sb.append("小计"); - sb.append("
"+test.getName()+""+test.getMoney()+""+test.getMoney()*test.getNum()+"
"); - sb.append("------------------------------------\r\n"); - sb.append("合计：￥"+ZMoney+"\r\n"); - sb.append("优惠金额：￥"+YMoney+"\r\n"); - sb.append("应收：￥"+(ZMoney-YMoney)+"\r\n"); - sb.append("实收：￥"+SMoney+"\r\n"); - sb.append("找零：￥"+(SMoney-YMoney)+"\r\n"); - sb.append("收银员：打印测试\r\n"); - sb.append("
谢谢惠顾，欢迎下次光临！
"); - return sb.toString(); - } - public static List getTestList() { - return testList; - } - public static void setTestList(List testList) { - Prient.testList = testList; - } -} diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/printer/template/PrintCardValueReport.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/printer/template/PrintCardValueReport.java deleted file mode 100644 index 6142ed424..000000000 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/printer/template/PrintCardValueReport.java +++ /dev/null @@ -1,51 +0,0 @@ -package com.fuint.business.printer.template; - -import cn.hutool.core.util.ObjectUtil; - -import java.util.HashMap; -import java.util.Map; - -public class PrintCardValueReport { - public static Map handover = new HashMap<>(); - public static String printOilOrder() { - StringBuilder sb = new StringBuilder(); - sb.append("
订单统计\r\n
"); - sb.append("------------------------------------\r\n"); - if (ObjectUtil.isNotEmpty(handover.get("realyPayBills"))) { - sb.append("充值金额：￥"+handover.get("realyPayBills")+"\r\n"); - sb.append("------------------------------------\r\n"); - } - if (ObjectUtil.isNotEmpty(handover.get("giftBalance"))) { - sb.append("赠送金额：￥"+handover.get("giftBalance")+"\r\n"); - sb.append("------------------------------------\r\n"); - } - if (ObjectUtil.isNotEmpty(handover.get("getAmount"))) { - sb.append("到账金额：￥"+handover.get("getAmount")+"\r\n"); - sb.append("------------------------------------\r\n"); - } - if (ObjectUtil.isNotEmpty(handover.get("payType"))) { - sb.append("支付方式："+handover.get("payType")+"\r\n"); - sb.append("------------------------------------\r\n"); - } - if (ObjectUtil.isNotEmpty(handover.get("actualPay"))) { - sb.append("实付款：￥"+handover.get("actualPay")+"\r\n"); - sb.append("------------------------------------\r\n"); - } - if (ObjectUtil.isNotEmpty(handover.get("seekZero"))) { - sb.append("找零：￥"+handover.get("seekZero")+"\r\n"); - sb.append("------------------------------------\r\n"); - } - - sb.append("
谢谢惠顾，欢迎下次光临！
"); - - - return sb.toString(); - } - public static Map getHandover() { - return handover; - } - public static void setHandover(Map handover) { - PrintCardValueReport.handover = handover; - } - -} diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/printer/template/PrintFuelDieselReport.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/printer/template/PrintFuelDieselReport.java deleted file mode 100644 index b2fd69f2e..000000000 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/printer/template/PrintFuelDieselReport.java +++ /dev/null @@ -1,55 +0,0 @@ -package com.fuint.business.printer.template; - -import cn.hutool.core.util.ObjectUtil; - -import java.util.HashMap; -import java.util.Map; - -public class PrintFuelDieselReport { - public static Map handover = new HashMap<>(); - public static String printFeulOrder() { - StringBuilder sb = new StringBuilder(); - - sb.append("
订单统计\r\n
"); - sb.append("------------------------------------\r\n"); - if (ObjectUtil.isNotEmpty(handover.get("oilType"))) { - sb.append("充值油品："+handover.get("oilType")+"\r\n"); - sb.append("------------------------------------\r\n"); - } - if (ObjectUtil.isNotEmpty(handover.get("incomeLitres"))) { - sb.append("充值升数："+handover.get("incomeLitres")+"\r\n"); - sb.append("------------------------------------\r\n"); - } - if (ObjectUtil.isNotEmpty(handover.get("realyPayBills"))) { - sb.append("订单金额：￥"+handover.get("realyPayBills")+"\r\n"); - sb.append("------------------------------------\r\n"); - } - if (ObjectUtil.isNotEmpty(handover.get("lockupPrice"))) { - sb.append("锁价金额：￥"+handover.get("lockupPrice")+"\r\n"); - sb.append("------------------------------------\r\n"); - } - if (ObjectUtil.isNotEmpty(handover.get("payType"))) { - sb.append("支付方式："+handover.get("payType")+"\r\n"); - sb.append("------------------------------------\r\n"); - } - if (ObjectUtil.isNotEmpty(handover.get("realyPayBills"))) { - sb.append("实付款：￥"+handover.get("realyPayBills")+"\r\n"); - sb.append("------------------------------------\r\n"); - } - if (ObjectUtil.isNotEmpty(handover.get("seekZero"))) { - sb.append("找零：￥"+handover.get("seekZero")+"\r\n"); - sb.append("------------------------------------\r\n"); - } - - sb.append("
谢谢惠顾，欢迎下次光临！
"); - - return sb.toString(); - } - - public static Map getHandover() { - return handover; - } - public static void setHandover(Map handover) { - PrintFuelDieselReport.handover = handover; - } -} diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/printer/template/PrintIntegralReport.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/printer/template/PrintIntegralReport.java deleted file mode 100644 index d3f67df13..000000000 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/printer/template/PrintIntegralReport.java +++ /dev/null @@ -1,54 +0,0 @@ -package com.fuint.business.printer.template; - -import cn.hutool.core.util.ObjectUtil; - -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -public class PrintIntegralReport { - public static Map handover = new HashMap<>(); - public static String printIntegral(){ - StringBuilder sb=new StringBuilder(); - - sb.append("
积分兑换订单\r\n
"); - sb.append("------------------------------------\r\n"); - - if (ObjectUtil.isNotEmpty(handover.get("shoppingCart"))) { - sb.append(""); - List> o = (List>)handover.get("oilOrder"); - for (Map stringStringMap : o) { - sb.append(""); - sb.append(""); - sb.append(""); - } - sb.append("
商品名称商品数量价格
"+stringStringMap.get("giftName")+""+stringStringMap.get("markPurchases")+""+ stringStringMap.get("price")+"
"); - sb.append("------------------------------------\r\n"); - - } - - - if (ObjectUtil.isNotEmpty(handover.get("allPoints"))) { - sb.append("总积分："+handover.get("allPoints")+"\r\n"); - sb.append("------------------------------------\r\n"); - - } - if (ObjectUtil.isNotEmpty(handover.get("allAmout"))) { - sb.append("总价格：￥"+handover.get("allAmout")+"\r\n"); - sb.append("------------------------------------\r\n"); - - } - - sb.append("
谢谢惠顾，欢迎下次光临！
"); - - return sb.toString(); - } - - public static Map getHandover() { - return handover; - } - public static void setHandover(Map handover) { - PrintIntegralReport.handover = handover; - } - -} diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/printer/template/PrintOilOrderReport.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/printer/template/PrintOilOrderReport.java deleted file mode 100644 index ec94bb2e0..000000000 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/printer/template/PrintOilOrderReport.java +++ /dev/null @@ -1,100 +0,0 @@ -package com.fuint.business.printer.template; - -import cn.hutool.core.util.ObjectUtil; - -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.Optional; - -public class PrintOilOrderReport { - public static Map handover = new HashMap<>(); - public static String printOilOrder(){ - StringBuilder sb=new StringBuilder(); - - - sb.append("
订单统计\r\n
"); - sb.append("------------------------------------\r\n"); - - if (ObjectUtil.isNotEmpty(handover.get("oilOrder"))) { - sb.append(""); - List> o = (List>)handover.get("oilOrder"); - for (Map stringStringMap : o) { - sb.append(""); - sb.append(""); - } - sb.append("
油品金额
"+stringStringMap.get("oilName")+""+ stringStringMap.get("amount")+"
"); - sb.append("------------------------------------\r\n"); - - } - if (ObjectUtil.isNotEmpty(handover.get("goodsOrder"))) { - sb.append(""); - List> o = (List>)handover.get("goodsOrder"); - for (Map stringStringMap : o) { - sb.append(""); - sb.append(""); - - sb.append(""); - } - sb.append("
商品数量单价
"+stringStringMap.get("oilName")+""+stringStringMap.get("unit")+""+ stringStringMap.get("amount")+"
"); - sb.append("------------------------------------\r\n"); - - } - - sb.append("支付方式："+handover.get("payType")+"\r\n"); - if ("credit".equals(handover.get("payType"))) { - sb.append("挂账单位："+handover.get("unitName")+"\r\n"); - sb.append("挂账金额：￥"+handover.get("creditAmount")+"\r\n"); - sb.append("------------------------------------\r\n"); - - } - -// if (ObjectUtil.isNotEmpty(handover.get("discount"))) { -// sb.append("订单总额：￥"+handover.get("discount")+"\r\n"); -// sb.append("------------------------------------\r\n"); -// -// } - if (ObjectUtil.isNotEmpty(handover.get("discount"))) { - sb.append("优惠合计：￥"+handover.get("discount")+"\r\n"); - sb.append("------------------------------------\r\n"); - - } - if (ObjectUtil.isNotEmpty(handover.get("amount"))) { - sb.append("总金额：￥"+handover.get("amount")+"\r\n"); - sb.append("------------------------------------\r\n"); - - } - if (ObjectUtil.isNotEmpty(handover.get("consumeAmount"))) { - sb.append("储值卡付款：￥"+handover.get("consumeAmount")+"\r\n"); - sb.append("------------------------------------\r\n"); - - } - if (ObjectUtil.isNotEmpty(handover.get("consumeRefuelMoney"))) { - sb.append("囤油卡付款："+handover.get("consumeRefuelMoney")+"L\r\n"); - sb.append("------------------------------------\r\n"); - - } - if (ObjectUtil.isNotEmpty(handover.get("actualPay"))) { - sb.append("实付款：￥"+handover.get("actualPay")+"\r\n"); - sb.append("------------------------------------\r\n"); - - } - if (ObjectUtil.isNotEmpty(handover.get("seekZero"))) { - sb.append("找零：￥"+handover.get("seekZero")+"\r\n"); - sb.append("------------------------------------\r\n"); - - } - - sb.append("
谢谢惠顾，欢迎下次光临！
"); - - return sb.toString(); - } - - public static Map getHandover() { - return handover; - } - public static void setHandover(Map handover) { - PrintOilOrderReport.handover = handover; - } - -} diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/printer/template/RePrintOilOrderReport.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/printer/template/RePrintOilOrderReport.java deleted file mode 100644 index 05b160fab..000000000 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/printer/template/RePrintOilOrderReport.java +++ /dev/null @@ -1,95 +0,0 @@ -package com.fuint.business.printer.template; - -import cn.hutool.core.util.ObjectUtil; - -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -public class RePrintOilOrderReport { - public static Map handover = new HashMap<>(); - public static String rePrintOilOrder(){ - StringBuilder sb=new StringBuilder(); - - sb.append("
订单统计\r\n
"); - sb.append("--------------------------------\r\n"); - - if (ObjectUtil.isNotEmpty(handover.get("oilOrder"))) { - sb.append(""); - List> o = (List>)handover.get("oilOrder"); - for (Map stringStringMap : o) { - sb.append(""); - sb.append(""); - sb.append(""); - } - sb.append("
油品加油升数金额
"+stringStringMap.get("oilName")+""+stringStringMap.get("oilNum")+""+ stringStringMap.get("amount")+"
"); - sb.append("--------------------------------\r\n"); - - } - if (ObjectUtil.isNotEmpty(handover.get("goodsOrder"))) { - sb.append(""); - List> o = (List>)handover.get("goodsOrder"); - for (Map stringStringMap : o) { - sb.append(""); - sb.append(""); - sb.append(""); - } - sb.append("
商品数量单价
"+stringStringMap.get("oilName")+""+stringStringMap.get("unit")+""+ stringStringMap.get("amount")+"
"); - sb.append("--------------------------------\r\n"); - - } - - sb.append("支付方式："+handover.get("payType")+"\r\n"); - - - if (ObjectUtil.isNotEmpty(handover.get("amount"))) { - sb.append("合计：￥"+handover.get("amount")+"\r\n"); - sb.append("--------------------------------\r\n"); - - } - if (ObjectUtil.isNotEmpty(handover.get("payAmount"))) { - sb.append("实付款：￥"+handover.get("payAmount")+"\r\n"); - sb.append("--------------------------------\r\n"); - - } - if (ObjectUtil.isNotEmpty(handover.get("discount"))) { - sb.append("优惠：￥"+handover.get("discount")+"\r\n"); - sb.append("--------------------------------\r\n"); - - } - if (ObjectUtil.isNotEmpty(handover.get("seekZero"))) { - sb.append("找零：￥"+handover.get("seekZero")+"\r\n"); - sb.append("--------------------------------\r\n"); - - } - - if (ObjectUtil.isNotEmpty(handover.get("type")) && "2".equals(handover.get("type"))) { - if (ObjectUtil.isNotEmpty(handover.get("balanceAmount"))) { - sb.append("储值卡：￥"+handover.get("balanceAmount")+"\r\n"); - sb.append("--------------------------------\r\n"); - - } - if (ObjectUtil.isNotEmpty(handover.get("oilCardAmount"))) { - sb.append("屯油卡："+handover.get("oilCardAmount")+"L\r\n"); - sb.append("--------------------------------\r\n"); - - } - if (ObjectUtil.isNotEmpty(handover.get("calculateRefundsV"))) { - sb.append("退款：￥"+handover.get("calculateRefundsV")+"\r\n"); - sb.append("--------------------------------\r\n"); - - } - } - sb.append("
谢谢惠顾，欢迎下次光临！
"); - - return sb.toString(); - } - - public static Map getHandover() { - return handover; - } - public static void setHandover(Map handover) { - RePrintOilOrderReport.handover = handover; - } - -} diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/printer/unit/ApiConst.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/printer/unit/ApiConst.java deleted file mode 100644 index c2f005eb4..000000000 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/printer/unit/ApiConst.java +++ /dev/null @@ -1,96 +0,0 @@ -package com.fuint.business.printer.unit; - -public class ApiConst { - /** - * 主站域名 1 - */ - public static final String MAIN_HOST_DN_ONE = "open-api.10ss.net"; - - /** - * 主站url - */ - public static final String MAIN_HOST_URL = "https://" + MAIN_HOST_DN_ONE; - - /** - * 获取token and refresh Token - */ - public static final String GET_TOKEN = "/oauth/oauth"; - - /** - * 急速授权 - */ - public static final String SPEED_AUTHORIZE = "/oauth/scancodemodel"; - - - /** - * api 打印 - */ - public static final String API_PRINT = "/print/index"; - - /** - * api 添加终端授权 - */ - public static final String API_ADD_PRINTER = "/printer/addprinter"; - - /** - * api 删除终端授权 - */ - public static final String API_DELET_PRINTER = "/printer/deleteprinter"; - - /** - * api 添加应用菜单 - */ - public static final String API_ADD_PRINT_MENU = "/printmenu/addprintmenu"; - - /** - * api 关机重启接口 - */ - public static final String API_SHUTDOWN_RESTART = "/printer/shutdownrestart"; - - /** - * api 声音调节接口 - */ - public static final String API_SET_SOUND = "/printer/setsound"; - - /** - * api 获取机型打印宽度接口 - */ - public static final String API_PRINT_INFO = "/printer/printinfo"; - - /** - * api 获取机型软硬件版本接口 - */ - public static final String API_GET_VIERSION = "/printer/getversion"; - - /** - * api 取消所有未打印订单 - */ - public static final String API_CANCEL_ALL = "/printer/cancelall"; - - /** - * api 取消单条未打印订单 - */ - public static final String API_CANCEL_ONE = "/printer/cancelone"; - - /** - * api 设置logo接口 - */ - public static final String API_SET_ICON = "/printer/seticon"; - - /** - * api 取消logo接口 - */ - public static final String API_DELET_ICON = "/printer/deleteicon"; - - /** - * api 接单拒单设置接口 - */ - public static final String API_GET_ORDER = "/printer/getorder"; - - /** - * api 打印方式接口 - */ - public static final String API_BTN_PRINT = "/printer/btnprint"; - - -} diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/printer/unit/HttpUtil.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/printer/unit/HttpUtil.java deleted file mode 100644 index 28ae61271..000000000 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/printer/unit/HttpUtil.java +++ /dev/null @@ -1,254 +0,0 @@ -package com.fuint.business.printer.unit; - -import java.io.*; -import java.net.*; -import java.util.List; -import java.util.Map; - -public class HttpUtil { - static String proxyHost = "127.0.0.1"; - static int proxyPort = 8080; - - /** - * 编码 - * - * @param source - * @return - */ - public static String urlEncode(String source, String encode) { - String result = source; - try { - result = URLEncoder.encode(source, encode); - } catch (UnsupportedEncodingException e) { - e.printStackTrace(); - return "0"; - } - return result; - } - - public static String urlEncodeGBK(String source) { - String result = source; - try { - result = URLEncoder.encode(source, "GBK"); - } catch (UnsupportedEncodingException e) { - e.printStackTrace(); - return "0"; - } - return result; - } - - /** - * 发起http请求获取返回结果 - * - * @param req_url 请求地址 - * @return - */ - public static String httpRequest(String req_url) { - StringBuffer buffer = new StringBuffer(); - try { - URL url = new URL(req_url); - HttpURLConnection httpUrlConn = (HttpURLConnection) url.openConnection(); - - httpUrlConn.setDoOutput(false); - httpUrlConn.setDoInput(true); - httpUrlConn.setUseCaches(false); - - httpUrlConn.setRequestMethod("GET"); - httpUrlConn.connect(); - - // 将返回的输入流转换成字符串 - InputStream inputStream = httpUrlConn.getInputStream(); - InputStreamReader inputStreamReader = new InputStreamReader(inputStream, "utf-8"); - BufferedReader bufferedReader = new BufferedReader(inputStreamReader); - - String str = null; - while ((str = bufferedReader.readLine()) != null) { - buffer.append(str); - } - bufferedReader.close(); - inputStreamReader.close(); - // 释放资源 - inputStream.close(); - inputStream = null; - httpUrlConn.disconnect(); - - } catch (Exception e) { - System.out.println(e.getStackTrace()); - } - return buffer.toString(); - } - - /** - * 发送http请求取得返回的输入流 - * - * @param requestUrl 请求地址 - * @return InputStream - */ - public static InputStream httpRequestIO(String requestUrl) { - InputStream inputStream = null; - try { - URL url = new URL(requestUrl); - HttpURLConnection httpUrlConn = (HttpURLConnection) url.openConnection(); - httpUrlConn.setDoInput(true); - httpUrlConn.setRequestMethod("GET"); - httpUrlConn.connect(); - // 获得返回的输入流 - inputStream = httpUrlConn.getInputStream(); - } catch (Exception e) { - e.printStackTrace(); - } - return inputStream; - } - - - /** - * 向指定URL发送GET方法的请求 - * - * @param url 发送请求的URL - * @param param 请求参数，请求参数应该是 name1=value1&name2=value2 的形式。 - * @return URL 所代表远程资源的响应结果 - */ - public static String sendGet(String url, String param) { - String result = ""; - BufferedReader in = null; - try { - String urlNameString = url + "?" + param; - URL realUrl = new URL(urlNameString); - // 打开和URL之间的连接 - URLConnection connection = realUrl.openConnection(); - // 设置通用的请求属性 - connection.setRequestProperty("accept", "*/*"); - connection.setRequestProperty("connection", "Keep-Alive"); - connection.setRequestProperty("user-agent", - "Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.1;SV1)"); - // 建立实际的连接 - connection.connect(); - // 获取所有响应头字段 - Map> map = connection.getHeaderFields(); - // 遍历所有的响应头字段 - for (String key : map.keySet()) { - System.out.println(key + "--->" + map.get(key)); - } - // 定义 BufferedReader输入流来读取URL的响应 - in = new BufferedReader(new InputStreamReader( - connection.getInputStream())); - String line; - while ((line = in.readLine()) != null) { - result += line; - } - } catch (Exception e) { - System.out.println("发送GET请求出现异常！" + e); - e.printStackTrace(); - } - // 使用finally块来关闭输入流 - finally { - try { - if (in != null) { - in.close(); - } - } catch (Exception e2) { - e2.printStackTrace(); - } - } - return result; - } - - /** - * 向指定 URL 发送POST方法的请求 - * - * @param url 发送请求的 URL - * @param map 请求参数，请求参数应该是 map 的形式。 - * @param isproxy 是否使用代理模式 - * @return 所代表远程资源的响应结果 - */ - public static String sendPost(String url, Map map, boolean isproxy) { - OutputStreamWriter out = null; - BufferedReader in = null; - String result = ""; - try { - URL realUrl = new URL(url); - HttpURLConnection conn = null; - - // 打开和URL之间的连接 - if (isproxy) {//是否使用代理模式 - @SuppressWarnings("static-access") - Proxy proxy = new Proxy(Proxy.Type.DIRECT.HTTP, new InetSocketAddress(proxyHost, proxyPort)); - conn = (HttpURLConnection) realUrl.openConnection(proxy); - } else { - conn = (HttpURLConnection) realUrl.openConnection(); - } - - // 发送POST请求必须设置如下两行 - conn.setDoOutput(true); - conn.setDoInput(true); - conn.setRequestMethod("POST"); // POST方法 - // 设置通用的请求属性 - conn.setRequestProperty("accept", "*/*"); - conn.setRequestProperty("connection", "Keep-Alive"); - conn.setRequestProperty("user-agent", - "Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.1;SV1)"); - conn.setRequestProperty("Content-Type", "application/x-www-form-urlencoded"); - - conn.connect(); - // 获取URLConnection对象对应的输出流 - out = new OutputStreamWriter(conn.getOutputStream(), "UTF-8"); - // 发送请求参数 - out.write(getUrlParamsFromMap(map)); - // flush输出流的缓冲 - out.flush(); - // 定义BufferedReader输入流来读取URL的响应 - in = new BufferedReader(new InputStreamReader(conn.getInputStream())); - String line; - while ((line = in.readLine()) != null) { - result += line; - } - } catch (Exception e) { - System.out.println("发送 POST 请求出现异常！" + e); - e.printStackTrace(); - } - //使用finally块来关闭输出流、输入流 - finally { - try { - if (out != null) { - out.close(); - } - if (in != null) { - in.close(); - } - } catch (IOException ex) { - ex.printStackTrace(); - } - } - return result; - } - - /** - * description:将map转换成url参数格式: name1=value1&name2=value2 - * - * @param map - * @return - */ - public static String getUrlParamsFromMap(Map map) { - try { - if (null != map) { - StringBuilder stringBuilder = new StringBuilder(); - for (Map.Entry entry : map.entrySet()) { - stringBuilder.append(URLEncoder.encode(entry.getKey(), "UTF-8")) - .append("=") - .append(URLEncoder.encode(entry.getValue(), "UTF-8")) - .append("&"); - } - String content = stringBuilder.toString(); - if (content.endsWith("&")) { - content = content.substring(0, content.length() - 1); - } - return content; - } - } catch (Exception e) { - e.printStackTrace(); - System.out.println("map数据异常！" + e); - } - return ""; - } - -} diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/printer/unit/LAVApi.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/printer/unit/LAVApi.java deleted file mode 100644 index 7d2ec56db..000000000 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/printer/unit/LAVApi.java +++ /dev/null @@ -1,476 +0,0 @@ -package com.fuint.business.printer.unit; - -import java.security.MessageDigest; -import java.security.NoSuchAlgorithmException; -import java.util.HashMap; -import java.util.UUID; - -public class LAVApi { - /** - * 获取token 开放应用服务模式所需参数 - * - * @param client_id 易联云颁发给开发者的应用ID 非空值 - * @param grant_type 授与方式（固定为 “authorization_code”） - * @param sign 签名 详见API文档列表-接口签名 - * @param code 详见商户授权-获取code - * @param scope 授权权限，传all - * @param timestamp 当前服务器时间戳(10位) - * @param id UUID4 详见API文档列表-uuid4 - * @return - */ - public static String getToken(String client_id, String grant_type, String sign, String code, String scope, String timestamp, String id) { - HashMap hashMap = new HashMap(); - hashMap.put("client_id", client_id); - hashMap.put("grant_type", grant_type); - hashMap.put("sign", sign); - hashMap.put("code", code); - hashMap.put("scope", scope); - hashMap.put("timestamp", timestamp); - hashMap.put("id", id); - return HttpUtil.sendPost(ApiConst.MAIN_HOST_URL + ApiConst.GET_TOKEN, hashMap, false); - } - - /** - * 获取token 自有应用服务模式所需参数 - * - * @param client_id 平台id 非空值 - * @param grant_type 授与方式（固定为’client_credentials’） - * @param sign 签名 详见API文档列表-接口签名 - * @param scope 授权权限，传all - * @param timestamp 当前服务器时间戳(10位) - * @param id UUID4 详见API文档列表-uuid4 - * @return - */ - public static String getToken(String client_id, String grant_type, String sign, String scope, String timestamp, String id) { - HashMap hashMap = new HashMap(); - hashMap.put("client_id", client_id); - hashMap.put("grant_type", grant_type); - hashMap.put("sign", sign); - hashMap.put("scope", scope); - hashMap.put("timestamp", timestamp); - hashMap.put("id", id); - return HttpUtil.sendPost(ApiConst.MAIN_HOST_URL + ApiConst.GET_TOKEN, hashMap, false); - } - - /** - * 刷新access_token - * - * @param client_id 易联云颁发给开发者的应用ID 非空值 - * @param grant_type 授与方式（固定为 “refresh_token”） - * @param scope 授权权限，传all - * @param sign 签名 详见API文档列表-接口签名 - * @param refresh_token 更新access_token所需 - * @param id UUID4 详见API文档列表-uuid4 - * @param timestamp 当前服务器时间戳(10位) - * @return - */ - public static String refreshToken(String client_id, String grant_type, String scope, String sign, String refresh_token, String id, String timestamp) { - HashMap hashMap = new HashMap(); - hashMap.put("client_id", client_id); - hashMap.put("grant_type", grant_type); - hashMap.put("scope", scope); - hashMap.put("sign", sign); - hashMap.put("refresh_token", refresh_token); - hashMap.put("id", id); - hashMap.put("timestamp", timestamp); - return HttpUtil.sendPost(ApiConst.MAIN_HOST_URL + ApiConst.GET_TOKEN, hashMap, false); - } - - /** - * 极速授权 - * - * @param client_id 易联云颁发给开发者的应用ID 非空值 - * @param machine_code 易联云打印机终端号 - * @param qr_key 特殊密钥(有效期为300秒) - * @param scope 授权权限，传all - * @param sign 签名 详见API文档列表 - * @param id UUID4 详见API文档列表-uuid4 - * @param timestamp 当前服务器时间戳(10位) - * @return - */ - public static String speedAu(String client_id, String machine_code, String qr_key, String scope, String sign, String id, String timestamp) { - HashMap hashMap = new HashMap(); - hashMap.put("client_id", client_id); - hashMap.put("machine_code", machine_code); - hashMap.put("qr_key", qr_key); - hashMap.put("scope", scope); - hashMap.put("sign", sign); - hashMap.put("id", id); - hashMap.put("timestamp", timestamp); - return HttpUtil.sendPost(ApiConst.MAIN_HOST_URL + ApiConst.SPEED_AUTHORIZE, hashMap, false); - } - - /** - * 打印 - * - * @param client_id 易联云颁发给开发者的应用ID 非空值 - * @param access_token 授权的token 必要参数 - * @param machine_code 易联云打印机终端号 - * @param content 打印内容(需要urlencode) - * @param origin_id 商户系统内部订单号，要求32个字符内，只能是数字、大小写字母 ，且在同一个client_id下唯一。详见商户订单号 - * @param sign 签名 详见API文档列表 - * @param id UUID4 详见API文档列表-uuid4 - * @param timestamp 当前服务器时间戳(10位) - * @return - */ - public static String print(String client_id, String access_token, String machine_code, String content, String origin_id, String sign, String id, String timestamp) { - HashMap hashMap = new HashMap(); - hashMap.put("client_id", client_id); - hashMap.put("access_token", access_token); - hashMap.put("machine_code", machine_code); - hashMap.put("content", content); - hashMap.put("origin_id", origin_id); - hashMap.put("sign", sign); - hashMap.put("id", id); - hashMap.put("timestamp", timestamp); - return HttpUtil.sendPost(ApiConst.MAIN_HOST_URL + ApiConst.API_PRINT, hashMap, false); - - } - - /** - * 添加终端授权 开放应用服务模式不需要此接口 ,自有应用服务模式所需参数 - * - * @param client_id 易联云颁发给开发者的应用ID 非空值 - * @param machine_code 易联云打印机终端号 - * @param msign 易联云终端密钥(如何快速获取终端号和终端秘钥) - * @param access_token 授权的token 必要参数 - * @param sign 签名 详见API文档列表-接口签名 - * @param id UUID4 详见API文档列表-uuid4 - * @param timestamp 当前服务器时间戳(10位) - * @return - */ - public static String addPrinter(String client_id, String machine_code, String msign, String access_token, String sign, String id, String timestamp) { - HashMap hashMap = new HashMap(); - hashMap.put("client_id", client_id); - hashMap.put("machine_code", machine_code); - hashMap.put("msign", msign); - hashMap.put("access_token", access_token); - hashMap.put("sign", sign); - hashMap.put("id", id); - hashMap.put("timestamp", timestamp); - return HttpUtil.sendPost(ApiConst.MAIN_HOST_URL + ApiConst.API_ADD_PRINTER, hashMap, false); - } - - /** - * 删除终端授权 开放应用服务模式、自有应用服务模式所需参数 - * ps 一旦删除，意味着开发者将失去此台打印机的接口权限，请谨慎操作 - * - * @param client_id 易联云颁发给开发者的应用ID 非空值 - * @param access_token 授权的token 必要参数 - * @param machine_code 易联云打印机终端号 - * @param sign 签名 详见API文档列表-接口签名 - * @param id UUID4 详见API文档列表-uuid4 - * @param timestamp 当前服务器时间戳(10位) - * @return - */ - public static String deletePrinter(String client_id, String access_token, String machine_code, String sign, String id, String timestamp) { - HashMap hashMap = new HashMap(); - hashMap.put("client_id", client_id); - hashMap.put("access_token", access_token); - hashMap.put("machine_code", machine_code); - hashMap.put("sign", sign); - hashMap.put("id", id); - hashMap.put("timestamp", timestamp); - return HttpUtil.sendPost(ApiConst.MAIN_HOST_URL + ApiConst.API_DELET_PRINTER, hashMap, false); - } - - /** - * 添加应用菜单 - * - * @param client_id 易联云颁发给开发者的应用ID 非空值 - * @param access_token 授权的token 必要参数 - * @param machine_code 易联云打印机终端号 - * @param content json格式的应用菜单（其中url和菜单名称需要urlencode) - * @param sign 签名 详见API文档列表-接口签名 - * @param id UUID4 详见API文档列表-uuid4 - * @param timestamp 当前服务器时间戳(10位) - * @return - */ - public static String addPrintMenu(String client_id, String access_token, String machine_code, String content, String sign, String id, String timestamp) { - HashMap hashMap = new HashMap(); - hashMap.put("client_id", client_id); - hashMap.put("access_token", access_token); - hashMap.put("machine_code", machine_code); - hashMap.put("content", content); - hashMap.put("sign", sign); - hashMap.put("id", id); - hashMap.put("timestamp", timestamp); - return HttpUtil.sendPost(ApiConst.MAIN_HOST_URL + ApiConst.API_ADD_PRINT_MENU, hashMap, false); - } - - /** - * 关机重启接口 - * - * @param client_id 易联云颁发给开发者的应用ID 非空值 - * @param access_token 授权的token 必要参数 - * @param machine_code 易联云打印机终端号 - * @param response_type 重启:restart,关闭:shutdown - * @param sign 签名 详见API文档列表-接口签名 - * @param id UUID4 详见API文档列表-uuid4 - * @param timestamp 当前服务器时间戳(10位) - * @return - */ - public static String shutDownRestart(String client_id, String access_token, String machine_code, String response_type, String sign, String id, String timestamp) { - HashMap hashMap = new HashMap(); - hashMap.put("client_id", client_id); - hashMap.put("access_token", access_token); - hashMap.put("machine_code", machine_code); - hashMap.put("response_type", response_type); - hashMap.put("sign", sign); - hashMap.put("id", id); - hashMap.put("timestamp", timestamp); - return HttpUtil.sendPost(ApiConst.MAIN_HOST_URL + ApiConst.API_SHUTDOWN_RESTART, hashMap, false); - } - - /** - * 声音调节接口 - * - * @param client_id 易联云颁发给开发者的应用ID 非空值 - * @param access_token 授权的token 必要参数 - * @param machine_code 易联云打印机终端号 - * @param response_type 蜂鸣器:buzzer,喇叭:horn - * @param voice [1,2,3] 3种音量设置 - * @param sign 签名 详见API文档列表-接口签名 - * @param id UUID4 详见API文档列表-uuid4 - * @param timestamp 当前服务器时间戳(10位) - * @return - */ - public static String setSound(String client_id, String access_token, String machine_code, String response_type, String voice, String sign, String id, String timestamp) { - HashMap hashMap = new HashMap(); - hashMap.put("client_id", client_id); - hashMap.put("access_token", access_token); - hashMap.put("machine_code", machine_code); - hashMap.put("response_type", response_type); - hashMap.put("voice", voice); - hashMap.put("sign", sign); - hashMap.put("id", id); - hashMap.put("timestamp", timestamp); - return HttpUtil.sendPost(ApiConst.MAIN_HOST_URL + ApiConst.API_SET_SOUND, hashMap, false); - } - - /** - * 获取机型打印宽度接口 - * - * @param client_id 易联云颁发给开发者的应用ID 非空值 - * @param access_token 授权的token 必要参数 - * @param machine_code 易联云打印机终端号 - * @param sign 签名 详见API文档列表-接口签名 - * @param id UUID4 详见API文档列表-uuid4 - * @param timestamp 当前服务器时间戳(10位) - * @return - */ - public static String getPrintInfo(String client_id, String access_token, String machine_code, String sign, String id, String timestamp) { - HashMap hashMap = new HashMap(); - hashMap.put("client_id", client_id); - hashMap.put("access_token", access_token); - hashMap.put("machine_code", machine_code); - hashMap.put("sign", sign); - hashMap.put("id", id); - hashMap.put("timestamp", timestamp); - return HttpUtil.sendPost(ApiConst.MAIN_HOST_URL + ApiConst.API_PRINT_INFO, hashMap, false); - } - - /** - * 获取机型软硬件版本接口 - * - * @param client_id 易联云颁发给开发者的应用ID 非空值 - * @param access_token 授权的token 必要参数 - * @param machine_code 易联云打印机终端号 - * @param sign 签名 详见API文档列表-接口签名 - * @param id UUID4 详见API文档列表-uuid4 - * @param timestamp 当前服务器时间戳(10位) - * @return - */ - public static String getVersion(String client_id, String access_token, String machine_code, String sign, String id, String timestamp) { - HashMap hashMap = new HashMap(); - hashMap.put("client_id", client_id); - hashMap.put("access_token", access_token); - hashMap.put("machine_code", machine_code); - hashMap.put("sign", sign); - hashMap.put("id", id); - hashMap.put("timestamp", timestamp); - return HttpUtil.sendPost(ApiConst.MAIN_HOST_URL + ApiConst.API_GET_VIERSION, hashMap, false); - } - - /** - * 取消所有未打印订单 - * - * @param client_id 易联云颁发给开发者的应用ID 非空值 - * @param access_token 授权的token 必要参数 - * @param machine_code 易联云打印机终端号 - * @param sign 签名 详见API文档列表-接口签名 - * @param id UUID4 详见API文档列表-uuid4 - * @param timestamp 当前服务器时间戳(10位) - * @return - */ - public static String cancelAll(String client_id, String access_token, String machine_code, String sign, String id, String timestamp) { - HashMap hashMap = new HashMap(); - hashMap.put("client_id", client_id); - hashMap.put("access_token", access_token); - hashMap.put("machine_code", machine_code); - hashMap.put("sign", sign); - hashMap.put("id", id); - hashMap.put("timestamp", timestamp); - return HttpUtil.sendPost(ApiConst.MAIN_HOST_URL + ApiConst.API_CANCEL_ALL, hashMap, false); - } - - /** - * 取消单条未打印订单 - * - * @param client_id 易联云颁发给开发者的应用ID 非空值 - * @param access_token 授权的token 必要参数 - * @param machine_code 易联云打印机终端号 - * @param order_id 通过打印接口返回的订单号 详见API文档列表-打印接口 - * @param sign 签名 详见API文档列表-接口签名 - * @param id UUID4 详见API文档列表-uuid4 - * @param timestamp 当前服务器时间戳(10位) - * @return - */ - public static String cancelOne(String client_id, String access_token, String machine_code, String order_id, String sign, String id, String timestamp) { - HashMap hashMap = new HashMap(); - hashMap.put("client_id", client_id); - hashMap.put("access_token", access_token); - hashMap.put("machine_code", machine_code); - hashMap.put("order_id", order_id); - hashMap.put("sign", sign); - hashMap.put("id", id); - hashMap.put("timestamp", timestamp); - return HttpUtil.sendPost(ApiConst.MAIN_HOST_URL + ApiConst.API_CANCEL_ONE, hashMap, false); - } - - /** - * 设置logo接口 - * - * @param client_id 易联云颁发给开发者的应用ID 非空值 - * @param access_token 授权的token 必要参数 - * @param machine_code 易联云打印机终端号 - * @param img_url 图片地址,图片宽度最大为350px,文件大小不能超过40Kb - * @param sign 签名 详见API文档列表-接口签名 - * @param id UUID4 详见API文档列表-uuid4 - * @param timestamp 当前服务器时间戳(10位) - * @return - */ - public static String setIcon(String client_id, String access_token, String machine_code, String img_url, String sign, String id, String timestamp) { - HashMap hashMap = new HashMap(); - hashMap.put("client_id", client_id); - hashMap.put("access_token", access_token); - hashMap.put("machine_code", machine_code); - hashMap.put("img_url", img_url); - hashMap.put("sign", sign); - hashMap.put("id", id); - hashMap.put("timestamp", timestamp); - return HttpUtil.sendPost(ApiConst.MAIN_HOST_URL + ApiConst.API_SET_ICON, hashMap, false); - } - - /** - * 取消logo接口 - * - * @param client_id 易联云颁发给开发者的应用ID 非空值 - * @param access_token 授权的token 必要参数 - * @param machine_code 易联云打印机终端号 - * @param sign 签名 详见API文档列表-接口签名 - * @param id UUID4 详见API文档列表-uuid4 - * @param timestamp 当前服务器时间戳(10位) - * @return - */ - public static String deleteIcon(String client_id, String access_token, String machine_code, String sign, String id, String timestamp) { - HashMap hashMap = new HashMap(); - hashMap.put("client_id", client_id); - hashMap.put("access_token", access_token); - hashMap.put("machine_code", machine_code); - hashMap.put("sign", sign); - hashMap.put("id", id); - hashMap.put("timestamp", timestamp); - return HttpUtil.sendPost(ApiConst.MAIN_HOST_URL + ApiConst.API_DELET_ICON, hashMap, false); - } - - /** - * 接单拒单设置接口 - * - * @param client_id 易联云颁发给开发者的应用ID 非空值 - * @param access_token 授权的token 必要参数 - * @param machine_code 易联云打印机终端号 - * @param response_type 开启:open,关闭:close - * @param sign 签名 详见API文档列表-接口签名 - * @param id UUID4 详见API文档列表-uuid4 - * @param timestamp 当前服务器时间戳(10位) - * @return - */ - public static String getOrder(String client_id, String access_token, String machine_code, String response_type, String sign, String id, String timestamp) { - HashMap hashMap = new HashMap(); - hashMap.put("client_id", client_id); - hashMap.put("access_token", access_token); - hashMap.put("machine_code", machine_code); - hashMap.put("response_type", response_type); - hashMap.put("sign", sign); - hashMap.put("id", id); - hashMap.put("timestamp", timestamp); - return HttpUtil.sendPost(ApiConst.MAIN_HOST_URL + ApiConst.API_GET_ORDER, hashMap, false); - } - - /** - * 打印方式接口 - * - * @param client_id 易联云颁发给开发者的应用ID 非空值 - * @param access_token 授权的token 必要参数 - * @param machine_code 易联云打印机终端号 - * @param response_type 开启:btnopen,关闭:btnclose; 按键打印 - * @param sign 签名 详见API文档列表-接口签名 - * @param id UUID4 详见API文档列表-uuid4 - * @param timestamp 当前服务器时间戳(10位) - * @return - */ - public static String btnPrint(String client_id, String access_token, String machine_code, String response_type, String sign, String id, String timestamp) { - HashMap hashMap = new HashMap(); - hashMap.put("client_id", client_id); - hashMap.put("access_token", access_token); - hashMap.put("machine_code", machine_code); - hashMap.put("response_type", response_type); - hashMap.put("sign", sign); - hashMap.put("id", id); - hashMap.put("timestamp", timestamp); - return HttpUtil.sendPost(ApiConst.MAIN_HOST_URL + ApiConst.API_BTN_PRINT, hashMap, false); - } - - public static String getSin(String timestamp) { - try { - StringBuilder stringBuilder = new StringBuilder(); - stringBuilder.append(Methods.CLIENT_ID); - stringBuilder.append(timestamp); - stringBuilder.append(Methods.CLIENT_SECRET); - return getMd5(stringBuilder.toString()); - } catch (Exception e) { - e.printStackTrace(); - return ""; - } - } - - public static String getuuid() { - return UUID.randomUUID().toString(); - } - - /** - * @param str - * @return - * @Description: 32位小写MD5 - */ - public static String getMd5(String str) { - String reStr = ""; - try { - MessageDigest md5 = MessageDigest.getInstance("MD5"); - byte[] bytes = md5.digest(str.getBytes()); - StringBuffer stringBuffer = new StringBuffer(); - for (byte b : bytes) { - int bt = b & 0xff; - if (bt < 16) { - stringBuffer.append(0); - } - stringBuffer.append(Integer.toHexString(bt)); - } - reStr = stringBuffer.toString(); - } catch (NoSuchAlgorithmException e) { - e.printStackTrace(); - } - return reStr; - } -} diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/printer/unit/Methods.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/printer/unit/Methods.java deleted file mode 100644 index 3d4b05f4c..000000000 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/printer/unit/Methods.java +++ /dev/null @@ -1,352 +0,0 @@ -package com.fuint.business.printer.unit; - -import org.json.JSONException; -import org.json.JSONObject; -/** - * 易联云接口工具类 - */ -public class Methods { - /** - * 易联云颁发给开发者的应用ID 非空值 - */ - public static String CLIENT_ID; - - /** - * 易联云颁发给开发者的应用secret 非空值 - */ - public static String CLIENT_SECRET; - - /** - * token - */ - public static String token; - - /** - * 刷新token需要的 refreshtoken - */ - public static String refresh_token; - - /** - * code - */ - public static String CODE; - - private Methods() { - } - - private static class SingleMethods { - private static final Methods COCOS_MANGER = new Methods(); - } - - public static final Methods getInstance() { - return SingleMethods.COCOS_MANGER; - } - - /** - * 开放式初始化 - * - * @param client_id - * @param client_secret - * @param code - */ - public void init(String client_id, String client_secret, String code) { - CLIENT_ID = client_id; - CLIENT_SECRET = client_secret; - CODE = code; - } - - /** - * 自有初始化 - * - * @param client_id - * @param client_secret - */ - public void init(String client_id, String client_secret) { - CLIENT_ID = client_id; - CLIENT_SECRET = client_secret; - } - - public void init(String a_token) { - - token = a_token; - } - - /** - * 开放应用 - */ - public String getToken() { - String timestamp = String.valueOf(System.currentTimeMillis() / 1000); - String result = LAVApi.getToken(CLIENT_ID, - "authorization_code", - LAVApi.getSin(timestamp), - CODE, - "all", - timestamp, - LAVApi.getuuid()); - try { - JSONObject json = new JSONObject(result); - JSONObject body = json.getJSONObject("body"); - token = body.getString("access_token"); - refresh_token = body.getString("refresh_token"); - } catch (JSONException e) { - e.printStackTrace(); - System.out.println("getToken出现Json异常！" + e); - } - return result; - } - - /** - * 自有应用服务 - */ - public String getFreedomToken() { - String timestamp = String.valueOf(System.currentTimeMillis() / 1000); - String result = LAVApi.getToken(CLIENT_ID, - "client_credentials", - LAVApi.getSin(timestamp), - "all", - timestamp, - LAVApi.getuuid()); - try { - JSONObject json = new JSONObject(result); - JSONObject body = json.getJSONObject("body"); - token = body.getString("access_token"); - refresh_token = body.getString("refresh_token"); - } catch (JSONException e) { - e.printStackTrace(); - System.out.println("getFreedomToken出现Json异常！" + e); - } - return result; - } - - /** - * 刷新token - */ - public String refreshToken() { - String timestamp = String.valueOf(System.currentTimeMillis() / 1000); - String result = LAVApi.refreshToken(CLIENT_ID, - "refresh_token", - "all", - LAVApi.getSin(timestamp), - refresh_token, - LAVApi.getuuid(), - timestamp); - try { - JSONObject json = new JSONObject(result); - JSONObject body = json.getJSONObject("body"); - token = body.getString("access_token"); - refresh_token = body.getString("refresh_token"); - } catch (JSONException e) { - e.printStackTrace(); - System.out.println("refreshToken出现Json异常！" + e); - } - return result; - } - - /** - * 添加终端授权 开放应用服务模式不需要此接口 ,自有应用服务模式所需参数 - */ - public String addPrinter(String machine_code, String msign) { - String timestamp = String.valueOf(System.currentTimeMillis() / 1000); - return LAVApi.addPrinter(CLIENT_ID, - machine_code, - msign, - token, - LAVApi.getSin(timestamp), - LAVApi.getuuid(), - timestamp); - } - - /** - * 极速授权 - */ - public String speedAu(String machine_code, String qr_key) { - String timestamp = String.valueOf(System.currentTimeMillis() / 1000); - return LAVApi.speedAu(CLIENT_ID, - machine_code, - qr_key, - "all", - LAVApi.getSin(timestamp), - LAVApi.getuuid(), - timestamp); - } - - /** - * 打印 - */ - public String print(String machine_code, String content, String origin_id) { - String timestamp = String.valueOf(System.currentTimeMillis() / 1000); - return LAVApi.print(CLIENT_ID, - token, - machine_code, - content, - origin_id, - LAVApi.getSin(timestamp), - LAVApi.getuuid(), - timestamp); - } - - /** - * 删除终端授权 - */ - public String deletePrinter(String machine_code) { - String timestamp = String.valueOf(System.currentTimeMillis() / 1000); - return LAVApi.deletePrinter(CLIENT_ID, - token, - machine_code, - LAVApi.getSin(timestamp), - LAVApi.getuuid(), - timestamp); - } - - /** - * 添加应用菜单 - */ - public String addPrintMenu(String machine_code, String content) { - String timestamp = String.valueOf(System.currentTimeMillis() / 1000); - return LAVApi.addPrintMenu(CLIENT_ID, - token, - machine_code, - content, - LAVApi.getSin(timestamp), - LAVApi.getuuid(), - timestamp); - } - - /** - * 关机重启接口 - */ - public String shutDownRestart(String machine_code, String response_type) { - String timestamp = String.valueOf(System.currentTimeMillis() / 1000); - return LAVApi.shutDownRestart(CLIENT_ID, - token, - machine_code, - response_type, - LAVApi.getSin(timestamp), - LAVApi.getuuid(), - timestamp); - } - - /** - * 声音调节 - */ - public String setSound(String machine_code, String response_type, String voice) { - String timestamp = String.valueOf(System.currentTimeMillis() / 1000); - return LAVApi.setSound(CLIENT_ID, - token, - machine_code, - response_type, - voice, - LAVApi.getSin(timestamp), - LAVApi.getuuid(), - timestamp); - } - - /** - * 获取机型打印宽度接口 - */ - public String getPrintInfo(String machine_code) { - String timestamp = String.valueOf(System.currentTimeMillis() / 1000); - return LAVApi.getPrintInfo(CLIENT_ID, - token, - machine_code, - LAVApi.getSin(timestamp), - LAVApi.getuuid(), - timestamp); - } - - /** - * 获取机型软硬件版本接口 - */ - public String getVersion(String machine_code) { - String timestamp = String.valueOf(System.currentTimeMillis() / 1000); - return LAVApi.getVersion(CLIENT_ID, - token, - machine_code, - LAVApi.getSin(timestamp), - LAVApi.getuuid(), - timestamp); - } - - /** - * 取消所有未打印订单 - */ - public String cancelAll(String machine_code) { - String timestamp = String.valueOf(System.currentTimeMillis() / 1000); - return LAVApi.cancelAll(CLIENT_ID, - token, - machine_code, - LAVApi.getSin(timestamp), - LAVApi.getuuid(), - timestamp); - } - - /** - * 取消单条未打印订单 - */ - public String cancelOne(String machine_code, String order_id) { - String timestamp = String.valueOf(System.currentTimeMillis() / 1000); - return LAVApi.cancelOne(CLIENT_ID, - token, - machine_code, - order_id, - LAVApi.getSin(timestamp), - LAVApi.getuuid(), - timestamp); - } - - /** - * 设置logo - */ - public String setIcon(String machine_code, String img_url) { - String timestamp = String.valueOf(System.currentTimeMillis() / 1000); - return LAVApi.setIcon(CLIENT_ID, - token, - machine_code, - img_url, - LAVApi.getSin(timestamp), - LAVApi.getuuid(), - timestamp); - } - - /** - * 删除logo - */ - public String deleteIcon(String machine_code) { - String timestamp = String.valueOf(System.currentTimeMillis() / 1000); - return LAVApi.deleteIcon(CLIENT_ID, - token, - machine_code, - LAVApi.getSin(timestamp), - LAVApi.getuuid(), - timestamp); - } - - /** - * 打印方式 - */ - public String btnPrint(String machine_code, String response_type) { - String timestamp = String.valueOf(System.currentTimeMillis() / 1000); - return LAVApi.btnPrint(CLIENT_ID, - token, - machine_code, - response_type, - LAVApi.getSin(timestamp), - LAVApi.getuuid(), - timestamp); - } - - /** - * 接单拒单设置接口 - */ - public String getOrder(String machine_code, String response_type) { - String timestamp = String.valueOf(System.currentTimeMillis() / 1000); - return LAVApi.getOrder(CLIENT_ID, - token, - machine_code, - response_type, - LAVApi.getSin(timestamp), - LAVApi.getuuid(), - timestamp); - } - -} diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/printer/unit/TestSrvlet.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/printer/unit/TestSrvlet.java deleted file mode 100644 index ca84f9284..000000000 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/printer/unit/TestSrvlet.java +++ /dev/null @@ -1,118 +0,0 @@ -package com.fuint.business.printer.unit; - -import java.io.IOException; -import java.io.PrintWriter; -import java.util.ArrayList; -import java.util.List; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -import com.fuint.business.printer.entity.Test; -import com.fuint.business.printer.template.Prient; - -/** - * 控制器 - * @author admin - * - */ -public class TestSrvlet extends HttpServlet { - /** - * Constructor of the object. - */ - public TestSrvlet() { - super(); - } - /** - * Destruction of the servlet.
- */ - public void destroy() { - super.destroy(); // Just puts "destroy" string in log - // Put your code here - } - - /** - * The doGet method of the servlet.
- * - * This method is called when a form has its tag value method equals to get. - * - * @param request the request send by the client to the server - * @param response the response send by the server to the client - * @throws ServletException if an error occurred - * @throws IOException if an error occurred - */ - public void doGet(HttpServletRequest request, HttpServletResponse response) - throws ServletException, IOException { - - - - response.setContentType("text/html"); - PrintWriter out = response.getWriter(); - //测试数据 - List testList = new ArrayList(); - Test t1 = new Test("麻辣牛肉", 23.00, 1,"1"); - Test t2 = new Test("麻辣牛肉", 23.00, 2,"2"); - Test t3 = new Test("精品千层肚", 24.00, 3,"3"); - Test t4 = new Test("麻辣牛肉", 23.00, 2,"1"); - Test t5 = new Test("极品鲜毛肚", 26.00, 2,"1"); - Test t6 = new Test("极品鲜毛肚", 26.00, 1,"2"); - Test t7 = new Test("极品鲜毛肚", 26.00, 3,"2"); - Test t8 = new Test("极品鲜毛肚", 26.00, 1,"1"); - Test t9 = new Test("极品鲜毛肚", 26.00, 2,"3"); - testList.add(t1); - testList.add(t2); - testList.add(t3); - testList.add(t4); - testList.add(t5); - testList.add(t6); - testList.add(t7); - testList.add(t8); - testList.add(t9); - Prient.setTestList(testList); - - //关键代码，自己的程序发送请求 - //初始化控制器类 - Methods m=Methods.getInstance(); - //初始化终端信息 - m.init("1038835098", "1595cb28ea30e98908e6334e735f4b8a"); - //获取token - m.getFreedomToken(); - //刷新token - m.refreshToken(); - //添加授权 - m.addPrinter("4004557406", "zqvfw2v5p3fn"); - //打印 - //终端编号 打印内容 订单号 - //生成6位随机数 - Integer random6 = (int) ((Math.random() * 9 + 1) * 100000); - String url=m.print("4004557406", Prient.print(), "Z"+System.currentTimeMillis()+random6.toString()); - response.sendRedirect(url); - out.flush(); - out.close(); - } - - /** - * The doPost method of the servlet.
- * - * This method is called when a form has its tag value method equals to post. - * - * @param request the request send by the client to the server - * @param response the response send by the server to the client - * @throws ServletException if an error occurred - * @throws IOException if an error occurred - */ - public void doPost(HttpServletRequest request, HttpServletResponse response) - throws ServletException, IOException { - - this.doGet(request, response); - } - /** - * Initialization of the servlet.
- * - * @throws ServletException if an error occurs - */ - public void init() throws ServletException { - // Put your code here - } -} diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/printer/vo/OrderPayment.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/printer/vo/OrderPayment.java deleted file mode 100644 index 5f5d0f80e..000000000 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/printer/vo/OrderPayment.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.fuint.business.printer.vo; - - -import lombok.Data; - -@Data -public class OrderPayment { - private String scannedCode; // 条码 - private String payAmountSource; // 支付来源 - private String orderPayment; // 金额 -} diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/system/dict/service/impl/SysDictTypeServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/system/dict/service/impl/SysDictTypeServiceImpl.java index 73f61eaf0..52bafa680 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/system/dict/service/impl/SysDictTypeServiceImpl.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/system/dict/service/impl/SysDictTypeServiceImpl.java @@ -20,6 +20,7 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import javax.annotation.PostConstruct; +import java.util.ArrayList; import java.util.Comparator; import java.util.List; import java.util.Map; @@ -27,7 +28,7 @@ import java.util.stream.Collectors; /** * 字典 业务层处理 - * + * * @author ruoyi */ @Service @@ -48,7 +49,7 @@ public class SysDictTypeServiceImpl extends ServiceImpl selectDictDataByType(String dictType) { - List dictDatas = DictUtils.getDictCache(dictType); + List dictDatas = new ArrayList<>(); + /* List dictDatas = DictUtils.getDictCache(dictType); if (CollectionUtils.isNotEmpty(dictDatas)) { return dictDatas; - } + }*/ dictDatas = dictDataMapper.selectDictDataByType(dictType); if (CollectionUtils.isNotEmpty(dictDatas)) { @@ -94,7 +96,7 @@ public class SysDictTypeServiceImpl extends ServiceImpl