From 4f4538356403d620b9bd510fd45729a251291942 Mon Sep 17 00:00:00 2001
From: rk <94314517@qq.com>
Date: 星期五, 03 七月 2026 18:27:36 +0800
Subject: [PATCH] 功能开发
---
server/services/src/main/java/com/doumee/core/wx/WxMiniUtilService.java | 4 +-
server/接口变更说明.txt | 2
server/services/src/main/java/com/doumee/service/business/impl/ReportServiceImpl.java | 5 ++
server/platform/src/main/java/com/doumee/api/business/DouyinVerifyController.java | 17 +++++---
server/services/src/main/java/com/doumee/dao/business/web/response/DouyinShopPoiVO.java | 28 ++++++++++++++
server/services/src/main/resources/application-dev.yml | 12 +++---
server/services/src/main/java/com/doumee/service/business/impl/GoodsorderServiceImpl.java | 2
server/platform/src/main/resources/application.yml | 2
server/web/src/main/resources/application.yml | 2
server/services/src/main/java/com/doumee/core/douyin/dto/DouyinShopPoiResp.java | 34 +++++++++++++++--
10 files changed, 86 insertions(+), 22 deletions(-)
diff --git a/server/platform/src/main/java/com/doumee/api/business/DouyinVerifyController.java b/server/platform/src/main/java/com/doumee/api/business/DouyinVerifyController.java
index 68dc39d..821db36 100644
--- a/server/platform/src/main/java/com/doumee/api/business/DouyinVerifyController.java
+++ b/server/platform/src/main/java/com/doumee/api/business/DouyinVerifyController.java
@@ -16,6 +16,7 @@
import com.doumee.dao.business.model.DouyinVerifyLog;
import com.doumee.dao.business.model.DouyinVerifyRecord;
import com.doumee.dao.business.vo.DouyinVerifyRecordPageVO;
+import com.doumee.dao.business.web.response.DouyinShopPoiVO;
import com.doumee.service.business.DouyinVerifyLogService;
import com.doumee.service.business.DouyinVerifyService;
import io.swagger.annotations.Api;
@@ -64,22 +65,26 @@
return ApiResponse.success(douyinVerifyService.findManagePage(pageWrap));
}
- @ApiOperation("鏌ヨ鎶栭煶鍟嗘埛涓嬮棬搴�(鐢ㄤ簬閫夋牳閿�闂ㄥ簵;account_id 浠庡瓧鍏歌鍙�)")
+ @ApiOperation("鏌ヨ鎶栭煶鍟嗘埛涓嬮棬搴�(poiId + 闂ㄥ簵鍚嶇О鎴愬杩斿洖;account_id 浠庡瓧鍏歌鍙�)")
@PostMapping("/poiList")
@RequiresPermissions("business:douyinVerify:query")
- public ApiResponse<List<String>> poiList() {
+ public ApiResponse<List<DouyinShopPoiVO>> poiList() {
// 闂ㄥ簵鏌ヨ涓烘棤鐘舵�侀�忎紶(鏃犺惤搴�),Controller 鈫� DouyinClient 鐩磋繛;account_id 鐢� Client 浠庡瓧鍏歌鍙�
DouyinBaseResp<DouyinShopPoiResp> resp = douyinClient.shopPoiQuery();
List<DouyinShopPoiResp.Poi> pois = resp == null || resp.getData() == null ? null : resp.getData().getPois();
if (pois == null || pois.isEmpty()) {
return ApiResponse.success(Collections.emptyList());
}
- // 浠呮彁鍙栭棬搴桰D,杩囨护 poi 鑺傜偣鎴� poiId 涓虹┖鐨勬潯鐩�
- List<String> poiIds = pois.stream()
+ // 鎻愬彇闂ㄥ簵ID + 闂ㄥ簵鍚嶇О鎴愬杩斿洖;杩囨护 poi 鑺傜偣鎴� poiId 涓虹┖鐨勬潯鐩�
+ // 闂ㄥ簵鍚嶇О瀹為檯璺緞涓� pois[].account.poi_account.account_name
+ List<DouyinShopPoiVO> poiList = pois.stream()
.filter(p -> p != null && p.getPoi() != null && StringUtils.isNotBlank(p.getPoi().getPoiId()))
- .map(p -> p.getPoi().getPoiId())
+ .map(p -> new DouyinShopPoiVO(
+ p.getPoi().getPoiId(),
+ p.getAccount() == null || p.getAccount().getPoiAccount() == null
+ ? null : p.getAccount().getPoiAccount().getAccountName()))
.collect(Collectors.toList());
- return ApiResponse.success(poiIds);
+ return ApiResponse.success(poiList);
}
@PreventRepeat
diff --git a/server/platform/src/main/resources/application.yml b/server/platform/src/main/resources/application.yml
index f9ad69d..495699e 100644
--- a/server/platform/src/main/resources/application.yml
+++ b/server/platform/src/main/resources/application.yml
@@ -9,7 +9,7 @@
# application:
# name: parkbike
profiles:
- active: dev
+ active: pro
# JSON杩斿洖閰嶇疆
jackson:
# 榛樿鏃跺尯
diff --git a/server/services/src/main/java/com/doumee/core/douyin/dto/DouyinShopPoiResp.java b/server/services/src/main/java/com/doumee/core/douyin/dto/DouyinShopPoiResp.java
index 8083126..3ce517c 100644
--- a/server/services/src/main/java/com/doumee/core/douyin/dto/DouyinShopPoiResp.java
+++ b/server/services/src/main/java/com/doumee/core/douyin/dto/DouyinShopPoiResp.java
@@ -8,8 +8,10 @@
/**
* 銆屾煡璇㈤棬搴椾俊鎭�嶅嚭鍙�(data 鑺傜偣)銆�
* <p>GET https://open.douyin.com/goodlife/v1/shop/poi/query/
- * <p>杩斿洖鍟嗘埛涓嬪凡璁ら鐨勯棬搴楀垪琛�,闂ㄥ簵ID宓屽鍦� pois[].poi.poi_id銆�
- * 褰撳墠鍙敤闂ㄥ簵ID,鍏朵綑鑺傜偣(account / root_account 绛�)涓嶅仛鏄犲皠銆�
+ * <p>杩斿洖鍟嗘埛涓嬪凡璁ら鐨勯棬搴楀垪琛�:
+ * 闂ㄥ簵ID宓屽鍦� pois[].poi.poi_id,
+ * 闂ㄥ簵鍚嶇О宓屽鍦� pois[].account.poi_account.account_name銆�
+ * 褰撳墠鐢ㄩ棬搴桰D + 闂ㄥ簵鍚嶇О,鍏朵綑鑺傜偣涓嶅仛鏄犲皠銆�
*
* @author rk
* @date 2026/06/26
@@ -30,17 +32,21 @@
private String description;
/**
- * 鍗曚釜闂ㄥ簵鏉＄洰銆備粎瑙ｆ瀽 poi 鑺傜偣鍙栭棬搴桰D銆�
+ * 鍗曚釜闂ㄥ簵鏉＄洰銆傝В鏋� poi 鑺傜偣鍙栭棬搴桰D,account.poi_account 鍙栭棬搴楀悕绉般��
*/
@Data
public static class Poi {
/** 闂ㄥ簵鍩烘湰淇℃伅(鍚� poi_id) */
@JSONField(name = "poi")
private PoiInfo poi;
+
+ /** 璐﹀彿淇℃伅(鍚� parent_account / poi_account,闂ㄥ簵鍚嶇О鍦� poi_account.account_name) */
+ @JSONField(name = "account")
+ private Account account;
}
/**
- * 闂ㄥ簵鍩烘湰淇℃伅銆傚綋鍓嶅搷搴斾粎鐢ㄥ埌 poi_id銆�
+ * 闂ㄥ簵鍩烘湰淇℃伅銆傚綋鍓嶅搷搴旂敤鍒� poi_id銆�
*/
@Data
public static class PoiInfo {
@@ -48,4 +54,24 @@
@JSONField(name = "poi_id")
private String poiId;
}
+
+ /**
+ * 璐﹀彿淇℃伅銆傚綋鍓嶅搷搴旂敤鍒� poi_account.account_name 浣滀负闂ㄥ簵鍚嶇О灞曠ず銆�
+ */
+ @Data
+ public static class Account {
+ /** 闂ㄥ簵瀵瑰簲鐨勬姈闊虫潵瀹㈣处鍙�(鍚� account_name 闂ㄥ簵鍚嶇О) */
+ @JSONField(name = "poi_account")
+ private PoiAccount poiAccount;
+ }
+
+ /**
+ * 闂ㄥ簵璐﹀彿淇℃伅銆俛ccount_name 浣滀负闂ㄥ簵鍚嶇О灞曠ず銆�
+ */
+ @Data
+ public static class PoiAccount {
+ /** 闂ㄥ簵鍚嶇О(鎶栭煶渚ц处鍙峰悕绉�,鐢ㄤ簬鍓嶇閫夋牳閿�闂ㄥ簵灞曠ず) */
+ @JSONField(name = "account_name")
+ private String accountName;
+ }
}
diff --git a/server/services/src/main/java/com/doumee/core/wx/WxMiniUtilService.java b/server/services/src/main/java/com/doumee/core/wx/WxMiniUtilService.java
index 4b638d9..3800317 100644
--- a/server/services/src/main/java/com/doumee/core/wx/WxMiniUtilService.java
+++ b/server/services/src/main/java/com/doumee/core/wx/WxMiniUtilService.java
@@ -80,8 +80,8 @@
request.setSubMchid(WxMiniConfig.wxProperties.getSubMchId());
request.setNotifyUrl(WxMiniConfig.wxProperties.getRefundNotifyUrl());
AmountReq amountReq = new AmountReq();
- amountReq.setTotal(1L);//refundDTO.getTotalAmount().longValue());
- amountReq.setRefund(1L);//refundDTO.getRefundAmount().longValue());
+ amountReq.setTotal(refundDTO.getTotalAmount().longValue());
+ amountReq.setRefund(refundDTO.getRefundAmount().longValue());
amountReq.setCurrency("CNY");
request.setAmount(amountReq);
try {
diff --git a/server/services/src/main/java/com/doumee/dao/business/web/response/DouyinShopPoiVO.java b/server/services/src/main/java/com/doumee/dao/business/web/response/DouyinShopPoiVO.java
new file mode 100644
index 0000000..505cd98
--- /dev/null
+++ b/server/services/src/main/java/com/doumee/dao/business/web/response/DouyinShopPoiVO.java
@@ -0,0 +1,28 @@
+package com.doumee.dao.business.web.response;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * 鎶栭煶鍟嗘埛涓嬮棬搴�(poiId + 闂ㄥ簵鍚嶇О鎴愬杩斿洖)銆�
+ * <p>鐢ㄤ簬绠＄悊绔� /business/douyinVerify/poiList 閫夋牳閿�闂ㄥ簵涓嬫媺灞曠ず銆�
+ * poiId 鍙栬嚜鎶栭煶鍝嶅簲 pois[].poi.poi_id,poiName 鍙栬嚜 pois[].poi_account.account_name銆�
+ *
+ * @author rk
+ * @date 2026/07/03
+ */
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@ApiModel("鎶栭煶闂ㄥ簵(poiId + 鍚嶇О)")
+public class DouyinShopPoiVO {
+
+ @ApiModelProperty("鎶栭煶闂ㄥ簵POI ID(鏍搁攢闂ㄥ簵ID)")
+ private String poiId;
+
+ @ApiModelProperty("闂ㄥ簵鍚嶇О(鎶栭煶 poi_account.account_name)")
+ private String poiName;
+}
diff --git a/server/services/src/main/java/com/doumee/service/business/impl/GoodsorderServiceImpl.java b/server/services/src/main/java/com/doumee/service/business/impl/GoodsorderServiceImpl.java
index 68a49e9..5e5c170 100644
--- a/server/services/src/main/java/com/doumee/service/business/impl/GoodsorderServiceImpl.java
+++ b/server/services/src/main/java/com/doumee/service/business/impl/GoodsorderServiceImpl.java
@@ -1377,7 +1377,7 @@
request.setOutTradeNo(goodsorder.getId());
request.setNotifyUrl(WxMiniConfig.wxProperties.getNotifyUrl());//杩欎釜鍥炶皟url蹇呴』鏄痟ttps寮�澶寸殑
Amount amount = new Amount();
- amount.setTotal(1);//goodsorder.getMoney().intValue());
+ amount.setTotal(goodsorder.getMoney().intValue());
request.setAmount(amount);
// PrepayResponse res = WxMiniConfig.wxPayService.prepay(request);
// 璺熶箣鍓嶄笅鍗曠ず渚嬩竴鏍凤紝濉厖棰勪笅鍗曞弬鏁�
diff --git a/server/services/src/main/java/com/doumee/service/business/impl/ReportServiceImpl.java b/server/services/src/main/java/com/doumee/service/business/impl/ReportServiceImpl.java
index 500d6d9..716ba4b 100644
--- a/server/services/src/main/java/com/doumee/service/business/impl/ReportServiceImpl.java
+++ b/server/services/src/main/java/com/doumee/service/business/impl/ReportServiceImpl.java
@@ -433,6 +433,8 @@
IPage<OperationOrderVO> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
OperationOrderQueryDTO model = pageWrap.getModel() == null
? new OperationOrderQueryDTO() : pageWrap.getModel();
+ // 绉熺敤涓�(status=1):闇�杩囨护鎺夋棤楠戣璁板綍鐨勮鍗�(宸叉敮浠樹絾鐢ㄦ埛浠庢湭寮�閿侀獞琛�)
+ boolean queryInProgress = Objects.nonNull(model.getStatus()) && model.getStatus().equals(Constants.ONE);
// 鈹�鈹� 姝ラ1:鍒嗛〉涓绘煡璇� 鈹�鈹�
// 涓昏〃 goodsorder left join member(鍙栨墜鏈哄彿)+ left join base_param(鍙栫粨绠楄溅鍨嬪悕);
@@ -459,6 +461,9 @@
// 璁㈠崟绫诲瀷:鎸夐獞琛岃褰� member_rides.type 绛涢��(鍙��)
.inSql(Objects.nonNull(model.getBikeType()), Goodsorder::getId,
"select ordre_id from member_rides where isdeleted = 0 and type = " + model.getBikeType())
+ // 绉熺敤涓�(status=1):浠呬繚鐣欏瓨鍦ㄩ獞琛岃褰曠殑璁㈠崟,杩囨护鎺夊凡鏀粯浣嗘棤楠戣璁板綍鐨勬暟鎹�
+ .inSql(queryInProgress, Goodsorder::getId,
+ "select ordre_id from member_rides where isdeleted = 0")
.orderByDesc(Goodsorder::getPayDate);
IPage<OperationOrderVO> result = goodsorderMapper.selectJoinPage(page, OperationOrderVO.class, wrapper);
List<OperationOrderVO> records = result.getRecords();
diff --git a/server/services/src/main/resources/application-dev.yml b/server/services/src/main/resources/application-dev.yml
index cbf46c8..c3b0fbe 100644
--- a/server/services/src/main/resources/application-dev.yml
+++ b/server/services/src/main/resources/application-dev.yml
@@ -54,12 +54,12 @@
# refundNotifyUrl: http://xiaopiqiu3.natapp1.cc/api/wxRefundNotify
notifyUrl: https://test.doumee.cn/bikeWeb/api/wxPayNotify
refundNotifyUrl: https://test.doumee.cn/bikeWeb/api/wxRefundNotify
- keyPath: /usr/local/jars/bike/apiclient_cert.p12
- privateCertPath: /usr/local/jars/bike/apiclient_cert.pem
- privateKeyPath: /usr/local/jars/bike/apiclient_key.pem
-# keyPath: d://apiclient_cert.p12
-# privateCertPath: d://apiclient_cert.pem
-# privateKeyPath: d://apiclient_key.pem
+# keyPath: /usr/local/jars/bike/apiclient_cert.p12
+# privateCertPath: /usr/local/jars/bike/apiclient_cert.pem
+# privateKeyPath: /usr/local/jars/bike/apiclient_key.pem
+ keyPath: d://apiclient_cert.p12
+ privateCertPath: d://apiclient_cert.pem
+ privateKeyPath: d://apiclient_key.pem
#鏈嶅姟鍟�-------------end---
existsSub: 1
appSecret: 1ceb7c9dff3c4330d653adc3ca55ea24
diff --git a/server/web/src/main/resources/application.yml b/server/web/src/main/resources/application.yml
index a483097..b83b429 100644
--- a/server/web/src/main/resources/application.yml
+++ b/server/web/src/main/resources/application.yml
@@ -9,7 +9,7 @@
# application:
# name: parkbike
profiles:
- active: dev
+ active: pro
# JSON杩斿洖閰嶇疆
jackson:
# 榛樿鏃跺尯
diff --git "a/server/\346\216\245\345\217\243\345\217\230\346\233\264\350\257\264\346\230\216.txt" "b/server/\346\216\245\345\217\243\345\217\230\346\233\264\350\257\264\346\230\216.txt"
index 27a2dfe..ac2cd96 100644
--- "a/server/\346\216\245\345\217\243\345\217\230\346\233\264\350\257\264\346\230\216.txt"
+++ "b/server/\346\216\245\345\217\243\345\217\230\346\233\264\350\257\264\346\230\216.txt"
@@ -20,7 +20,7 @@
浜屻�佹姈闊冲埜鏍搁攢(鏂版枃浠� DouyinVerifyController,/business/douyinVerify)
4. POST /business/douyinVerify/page 鏍搁攢璁板綍鍒嗛〉(瀵瑰)
- 5. POST /business/douyinVerify/poiList 鏌ヨ鎶栭煶鍟嗘埛涓嬮棬搴桰D鍒楄〃(鏃犲叆鍙�,杩斿洖 List<String>)
+ 5. POST /business/douyinVerify/poiList 鏌ヨ鎶栭煶鍟嗘埛涓嬮棬搴楀垪琛�(鏃犲叆鍙�,杩斿洖 List<DouyinShopPoiVO>:poiId + poiName 闂ㄥ簵鍚嶇О鎴愬)
6. POST /business/douyinVerify/cancel 鎾ら攢鏍搁攢(绠＄悊绔�,涓嶅彈1灏忔椂闄愬埗)
涓夈�佹姈闊冲晢鍝�(鏂版枃浠� DouyinProductController,/business/douyinProduct)
--
Gitblit v1.9.3