From 328dbb98a0178479d866108d439e04e4f6e5eca3 Mon Sep 17 00:00:00 2001 From: "autumn.g@foxmail.com" Date: Tue, 30 May 2023 09:17:36 +0800 Subject: [PATCH 1/3] =?UTF-8?q?update=20=E6=B1=87=E4=BB=98=E6=94=AF?= =?UTF-8?q?=E4=BB=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/jsowell/service/OrderService.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/jsowell-admin/src/main/java/com/jsowell/service/OrderService.java b/jsowell-admin/src/main/java/com/jsowell/service/OrderService.java index 4595ba528..00844b540 100644 --- a/jsowell-admin/src/main/java/com/jsowell/service/OrderService.java +++ b/jsowell-admin/src/main/java/com/jsowell/service/OrderService.java @@ -168,8 +168,10 @@ public class OrderService { // 从字典中获取使用汇付支付的站点 List adapay_station = DictUtils.getDictCache("adapay_station"); List stationIdList = Lists.newArrayList(); - for (SysDictData sysDictData : adapay_station) { - stationIdList.add(sysDictData.getDictValue()); + if (CollectionUtils.isNotEmpty(adapay_station)) { + for (SysDictData sysDictData : adapay_station) { + stationIdList.add(sysDictData.getDictValue()); + } } Map weixinMap; if (stationIdList.contains(orderInfo.getStationId())) { From 4d7495d363cb23ccd9110a48d6d044263a1ae36c Mon Sep 17 00:00:00 2001 From: "autumn.g@foxmail.com" Date: Tue, 30 May 2023 13:45:56 +0800 Subject: [PATCH 2/3] =?UTF-8?q?update=20=E6=B1=87=E4=BB=98=E6=94=AF?= =?UTF-8?q?=E4=BB=98=20=E6=94=AF=E4=BB=98=E5=9B=9E=E8=B0=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/jsowell/service/OrderService.java | 5 ++++- .../test/java/SpringBootTestController.java | 20 ++++++++++++++----- .../pile/domain/AdapayCallbackRecord.java | 4 ++++ 3 files changed, 23 insertions(+), 6 deletions(-) diff --git a/jsowell-admin/src/main/java/com/jsowell/service/OrderService.java b/jsowell-admin/src/main/java/com/jsowell/service/OrderService.java index 00844b540..65325144c 100644 --- a/jsowell-admin/src/main/java/com/jsowell/service/OrderService.java +++ b/jsowell-admin/src/main/java/com/jsowell/service/OrderService.java @@ -1286,9 +1286,12 @@ public class OrderService { return; } //验签成功 保存到回调记录表中 + JSONObject jsonObject = JSON.parseObject(data); ObjectMapper mapper = new ObjectMapper(); mapper.setPropertyNamingStrategy(PropertyNamingStrategies.SNAKE_CASE); - AdapayCallbackRecord adapayCallbackRecord = mapper.readValue(data, AdapayCallbackRecord.class); + AdapayCallbackRecord adapayCallbackRecord = mapper.readValue(jsonObject.toJSONString(), AdapayCallbackRecord.class); + adapayCallbackRecord.setExpend(jsonObject.getString("expend")); + adapayCallbackRecord.setPaymentId(jsonObject.getString("id")); adapayCallbackRecordService.saveAdapayCallbackRecord(adapayCallbackRecord); JSONObject descJson = JSON.parseObject(adapayCallbackRecord.getDescription()); diff --git a/jsowell-admin/src/test/java/SpringBootTestController.java b/jsowell-admin/src/test/java/SpringBootTestController.java index 83695399b..1934b0b16 100644 --- a/jsowell-admin/src/test/java/SpringBootTestController.java +++ b/jsowell-admin/src/test/java/SpringBootTestController.java @@ -10,6 +10,7 @@ import com.huifu.adapay.model.Refund; import com.jsowell.JsowellApplication; import com.jsowell.common.constant.CacheConstants; import com.jsowell.common.constant.Constants; +import com.jsowell.common.core.domain.entity.SysDictData; import com.jsowell.common.core.domain.ykc.LoginRequestData; import com.jsowell.common.core.domain.ykc.TransactionRecordsData; import com.jsowell.common.core.redis.RedisCache; @@ -169,12 +170,13 @@ public class SpringBootTestController { @Test public void testSaveCallback() throws JsonProcessingException { - String data = "{\"app_id\":\"app_d0c80cb1-ffc8-48cb-a030-fe9bec823aaa\",\"created_time\":\"20230527100758\",\"description\":\"{\\\"type\\\":\\\"balance\\\",\\\"memberId\\\":\\\"29336349\\\"}\",\"end_time\":\"20230527100810\",\"expend\":{\"bank_type\":\"OTHERS\",\"open_id\":\"o8jhot6PJF93EPhNISsXi28dKdS8\",\"sub_open_id\":\"o4REX5MprZfTaLnVNxfdOY-wnwGI\"},\"fee_amt\":\"0.00\",\"id\":\"002212023052710075810508353847861903360\",\"order_no\":\"4c457bd474334d5eaf82f4795265b6ad\",\"out_trans_id\":\"4200001864202305270647556621\",\"party_order_id\":\"02212305273647819807712\",\"pay_amt\":\"0.01\",\"pay_channel\":\"wx_lite\",\"real_amt\":\"0.01\",\"share_eq\":\"Y\",\"status\":\"succeeded\",\"wx_user_id\":\"\"}"; + String data = "{\"app_id\":\"app_d0c80cb1-ffc8-48cb-a030-fe9bec823aaa\",\"created_time\":\"20230530132956\",\"description\":\"{\\\"orderCode\\\":\\\"C29505932783\\\",\\\"type\\\":\\\"order\\\"}\",\"end_time\":\"20230530133027\",\"expend\":{\"bank_type\":\"OTHERS\",\"open_id\":\"o8jhot6PJF93EPhNISsXi28dKdS8\",\"sub_open_id\":\"o4REX5MprZfTaLnVNxfdOY-wnwGI\"},\"fee_amt\":\"0.11\",\"id\":\"002212023053013295610509491838664794112\",\"order_no\":\"C29505932783\",\"out_trans_id\":\"4200001855202305308670391485\",\"party_order_id\":\"02212305304859640306711\",\"pay_amt\":\"20.00\",\"pay_channel\":\"wx_lite\",\"real_amt\":\"20.00\",\"share_eq\":\"Y\",\"status\":\"succeeded\",\"wx_user_id\":\"\"}"; JSONObject jsonObject = JSON.parseObject(data); ObjectMapper mapper = new ObjectMapper(); mapper.setPropertyNamingStrategy(PropertyNamingStrategies.SNAKE_CASE); AdapayCallbackRecord adapayCallbackRecord = mapper.readValue(jsonObject.toJSONString(), AdapayCallbackRecord.class); adapayCallbackRecord.setExpend(jsonObject.getString("expend")); + adapayCallbackRecord.setPaymentId(jsonObject.getString("id")); adapayCallbackRecordService.saveAdapayCallbackRecord(adapayCallbackRecord); } @@ -678,11 +680,19 @@ public class SpringBootTestController { @Test public void testDict() { - String dictValue = DictUtils.getDictValue("query_pile_info", "url"); - String station_type = DictUtils.getDictLabel("station_type", "1"); - System.out.println(station_type); - System.out.println("123"); + // String dictValue = DictUtils.getDictValue("query_pile_info", "url"); + // String station_type = DictUtils.getDictLabel("station_type", "1"); + // System.out.println(station_type); + // System.out.println("123"); + List adapay_station = DictUtils.getDictCache("adapay_station"); + List stationIdList = com.google.common.collect.Lists.newArrayList(); + if (CollectionUtils.isNotEmpty(adapay_station)) { + for (SysDictData sysDictData : adapay_station) { + stationIdList.add(sysDictData.getDictValue()); + } + } + System.out.println(stationIdList); } @Test diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/domain/AdapayCallbackRecord.java b/jsowell-pile/src/main/java/com/jsowell/pile/domain/AdapayCallbackRecord.java index 0dc22d1c2..204af5b2d 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/domain/AdapayCallbackRecord.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/domain/AdapayCallbackRecord.java @@ -22,6 +22,7 @@ public class AdapayCallbackRecord implements Serializable { /** * 主键id */ + @JsonIgnore private Integer id; /** @@ -39,6 +40,9 @@ public class AdapayCallbackRecord implements Serializable { */ private String payScenario; + /** + * 支付对象id + */ private String paymentId; /** From 1c9c37d46e077b244c09100d99b1d0b9e0d2e224 Mon Sep 17 00:00:00 2001 From: "autumn.g@foxmail.com" Date: Tue, 30 May 2023 14:02:51 +0800 Subject: [PATCH 3/3] =?UTF-8?q?update=20=E6=B1=87=E4=BB=98=E6=94=AF?= =?UTF-8?q?=E4=BB=98=20=E6=94=AF=E4=BB=98=E5=9B=9E=E8=B0=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/jsowell/service/OrderService.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/jsowell-admin/src/main/java/com/jsowell/service/OrderService.java b/jsowell-admin/src/main/java/com/jsowell/service/OrderService.java index 65325144c..2b351a901 100644 --- a/jsowell-admin/src/main/java/com/jsowell/service/OrderService.java +++ b/jsowell-admin/src/main/java/com/jsowell/service/OrderService.java @@ -1292,13 +1292,19 @@ public class OrderService { AdapayCallbackRecord adapayCallbackRecord = mapper.readValue(jsonObject.toJSONString(), AdapayCallbackRecord.class); adapayCallbackRecord.setExpend(jsonObject.getString("expend")); adapayCallbackRecord.setPaymentId(jsonObject.getString("id")); - adapayCallbackRecordService.saveAdapayCallbackRecord(adapayCallbackRecord); JSONObject descJson = JSON.parseObject(adapayCallbackRecord.getDescription()); String type = descJson.getString("type"); + adapayCallbackRecord.setPayScenario(type); String memberId = descJson.getString("memberId"); + adapayCallbackRecord.setMemberId(memberId); String orderCode = descJson.getString("orderCode"); + adapayCallbackRecord.setOrderCode(orderCode); BigDecimal amount = adapayCallbackRecord.getPayAmt(); + + // 保存到数据库 + adapayCallbackRecordService.saveAdapayCallbackRecord(adapayCallbackRecord); + if (StringUtils.equals(type, ScenarioEnum.ORDER.getValue())) { // 1-订单支付 // 支付订单成功 PayOrderSuccessCallbackDTO callbackDTO = PayOrderSuccessCallbackDTO.builder()