From fe7c2fff004e4a64dae5f0982ab28663c600c778 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期四, 03 四月 2025 15:20:17 +0800
Subject: [PATCH] Merge branch '2.0' of http://120.76.84.145:10101/gitblit/r/java/PlayPai into 2.0
---
cloud-server-activity/src/main/java/com/dsh/activity/controller/HuiminController.java | 45 +++++++++++++++++++++++++++------------------
1 files changed, 27 insertions(+), 18 deletions(-)
diff --git a/cloud-server-activity/src/main/java/com/dsh/activity/controller/HuiminController.java b/cloud-server-activity/src/main/java/com/dsh/activity/controller/HuiminController.java
index 2c4eab8..13f5e8c 100644
--- a/cloud-server-activity/src/main/java/com/dsh/activity/controller/HuiminController.java
+++ b/cloud-server-activity/src/main/java/com/dsh/activity/controller/HuiminController.java
@@ -83,18 +83,7 @@
private TokenUtil tokenUtil;
private String smid = "2088330203191220";//平台支付宝商户号
- public static void main(String[] args) {
- Date date = new Date();
- date.setMonth(11);
- date.setDate(31);
- date.setHours(23);
- date.setMinutes(59);
- date.setSeconds(59);
- System.err.println(date);
- SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
- System.err.println(simpleDateFormat.format(date));
- }
/**
* 查看惠民卡详情
*/
@@ -145,13 +134,15 @@
tPayHuimin.setCardId(huiminCard.getId());
SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMddHHmmssSSS");
tPayHuimin.setCode(sdf.format(new Date()) + UUIDUtil.getNumberRandom(5));
+ System.err.println("支付数据"+tPayHuimin);
+ payHuiminService.save(tPayHuimin);
switch (payType){
case 1:
return payMoneyUtil.weixinpay("购买惠民卡"+"-"+0, "", tPayHuimin.getCode(), tPayHuimin.getSalesMoney().toString(),
- "/huimin/callBack/weixinPayHuiminCallback", "APP", "");
+ "/base/huimin/callBack/weixinPayHuiminCallback", "APP", "");
case 2:
return payMoneyUtil.alipay(smid,"购买惠民卡", "购买惠民卡", "", tPayHuimin.getCode(), tPayHuimin.getSalesMoney().toString(),
- "/huimin/callBack/aliPayHuiminCallback");
+ "/base/huimin/callBack/aliPayHuiminCallback");
}
} catch (Exception e) {
@@ -254,6 +245,21 @@
}else{
huiminAgreementVO.setShowType(2);
}
+ List<Store> stores = storeClient.queryStoreByIds(Collections.singletonList(storeId));
+ Store store = stores.get(0);
+ if (store.getOperatorId()==null || store.getOperatorId()==0){
+ // 平台
+ THuiminAgreement one = huiminAgreementService.getOne(new LambdaQueryWrapper<THuiminAgreement>()
+ .isNull(THuiminAgreement::getOperatorId).last("limit 1"));
+ huiminAgreementVO.setIntroduce(one.getStoreNoHuiminCardIntro());
+
+ }else{
+ THuiminAgreement one = huiminAgreementService.getOne(new LambdaQueryWrapper<THuiminAgreement>()
+ .eq(THuiminAgreement::getOperatorId,store.getOperatorId()).last("limit 1"));
+ huiminAgreementVO.setIntroduce(one.getStoreNoHuiminCardIntro());
+
+ }
+
List<TPayHuimin> payHuimins = payHuiminService.list(new LambdaQueryWrapper<TPayHuimin>()
.eq(TPayHuimin::getAppUserId, uid)
.ge(TPayHuimin::getEndTime,new Date())
@@ -300,6 +306,8 @@
List<MyHuiminCardVO> cardList = huiminCardService.getMyHuiminCardList(pageNo,pageSize,uid);
List<THuiminCard> list = huiminCardService.list();
for (MyHuiminCardVO myHuiminCardVO : cardList) {
+ TPayHuimin byId = payHuiminService.getById(myHuiminCardVO.getId());
+ myHuiminCardVO.setSalesMoney(byId.getSalesMoney());
if (myHuiminCardVO.getEndTime().before(new Date())){
// 已过期
myHuiminCardVO.setIsExpire(1);
@@ -357,7 +365,7 @@
}
if (tPayHuimin.getPaymentType()==1){
Map<String, String> map = payMoneyUtil.wxRefund(tPayHuimin.getOrderNumber(), tPayHuimin.getCode(),
- tPayHuimin.getSalesMoney().toString(), tPayHuimin.getSalesMoney().toString(), "/base/worldCup/wxRefundWorldCupCallback");
+ tPayHuimin.getSalesMoney().toString(), tPayHuimin.getSalesMoney().toString(), "/base/huimin/callBack/wxRefundHuiminCallback");
if(!"SUCCESS".equals(map.get("return_code"))){
System.err.println("-------------微信退款失败---------");
System.err.println(map.get("return_msg"));
@@ -405,11 +413,12 @@
}
THuiminCard byId = huiminCardService.getById(tPayHuimin.getCardId());
MyHuiminCardDetailVO myHuiminCardDetailVO = new MyHuiminCardDetailVO();
-// myHuiminCardDetailVO.setQrCode();
+ String storeIds = byId.getStoreIds();
+ String temp ="{\"storeIds\":\"" +storeIds+"\","+"\"useWeeks:\"\""+byId.getUseWeeks()+"\","+"\"useTimes:\""+byId.getUseTimes()+"\","+"\"unUseTimes:\""+byId.getUnUseTimes()+"\"}";
+ myHuiminCardDetailVO.setQrCode(temp);
myHuiminCardDetailVO.setCardId(tPayHuimin.getCardId());
- if (byId!=null){
- myHuiminCardDetailVO.setIntroduce(byId.getIntroduce());
- }
+ myHuiminCardDetailVO.setHuiminCard(byId);
+ myHuiminCardDetailVO.setIntroduce(byId.getIntroduce());
myHuiminCardDetailVO.setEndTime(tPayHuimin.getEndTime());
// 查询绑定人员列表
List<TStudent> studentByIds = studentClient.getStudentByIds(tPayHuimin.getStudentId());
--
Gitblit v1.7.1