From 3ca9cbe111f62f00ad8d3ca08cd23dd7c8dc9a81 Mon Sep 17 00:00:00 2001 From: Carl <376654749@qq.com> Date: Sun, 30 Jan 2022 15:52:41 +0800 Subject: [PATCH] debugger --- .../royalcanin/good/OrderController.java | 1 - .../royalcanin/good/service/GoodService.java | 6 +++++- .../royalcanin/good/service/OrderService.java | 19 ++++++++++++------- .../module/system/wxpay/WxpayService.java | 4 ++-- 4 files changed, 19 insertions(+), 11 deletions(-) diff --git a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/good/OrderController.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/good/OrderController.java index e781648e..66238af8 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/good/OrderController.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/good/OrderController.java @@ -131,7 +131,6 @@ public class OrderController { Map returnMap = new HashMap<>(); returnMap.put("orderNumber", ordersEntity.getOrderNo()); returnMap.put("orderAmount", ordersEntity.getOrderAmount()); -// return ResponseDTO.succData(returnMap,wxpayService.generateQRCode(wxPayEntity)); return ResponseDTO.succData(returnMap, wxpayService.generateQRCode(wxPayEntity)); } }catch (Exception e){ diff --git a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/good/service/GoodService.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/good/service/GoodService.java index 041719de..4d397120 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/good/service/GoodService.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/good/service/GoodService.java @@ -31,7 +31,11 @@ public class GoodService { private RedisTemplate redisTemplate; public GoodsEntity listGoodsByProductCode(String productCode){ - return goodsDao.findByProductCode(productCode); + String ip = "https://shop.royalcanin.com.cn/royalcanin/royalcanin/"; + GoodsEntity goodsEntity = goodsDao.findByProductCode(productCode); + goodsEntity.setShowImgFile(ip+goodsEntity.getPicture()); + goodsEntity.setPicture(ip+goodsEntity.getPicture()); + return goodsEntity; } public List listGoodsByNameBankNameTagUsedAge(String title,String petType){ diff --git a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/good/service/OrderService.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/good/service/OrderService.java index af440a93..f18c2762 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/good/service/OrderService.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/good/service/OrderService.java @@ -238,14 +238,19 @@ public class OrderService { JSONObject jsonObject = JSONObject.parseObject(result); String afterDecodeResult = AESUtil.decryptLinux(jsonObject.getString("data"), AESUtil.KEY); com.alibaba.fastjson.JSONArray jsonArray = JSONObject.parseArray(afterDecodeResult); - JSONObject jsonObjectResult = (JSONObject)jsonArray.get(0); - if (queryEntity.getOrderNumber() != null &&queryEntity.getOrderNumber() != "") { - OrderEntity orderEntity = ordersDao.findByOrderId(queryEntity.getOrderNumber()); - //新增支付方式paytype - jsonObjectResult.put("paytype",orderEntity.getPayType()); - jsonObjectResult.put("basePoint",orderEntity.getBasePoint()); - } + for (int i = 0; i < jsonArray.size();i++){ + JSONObject jsonObjectResult = (JSONObject)jsonArray.get(i); + OrderEntity orderEntity = ordersDao.findByOrderId(jsonObjectResult.getString("orderNumber")); + if (orderEntity == null){ + jsonObjectResult.put("paytype","0"); + jsonObjectResult.put("basePoint","0"); + }else { + //新增支付方式paytype + jsonObjectResult.put("paytype",orderEntity.getPayType()); + jsonObjectResult.put("basePoint",orderEntity.getBasePoint()); + } + } //记录服务响应时间 addOperatreFullData(url+"orderMaster/query",queryEntity.toString(),result, startTime,elapsedTime,acceptTime); diff --git a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/wxpay/WxpayService.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/wxpay/WxpayService.java index 90e6b352..bff70258 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/wxpay/WxpayService.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/wxpay/WxpayService.java @@ -46,8 +46,8 @@ public class WxpayService { @Autowired private MemberAccountService memberAccountService; - String url = "https://miniapp-test.royalcanin.com.cn/rcmini/h5/"; -// String url = "https://miniapp-product.royalcanin.com.cn/rcmini2020"; +// String url = "https://miniapp-test.royalcanin.com.cn/rcmini/h5/"; + String url = "https://miniapp-product.royalcanin.com.cn/rcmini2020/h5/"; public String generateQRCode(WxPayEntity wxPayEntity) throws Exception { WXPay wxpay = new WXPay(config);