From 51f26723bee741bf112c8d0d965d0e2f2974bd04 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期一, 31 三月 2025 10:02:52 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0' into 2.0
---
cloud-server-activity/src/main/resources/mapper/HuiminCardMapper.xml | 10
cloud-server-activity/src/main/java/com/dsh/activity/service/impl/HuiminRecordServiceImpl.java | 23
cloud-server-activity/src/main/java/com/dsh/activity/model/response/MyHuiminCardVO.java | 43 +
cloud-server-activity/src/main/java/com/dsh/activity/util/httpClinet/HttpClientUtil.java | 8
cloud-server-activity/src/main/java/com/dsh/activity/model/response/HuiminCardVO.java | 2
cloud-server-activity/src/main/java/com/dsh/activity/util/MD5AndKL.java | 111 ++
cloud-server-activity/src/main/resources/mapper/HuiminRecordMapper.xml | 6
cloud-server-activity/src/main/java/com/dsh/activity/controller/HuiminController.java | 315 +++++++
cloud-server-account/src/main/java/com/dsh/account/controller/StudentController.java | 12
cloud-server-activity/src/main/java/com/dsh/activity/util/PayMoneyUtil.java | 1333 ++++++++++++++++++++++++++++++++++
cloud-server-activity/src/main/java/com/dsh/activity/mapper/HuiminCardMapper.java | 3
cloud-server-activity/src/main/java/com/dsh/activity/model/response/MyHuiminCardDetailVO.java | 33
cloud-server-activity/pom.xml | 5
cloud-server-activity/src/main/java/com/dsh/activity/service/HuiminRecordService.java | 20
cloud-server-activity/src/main/java/com/dsh/activity/service/HuiminCardService.java | 3
cloud-server-activity/src/main/java/com/dsh/activity/util/DateUtil.java | 6
cloud-server-activity/src/main/java/com/dsh/activity/entity/THuiminAgreementSetting.java | 10
cloud-server-activity/src/main/java/com/dsh/activity/entity/THuiminRecord.java | 77 +
cloud-server-activity/src/main/java/com/dsh/activity/entity/TPayHuimin.java | 7
cloud-server-activity/src/main/java/com/dsh/activity/service/impl/HuiminCardServiceImpl.java | 6
cloud-server-activity/src/main/java/com/dsh/activity/controller/HuiminCallBack.java | 166 ++++
cloud-server-activity/src/main/java/com/dsh/activity/feignclient/account/StudentClient.java | 10
cloud-server-activity/src/main/java/com/dsh/activity/entity/THuiminCard.java | 57 +
cloud-server-activity/src/main/java/com/dsh/activity/mapper/HuiminRecordMapper.java | 18
24 files changed, 2,259 insertions(+), 25 deletions(-)
diff --git a/cloud-server-account/src/main/java/com/dsh/account/controller/StudentController.java b/cloud-server-account/src/main/java/com/dsh/account/controller/StudentController.java
index 9869b65..75a4465 100644
--- a/cloud-server-account/src/main/java/com/dsh/account/controller/StudentController.java
+++ b/cloud-server-account/src/main/java/com/dsh/account/controller/StudentController.java
@@ -58,7 +58,17 @@
@Resource
private CoursePackageClient coursePackageClient;
-
+ /**
+ * 查询惠民卡绑定学员列表信息
+ *
+ * @return
+ */
+ @RequestMapping("/base/student/getStudentByIds/{ids}")
+ public List<TStudent> getStudentByIds(@PathVariable("ids") String ids) {
+ List<TStudent> list = studentService.list(new LambdaQueryWrapper<TStudent>()
+ .in(TStudent::getId, Arrays.asList(ids.split(","))));
+ return list;
+ }
/**
* 添加学员
diff --git a/cloud-server-activity/pom.xml b/cloud-server-activity/pom.xml
index f9a0ec0..a9ab517 100644
--- a/cloud-server-activity/pom.xml
+++ b/cloud-server-activity/pom.xml
@@ -15,6 +15,11 @@
<description>福利</description>
<dependencies>
<dependency>
+ <groupId>com.alipay.sdk</groupId>
+ <artifactId>alipay-sdk-java</artifactId>
+ <version>4.38.10.ALL</version>
+ </dependency>
+ <dependency>
<groupId>org.gavaghan</groupId>
<artifactId>geodesy</artifactId>
<version>1.1.3</version>
diff --git a/cloud-server-activity/src/main/java/com/dsh/activity/controller/HuiminCallBack.java b/cloud-server-activity/src/main/java/com/dsh/activity/controller/HuiminCallBack.java
new file mode 100644
index 0000000..ec8d2a3
--- /dev/null
+++ b/cloud-server-activity/src/main/java/com/dsh/activity/controller/HuiminCallBack.java
@@ -0,0 +1,166 @@
+package com.dsh.activity.controller;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.dsh.activity.entity.THuiminAgreement;
+import com.dsh.activity.entity.THuiminAgreementSetting;
+import com.dsh.activity.entity.THuiminCard;
+import com.dsh.activity.entity.TPayHuimin;
+import com.dsh.activity.feignclient.other.SiteClient;
+import com.dsh.activity.feignclient.other.StoreClient;
+import com.dsh.activity.feignclient.other.model.Store;
+import com.dsh.activity.model.response.HuiminAgreementVO;
+import com.dsh.activity.model.response.HuiminCardVO;
+import com.dsh.activity.service.*;
+import com.dsh.activity.util.PayMoneyUtil;
+import com.dsh.activity.util.ResultUtil;
+import com.dsh.activity.util.TokenUtil;
+import com.dsh.activity.util.UUIDUtil;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.text.SimpleDateFormat;
+import java.time.LocalDateTime;
+import java.time.ZoneId;
+import java.util.*;
+import java.util.stream.Collectors;
+
+/**
+ * 惠民卡回调
+ * @author zhibing.pu
+ * @date 2023/6/24 11:27
+ */
+@RestController
+@RequestMapping("/huimin/callBack")
+public class HuiminCallBack {
+
+ @Autowired
+ private ICouponService couponService;
+
+
+ @Autowired
+ private HuiminAgreementService huiminAgreementService;
+
+ @Autowired
+ private HuiminAgreementSettingService huiminAgreementSettingService;
+
+ @Resource
+ private HuiminCardService huiminCardService;
+ @Resource
+ private PayHuiminService payHuiminService;
+ @Resource
+ private SiteClient siteClient;
+ @Resource
+ private StoreClient storeClient;
+ @Resource
+ private PayMoneyUtil payMoneyUtil;
+
+
+ @Autowired
+ private TokenUtil tokenUtil;
+ private String smid = "2088330203191220";//平台支付宝商户号
+
+
+ /**
+ * 惠民卡支付宝支付回调接口
+ */
+ @PostMapping("/aliPayHuiminCallback")
+ public void aliPayHuiminCallback(HttpServletRequest request, HttpServletResponse response) {
+ try {
+ Map<String, String> map = payMoneyUtil.alipayCallback(request);
+ if (null != map) {
+ String out_trade_no = map.get("out_trade_no");
+ String transaction_id = map.get("transaction_id");
+ TPayHuimin one = payHuiminService.getOne(new LambdaQueryWrapper<TPayHuimin>().eq(TPayHuimin::getCode, out_trade_no));
+ if (one!=null){
+ if (one.getStatus()==2){
+ PrintWriter out = response.getWriter();
+ out.write("success");
+ out.flush();
+ out.close();
+ }else{
+ one.setOrderNumber(transaction_id);
+ one.setStatus(2);
+ one.setPaymentTime(new Date());
+ payHuiminService.updateById(one);
+ }
+ }
+ }
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ }
+ /**
+ * 惠民卡微信支付回调接口
+ */
+ @PostMapping("/weixinPayHuiminCallback")
+ public void weixinPayHuiminCallback(HttpServletRequest request, HttpServletResponse response) {
+ try {
+ Map<String, String> map = payMoneyUtil.weixinpayCallback(request);
+ if (null != map) {
+ String out_trade_no = map.get("out_trade_no");
+ String transaction_id = map.get("transaction_id");
+ String result = map.get("result");
+ TPayHuimin one = payHuiminService.getOne(new LambdaQueryWrapper<TPayHuimin>().eq(TPayHuimin::getCode, out_trade_no));
+ if (one!=null){
+ if (one.getStatus()==2){
+ PrintWriter out = response.getWriter();
+ out.write(result);
+ out.flush();
+ out.close();
+ }else{
+ one.setOrderNumber(transaction_id);
+ one.setStatus(2);
+ one.setPaymentTime(new Date());
+ payHuiminService.updateById(one);
+ }
+ }
+ }
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ }
+ /**
+ * 惠民卡微信退款回调
+ * @param request
+ * @param response
+ */
+ @ResponseBody
+ @PostMapping("/wxRefundHuiminCallback")
+ public void wxRefundHuiminCallback(HttpServletRequest request, HttpServletResponse response){
+ Map<String, String> map = payMoneyUtil.wxRefundCallback(request);
+ if(null != map){
+ String refund_id = map.get("refund_id");
+ String out_refund_no = map.get("out_refund_no");
+ String result = map.get("result");
+ TPayHuimin one = payHuiminService.getOne(new LambdaQueryWrapper<TPayHuimin>()
+ .eq(TPayHuimin::getCode, out_refund_no));
+ one.setRefundStatus(2);
+ one.setRefundTime(new Date());
+ one.setStatus(3);
+ one.setRefundNumber(refund_id);
+ payHuiminService.updateById(one);
+ PrintWriter out = null;
+ try {
+ out = response.getWriter();
+ } catch (IOException e) {
+ throw new RuntimeException(e);
+ }
+ out.println(result);
+ out.flush();
+ out.close();
+ }
+ }
+}
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 3173671..2c4eab8 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
@@ -15,6 +15,7 @@
import com.dsh.activity.feignclient.model.TAppUser;
import com.dsh.activity.feignclient.other.OperatorClient;
import com.dsh.activity.feignclient.other.RegionClient;
+import com.dsh.activity.feignclient.other.SiteClient;
import com.dsh.activity.feignclient.other.StoreClient;
import com.dsh.activity.feignclient.other.model.CityDataAndProvinceDataVo;
import com.dsh.activity.feignclient.other.model.Store;
@@ -25,23 +26,21 @@
import com.dsh.activity.model.request.CommodityRequest;
import com.dsh.activity.model.request.CouponDataVo;
import com.dsh.activity.model.request.CouponPackageReq;
-import com.dsh.activity.model.response.CouponPackageResp;
-import com.dsh.activity.model.response.HuiminAgreementVO;
-import com.dsh.activity.model.response.HuiminCardVO;
+import com.dsh.activity.model.response.*;
import com.dsh.activity.service.*;
-import com.dsh.activity.util.GDMapGeocodingUtil;
-import com.dsh.activity.util.ResultUtil;
-import com.dsh.activity.util.TokenUtil;
-import com.dsh.activity.util.ToolUtil;
+import com.dsh.activity.util.*;
import com.google.gson.Gson;
import io.swagger.annotations.*;
+import io.swagger.models.auth.In;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
+import org.springframework.web.servlet.tags.EditorAwareTag;
import javax.annotation.Resource;
import java.math.BigDecimal;
import java.text.SimpleDateFormat;
import java.time.LocalDateTime;
+import java.time.ZoneId;
import java.util.*;
import java.util.stream.Collectors;
@@ -68,18 +67,168 @@
private HuiminCardService huiminCardService;
@Resource
private PayHuiminService payHuiminService;
+ @Resource
+ private SiteClient siteClient;
+ @Resource
+ private StoreClient storeClient;
+ @Resource
+ private PayMoneyUtil payMoneyUtil;
+ @Resource
+ private HuiminRecordService huiminRecordService;
+ @Resource
+ private StudentClient studentClient;
@Autowired
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));
+ }
+ /**
+ * 查看惠民卡详情
+ */
+ @ResponseBody
+ @PostMapping("/payHuiminCard")
+ @ApiOperation(value = "购买惠民卡")
+ @ApiImplicitParams({
+ @ApiImplicitParam(value = "惠民卡id", name = "id", dataType = "int", required = true),
+ @ApiImplicitParam(value = "支付方式1微信2支付宝", name = "payType", dataType = "int", required = true),
+ @ApiImplicitParam(value = "绑定学员ids多,个逗号拼接", name = "studentIds", dataType = "String", required = true),
+ @ApiImplicitParam(name = "Authorization", value = "用户token（Bearer +token）", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9.....")
+ })
+ public ResultUtil<THuiminCard> payHuiminCard(Integer id,Integer payType,String studentIds) {
+ try {
+ Integer uid = tokenUtil.getUserIdFormRedis();
+ if (null == uid) {
+ return ResultUtil.tokenErr();
+ }
+ THuiminCard huiminCard = huiminCardService.getById(id);
+ TPayHuimin tPayHuimin = new TPayHuimin();
+ tPayHuimin.setSalesMoney(huiminCard.getSalesMoney());
+ tPayHuimin.setAppUserId(uid);
+ tPayHuimin.setStudentId(studentIds);
+ switch (huiminCard.getHuiMinType()){
+ case 1:
+ // 年度卡
+ LocalDateTime localDateTime = LocalDateTime.now().plusDays(365);
+ // 将LocalDateTime转换为Date类型
+ Date date = Date.from(localDateTime.atZone(ZoneId.systemDefault()).toInstant());
+ tPayHuimin.setEndTime(date);
+ break;
+ case 2:
+ // 年内卡
+ Date date1 = new Date();
+ date1.setMonth(11);
+ date1.setDate(31);
+ date1.setHours(23);
+ date1.setMinutes(59);
+ date1.setSeconds(59);
+ tPayHuimin.setEndTime(date1);
+ break;
+ }
+ tPayHuimin.setInsertTime(new Date());
+ tPayHuimin.setStatus(1);
+ tPayHuimin.setPaymentType(payType);
+ tPayHuimin.setRefundStatus(1);
+ tPayHuimin.setCardId(huiminCard.getId());
+ SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMddHHmmssSSS");
+ tPayHuimin.setCode(sdf.format(new Date()) + UUIDUtil.getNumberRandom(5));
+ switch (payType){
+ case 1:
+ return payMoneyUtil.weixinpay("购买惠民卡"+"-"+0, "", tPayHuimin.getCode(), tPayHuimin.getSalesMoney().toString(),
+ "/huimin/callBack/weixinPayHuiminCallback", "APP", "");
+ case 2:
+ return payMoneyUtil.alipay(smid,"购买惠民卡", "购买惠民卡", "", tPayHuimin.getCode(), tPayHuimin.getSalesMoney().toString(),
+ "/huimin/callBack/aliPayHuiminCallback");
+ }
-
+ } catch (Exception e) {
+ e.printStackTrace();
+ return ResultUtil.success();
+ }
+ return ResultUtil.success();
+ }
/**
- * 查询注册赠送优惠券 判断当前优惠券限领数量
+ * 查看惠民卡详情
+ */
+ @ResponseBody
+ @PostMapping("/getHuiminCardDetail")
+ @ApiOperation(value = "查看惠民卡详情")
+ @ApiImplicitParams({
+ @ApiImplicitParam(value = "惠民卡id", name = "id", dataType = "int", required = true),
+ @ApiImplicitParam(value = "门店id", name = "storeId", dataType = "int", required = true),
+ @ApiImplicitParam(name = "Authorization", value = "用户token（Bearer +token）", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9.....")
+ })
+ public ResultUtil<THuiminCard> getHuiminCardDetail(Integer id,Integer storeId) {
+ try {
+ Integer uid = tokenUtil.getUserIdFormRedis();
+ if (null == uid) {
+ return ResultUtil.tokenErr();
+ }
+ THuiminCard huiminCard = huiminCardService.getById(id);
+ List<TPayHuimin> payHuimins = payHuiminService.list(new LambdaQueryWrapper<TPayHuimin>()
+ .eq(TPayHuimin::getAppUserId, uid)
+ .ge(TPayHuimin::getEndTime,new Date())
+ .eq(TPayHuimin::getStatus, 1));
+ List<TPayHuimin> collect = payHuimins.stream().filter(e -> e.getCardId().equals(huiminCard.getId())).collect(Collectors.toList());
+ if (!collect.isEmpty()){
+ huiminCard.setIsBuy(1);
+ }else{
+ huiminCard.setIsBuy(0);
+ }
+ List<Store> stores = storeClient.queryStoreByIds(Collections.singletonList(storeId));
+ if (!stores.isEmpty()){
+ Store store = stores.get(0);
+ Integer operatorId = store.getOperatorId();
+ if (operatorId==null||operatorId==0){
+ // 平台门店
+ THuiminAgreement huiminAgreement = huiminAgreementService.getOne(new LambdaQueryWrapper<THuiminAgreement>()
+ .isNull(THuiminAgreement::getOperatorId));
+ if (huiminAgreement!=null){
+ List<THuiminAgreementSetting> list = huiminAgreementSettingService.list(new LambdaQueryWrapper<THuiminAgreementSetting>()
+ .eq(THuiminAgreementSetting::getAgreementId, huiminAgreement.getId()));
+ huiminCard.setAgreementSettings(list);
+ }else {
+ huiminCard.setAgreementSettings(new ArrayList<>());
+
+ }
+ }else{
+ // 运营商门店
+ THuiminAgreement huiminAgreement = huiminAgreementService.getOne(new LambdaQueryWrapper<THuiminAgreement>()
+ .eq(THuiminAgreement::getOperatorId,operatorId));
+ if (huiminAgreement!=null){
+ List<THuiminAgreementSetting> list = huiminAgreementSettingService.list(new LambdaQueryWrapper<THuiminAgreementSetting>()
+ .eq(THuiminAgreementSetting::getAgreementId, huiminAgreement.getId()));
+ huiminCard.setAgreementSettings(list);
+ }else {
+ huiminCard.setAgreementSettings(new ArrayList<>());
+ }
+ }
+ }else{
+ huiminCard.setAgreementSettings(new ArrayList<>());
+ }
+
+ return ResultUtil.success(huiminCard);
+ } catch (Exception e) {
+ e.printStackTrace();
+ return ResultUtil.success();
+ }
+ }
+ /**
+ * 惠民卡富文本内容-惠民卡列表
*/
@ResponseBody
@PostMapping("/getHuiminAgreementAndList")
@@ -98,15 +247,13 @@
}
pageNo = (pageNo - 1) * pageSize;
HuiminAgreementVO huiminAgreementVO = new HuiminAgreementVO();
- List<THuiminCard> list = huiminCardService.list(new LambdaQueryWrapper<THuiminCard>()
- .eq(THuiminCard::getStoreId, storeId));
- if (list.isEmpty()){
+ List<THuiminCard> cardList = huiminCardService.getHuiminAgreementAndList(pageNo,pageSize,storeId);
+ if (cardList.isEmpty()){
// 没有配置惠民卡 展示富文本内容
huiminAgreementVO.setShowType(1);
}else{
huiminAgreementVO.setShowType(2);
}
- List<THuiminCard> cardList = huiminCardService.getHuiminAgreementAndList(pageNo,pageSize,storeId);
List<TPayHuimin> payHuimins = payHuiminService.list(new LambdaQueryWrapper<TPayHuimin>()
.eq(TPayHuimin::getAppUserId, uid)
.ge(TPayHuimin::getEndTime,new Date())
@@ -118,8 +265,10 @@
List<TPayHuimin> collect = payHuimins.stream().filter(e -> e.getCardId().equals(huiminCardVO.getId())).collect(Collectors.toList());
if (!collect.isEmpty()){
huiminCardVO1.setCover(huiminCardVO.getBuyCover());
+ huiminCardVO1.setIsBuy(1);
}else{
huiminCardVO1.setCover(huiminCardVO.getUnBuyCover());
+ huiminCardVO1.setIsBuy(0);
}
huiminCardVOS.add(huiminCardVO1);
}
@@ -130,6 +279,146 @@
return ResultUtil.success(new HuiminAgreementVO());
}
}
+ /**
+ * 惠民卡富文本内容-惠民卡列表
+ */
+ @ResponseBody
+ @PostMapping("/myHuiminCardList")
+ @ApiOperation(value = "个人中心-我的惠民卡")
+ @ApiImplicitParams({
+ @ApiImplicitParam(value = "页码，首页1", name = "pageSize", dataType = "int", required = true),
+ @ApiImplicitParam(value = "页条数", name = "pageNo", dataType = "int", required = true),
+ @ApiImplicitParam(name = "Authorization", value = "用户token（Bearer +token）", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9.....")
+ })
+ public ResultUtil<List<MyHuiminCardVO>> myHuiminCardList(Integer pageSize, Integer pageNo) {
+ try {
+ Integer uid = tokenUtil.getUserIdFormRedis();
+ if (null == uid) {
+ return ResultUtil.tokenErr();
+ }
+ pageNo = (pageNo - 1) * pageSize;
+ List<MyHuiminCardVO> cardList = huiminCardService.getMyHuiminCardList(pageNo,pageSize,uid);
+ List<THuiminCard> list = huiminCardService.list();
+ for (MyHuiminCardVO myHuiminCardVO : cardList) {
+ if (myHuiminCardVO.getEndTime().before(new Date())){
+ // 已过期
+ myHuiminCardVO.setIsExpire(1);
+ }else{
+ myHuiminCardVO.setIsExpire(0);
+ }
+ int count = huiminRecordService.count(new LambdaQueryWrapper<THuiminRecord>()
+ .eq(THuiminRecord::getHuiminCardId, myHuiminCardVO.getCardId()));
+ // 购卡7日内没有使用记录可退款。超过7日不管有没有使用记录都不能退款
+ if (new Date().after(DateUtil.addDay(myHuiminCardVO.getPaymentTime(),7))){
+ // 超过七天不可退款
+ myHuiminCardVO.setIsRefund(0);
+ }else if (count>=7){
+ myHuiminCardVO.setIsRefund(0);
+ }else{
+ myHuiminCardVO.setIsRefund(1);
+ }
+ THuiminCard huiminCard = list.stream().filter(e -> e.getId().equals(myHuiminCardVO.getCardId())).findFirst().orElse(null);
+ if (null!=huiminCard){
+ myHuiminCardVO.setCover(huiminCard.getBuyCover());
+ }
+ // 查询绑定人员列表
+ List<TStudent> studentByIds = studentClient.getStudentByIds(myHuiminCardVO.getStudentId());
+ myHuiminCardVO.setStudentList(studentByIds);
+ }
+ return ResultUtil.success(cardList);
+ } catch (Exception e) {
+ e.printStackTrace();
+ return ResultUtil.success(new ArrayList<>());
+ }
+ }
+ /**
+ * 个人中心-我的惠民卡-退款
+ */
+ @ResponseBody
+ @PostMapping("/refund")
+ @ApiOperation(value = "个人中心-我的惠民卡-退款")
+ @ApiImplicitParams({
+ @ApiImplicitParam(value = "支付记录id", name = "id", dataType = "int", required = true),
+ @ApiImplicitParam(name = "Authorization", value = "用户token（Bearer +token）", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9.....")
+ })
+ public ResultUtil<List<MyHuiminCardVO>> refund(Integer id) {
+ try {
+ Integer uid = tokenUtil.getUserIdFormRedis();
+ if (null == uid) {
+ return ResultUtil.tokenErr();
+ }
+ TPayHuimin tPayHuimin = payHuiminService.getById(id);
+ if (tPayHuimin==null){
+ return ResultUtil.error("订单不存在");
+ }
+ if (tPayHuimin.getStatus()==3 && tPayHuimin.getRefundStatus()!=1){
+ return ResultUtil.error("不可重复退款");
+ }
+ if (tPayHuimin.getPaymentType()==1){
+ Map<String, String> map = payMoneyUtil.wxRefund(tPayHuimin.getOrderNumber(), tPayHuimin.getCode(),
+ tPayHuimin.getSalesMoney().toString(), tPayHuimin.getSalesMoney().toString(), "/base/worldCup/wxRefundWorldCupCallback");
+ if(!"SUCCESS".equals(map.get("return_code"))){
+ System.err.println("-------------微信退款失败---------");
+ System.err.println(map.get("return_msg"));
+ return ResultUtil.error("微信退款失败");
+ }
+ }else{
+ Map<String, String> map = payMoneyUtil.aliRefund(tPayHuimin.getOrderNumber(), tPayHuimin.getSalesMoney().toString());
+ String return_code = map.get("code");
+ if (!"10000".equals(return_code)) {
+ return ResultUtil.error(map.get("msg"));
+ }
+ String refund_id = map.get("trade_no");
+ tPayHuimin.setRefundNumber(refund_id);
+ tPayHuimin.setRefundTime(new Date());
+ tPayHuimin.setStatus(3);
+ tPayHuimin.setRefundStatus(2);
+ payHuiminService.updateById(tPayHuimin);
+ }
+
+ return ResultUtil.success();
+ } catch (Exception e) {
+ e.printStackTrace();
+ return ResultUtil.success(new ArrayList<>());
+ }
+ }
+ /**
+ * 个人中心-我的惠民卡-查看详情
+ */
+ @ResponseBody
+ @PostMapping("/myHuiminCardDetail")
+ @ApiOperation(value = "个人中心-我的惠民卡-查看详情")
+ @ApiImplicitParams({
+ @ApiImplicitParam(value = "支付记录id", name = "id", dataType = "int", required = true),
+ @ApiImplicitParam(name = "Authorization", value = "用户token（Bearer +token）", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9.....")
+ })
+ public ResultUtil<MyHuiminCardDetailVO> myHuiminCardDetail(Integer id) {
+ try {
+ Integer uid = tokenUtil.getUserIdFormRedis();
+ if (null == uid) {
+ return ResultUtil.tokenErr();
+ }
+ TPayHuimin tPayHuimin = payHuiminService.getById(id);
+ if (tPayHuimin==null){
+ return ResultUtil.error("惠民卡不存在");
+ }
+ THuiminCard byId = huiminCardService.getById(tPayHuimin.getCardId());
+ MyHuiminCardDetailVO myHuiminCardDetailVO = new MyHuiminCardDetailVO();
+// myHuiminCardDetailVO.setQrCode();
+ myHuiminCardDetailVO.setCardId(tPayHuimin.getCardId());
+ if (byId!=null){
+ myHuiminCardDetailVO.setIntroduce(byId.getIntroduce());
+ }
+ myHuiminCardDetailVO.setEndTime(tPayHuimin.getEndTime());
+ // 查询绑定人员列表
+ List<TStudent> studentByIds = studentClient.getStudentByIds(tPayHuimin.getStudentId());
+ myHuiminCardDetailVO.setStudentList(studentByIds);
+ return ResultUtil.success(myHuiminCardDetailVO);
+ } catch (Exception e) {
+ e.printStackTrace();
+ return ResultUtil.success(new MyHuiminCardDetailVO());
+ }
+ }
}
diff --git a/cloud-server-activity/src/main/java/com/dsh/activity/entity/THuiminAgreementSetting.java b/cloud-server-activity/src/main/java/com/dsh/activity/entity/THuiminAgreementSetting.java
index 175167c..4dd3978 100644
--- a/cloud-server-activity/src/main/java/com/dsh/activity/entity/THuiminAgreementSetting.java
+++ b/cloud-server-activity/src/main/java/com/dsh/activity/entity/THuiminAgreementSetting.java
@@ -5,6 +5,7 @@
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.extension.activerecord.Model;
+import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
@@ -38,12 +39,21 @@
* 协议名称
*/
@TableField("agreementName")
+ @ApiModelProperty("协议名称")
private String agreementName;
/**
*协议内容
*/
+ @ApiModelProperty("协议内容")
+
@TableField("agreementContent")
private String agreementContent;
+ /**
+ *协议管理id
+ */
+ @ApiModelProperty("协议管理id")
+ @TableField("agreementId")
+ private Integer agreementId;
@Override
protected Serializable pkVal() {
diff --git a/cloud-server-activity/src/main/java/com/dsh/activity/entity/THuiminCard.java b/cloud-server-activity/src/main/java/com/dsh/activity/entity/THuiminCard.java
index c638c4c..2111991 100644
--- a/cloud-server-activity/src/main/java/com/dsh/activity/entity/THuiminCard.java
+++ b/cloud-server-activity/src/main/java/com/dsh/activity/entity/THuiminCard.java
@@ -5,6 +5,7 @@
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.extension.activerecord.Model;
+import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
@@ -12,6 +13,7 @@
import java.io.Serializable;
import java.math.BigDecimal;
import java.util.Date;
+import java.util.List;
/**
* <p>
@@ -38,99 +40,142 @@
* 惠民卡名称
*/
@TableField("huiMinName")
+ @ApiModelProperty(value = "惠民卡名称")
private String huiMinName;
/**
*惠民卡类型1年度2年内
*/
+ @ApiModelProperty(value = "惠民卡类型1年度2年内")
+
@TableField("huiMinType")
- private String huiMinType;
+ private Integer huiMinType;
/**
*售卖金额
*/
+ @ApiModelProperty(value = "售卖金额")
+
@TableField("salesMoney")
private BigDecimal salesMoney;
/**
*已购买封面
*/
+ @ApiModelProperty(value = "已购买封面")
+
@TableField("buyCover")
private String buyCover;
/**
*未购买封面
*/
+ @ApiModelProperty(value = "未购买封面")
@TableField("unBuyCover")
private String unBuyCover;
/**
*已购买使用说明
*/
@TableField("buyRemark")
+ @ApiModelProperty(value = "已购买使用说明")
+
private String buyRemark;
/**
- *未购买使用说明
+ *使用期限说明
*/
+ @ApiModelProperty(value = "使用期限说明")
@TableField("unBuyRemark")
private String unBuyRemark;
/**
*发放数量 为空表示不限
*/
+ @ApiModelProperty(value = "发放数量 为空表示不限")
+
@TableField("grantCount")
private Integer grantCount;
/**
* 限购数量 为空表示不限
*/
+ @ApiModelProperty(value = "限购数量 为空表示不限")
+
@TableField("limitCount")
private Integer limitCount;
/**
*轮播图 逗号分隔
*/
+ @ApiModelProperty(value = "轮播图 逗号分隔")
@TableField("banner")
private String banner;
/**
- *有效期 不填表示永久
+ *有效期开始时间 不填表示永久
*/
@TableField("endTime")
+ @ApiModelProperty(value = "有效期开始时间 不填表示永久")
private Date endTime;
+ /**
+ *有效期结束时间 不填表示永久
+ */
+ @TableField("startTime")
+ @ApiModelProperty(value = "有效期结束时间 不填表示永久")
+ private Date startTime;
/**
*可使用时间段，周，多个逗号分隔
*/
+ @ApiModelProperty(value = "可使用时间段，周，多个逗号分隔")
@TableField("useWeeks")
private String useWeeks;
/**
*可使用时间段，时分秒，多个逗号分隔
*/
+ @ApiModelProperty(value = "可使用时间段，时分秒，多个逗号分隔")
@TableField("useTimes")
private String useTimes;
/**
*不可用时间段，yyyy-MM-dd HH:mm:ss,多个逗号分隔
*/
@TableField("unUseTimes")
+ @ApiModelProperty(value = "可用时间段，yyyy-MM-dd HH:mm:ss,多个逗号分隔")
private String unUseTimes;
/**
*使用范围1门店2场地
*/
@TableField("useScope")
- private String useScope;
+ @ApiModelProperty(value = "使用范围1门店2场地")
+
+ private Integer useScope;
/**
*根据适用范围，存储门店id或场地id，多个逗号分隔
*/
+ @ApiModelProperty(value = "根据适用范围，存储门店id或场地id，多个逗号分隔")
@TableField("useIds")
private String useIds;
/**
*惠民卡介绍
*/
+ @ApiModelProperty(value = "惠民卡介绍")
@TableField("introduce")
private String introduce;
/**
*排序
*/
+ @ApiModelProperty(value = "排序")
@TableField("sort")
private String sort;
/**
- *门店id
+ *门店id 当使用范围为场地的时候存储门店id
*/
+ @ApiModelProperty(value = "门店id ")
@TableField("storeId")
private Integer storeId;
+ /**
+ *状态 1已上架 2已下架 3已删除
+ */
+ @ApiModelProperty(value = "状态 1已上架 2已下架 3已删除 ")
+ @TableField("status")
+ private Integer status;
-
+ @ApiModelProperty("是否购买 0否1是")
+ @TableField(exist = false)
+ private Integer isBuy;
+ @ApiModelProperty("立即购买页面的协议列表")
+ @TableField(exist = false)
+ private List<THuiminAgreementSetting> agreementSettings;
@Override
protected Serializable pkVal() {
return this.id;
diff --git a/cloud-server-activity/src/main/java/com/dsh/activity/entity/THuiminRecord.java b/cloud-server-activity/src/main/java/com/dsh/activity/entity/THuiminRecord.java
new file mode 100644
index 0000000..6a4b975
--- /dev/null
+++ b/cloud-server-activity/src/main/java/com/dsh/activity/entity/THuiminRecord.java
@@ -0,0 +1,77 @@
+package com.dsh.activity.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
+import io.swagger.models.auth.In;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * <p>
+ * 惠民卡
+ * </p>
+ *
+ * @author jqs
+ * @since 2023-07-12
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("t_huimin_record")
+public class THuiminRecord extends Model<THuiminRecord> {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 主键
+ */
+ @TableId(value = "id", type = IdType.AUTO)
+ private Integer id;
+ /**
+ * 惠民卡id
+ */
+ @TableField("huiminCardId")
+ @ApiModelProperty(value = "惠民卡id")
+ private Integer huiminCardId;
+ /**
+ *使用时间
+ */
+ @ApiModelProperty(value = "使用时间")
+ @TableField("insertTime")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date insertTime;
+ /**
+ *使用场地id
+ */
+ @ApiModelProperty(value = "使用场地id")
+ @TableField("siteId")
+ private Integer siteId;
+ /**
+ *使用门店id
+ */
+ @ApiModelProperty(value = "使用门店id")
+ @TableField("storeId")
+ private Integer storeId;
+ /**
+ *用户id
+ */
+ @ApiModelProperty(value = "用户id")
+ @TableField("appUserId")
+ private Integer appUserId;
+ @Override
+ protected Serializable pkVal() {
+ return this.id;
+ }
+
+}
diff --git a/cloud-server-activity/src/main/java/com/dsh/activity/entity/TPayHuimin.java b/cloud-server-activity/src/main/java/com/dsh/activity/entity/TPayHuimin.java
index 284d0bb..2fa71dc 100644
--- a/cloud-server-activity/src/main/java/com/dsh/activity/entity/TPayHuimin.java
+++ b/cloud-server-activity/src/main/java/com/dsh/activity/entity/TPayHuimin.java
@@ -75,7 +75,7 @@
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
private Date refundTime;
/**
- *状态1使用中2已退款
+ *状态1待支付2已支付3已退款
*/
@TableField("status")
private Integer status;
@@ -104,6 +104,11 @@
*/
@TableField("orderNumber")
private String orderNumber;
+ /**
+ *退款流水号
+ */
+ @TableField("refundNumber")
+ private String refundNumber;
diff --git a/cloud-server-activity/src/main/java/com/dsh/activity/feignclient/account/StudentClient.java b/cloud-server-activity/src/main/java/com/dsh/activity/feignclient/account/StudentClient.java
index b4fe761..4d85c71 100644
--- a/cloud-server-activity/src/main/java/com/dsh/activity/feignclient/account/StudentClient.java
+++ b/cloud-server-activity/src/main/java/com/dsh/activity/feignclient/account/StudentClient.java
@@ -3,7 +3,9 @@
import com.dsh.activity.entity.TStudent;
import com.dsh.activity.feignclient.account.model.Student;
import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.ResponseBody;
import java.util.List;
@@ -32,4 +34,12 @@
*/
@PostMapping("/student/getHasStudentUser")
public List<Integer> getHasStudentUser();
+
+ /**
+ * 查询惠民卡绑定学员列表信息
+ *
+ * @return
+ */
+ @RequestMapping("/base/student/getStudentByIds/{ids}")
+ public List<TStudent> getStudentByIds(@PathVariable("ids") String ids);
}
diff --git a/cloud-server-activity/src/main/java/com/dsh/activity/mapper/HuiminCardMapper.java b/cloud-server-activity/src/main/java/com/dsh/activity/mapper/HuiminCardMapper.java
index a688147..b84268c 100644
--- a/cloud-server-activity/src/main/java/com/dsh/activity/mapper/HuiminCardMapper.java
+++ b/cloud-server-activity/src/main/java/com/dsh/activity/mapper/HuiminCardMapper.java
@@ -4,6 +4,7 @@
import com.dsh.activity.entity.THuiminAgreement;
import com.dsh.activity.entity.THuiminCard;
import com.dsh.activity.model.response.HuiminCardVO;
+import com.dsh.activity.model.response.MyHuiminCardVO;
import org.apache.ibatis.annotations.Param;
import java.util.List;
@@ -15,4 +16,6 @@
public interface HuiminCardMapper extends BaseMapper<THuiminCard> {
List<THuiminCard> getHuiminAgreementAndList(@Param("pageNo") Integer pageNo,@Param("pageSize") Integer pageSize , @Param("storeId")Integer storeId);
+
+ List<MyHuiminCardVO> getMyHuiminCardList(@Param("pageNo") Integer pageNo,@Param("pageSize") Integer pageSize ,@Param("appUserId")Integer appUserId);
}
diff --git a/cloud-server-activity/src/main/java/com/dsh/activity/mapper/HuiminRecordMapper.java b/cloud-server-activity/src/main/java/com/dsh/activity/mapper/HuiminRecordMapper.java
new file mode 100644
index 0000000..1c04fdb
--- /dev/null
+++ b/cloud-server-activity/src/main/java/com/dsh/activity/mapper/HuiminRecordMapper.java
@@ -0,0 +1,18 @@
+package com.dsh.activity.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.dsh.activity.entity.THuiminCard;
+import com.dsh.activity.entity.THuiminRecord;
+import com.dsh.activity.model.response.MyHuiminCardVO;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * @author zhibing.pu
+ * @date 2023/7/11 17:30
+ */
+public interface HuiminRecordMapper extends BaseMapper<THuiminRecord> {
+
+
+}
diff --git a/cloud-server-activity/src/main/java/com/dsh/activity/model/response/HuiminCardVO.java b/cloud-server-activity/src/main/java/com/dsh/activity/model/response/HuiminCardVO.java
index c93533b..1fb2231 100644
--- a/cloud-server-activity/src/main/java/com/dsh/activity/model/response/HuiminCardVO.java
+++ b/cloud-server-activity/src/main/java/com/dsh/activity/model/response/HuiminCardVO.java
@@ -16,6 +16,8 @@
private Integer id;
@ApiModelProperty("封面图")
private String cover;
+ @ApiModelProperty("是否购买 0否1是")
+ private Integer isBuy;
diff --git a/cloud-server-activity/src/main/java/com/dsh/activity/model/response/MyHuiminCardDetailVO.java b/cloud-server-activity/src/main/java/com/dsh/activity/model/response/MyHuiminCardDetailVO.java
new file mode 100644
index 0000000..a0332bd
--- /dev/null
+++ b/cloud-server-activity/src/main/java/com/dsh/activity/model/response/MyHuiminCardDetailVO.java
@@ -0,0 +1,33 @@
+package com.dsh.activity.model.response;
+
+import com.dsh.activity.entity.TStudent;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.Date;
+import java.util.List;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@ApiModel(value = "我的惠民卡详情VO")
+public class MyHuiminCardDetailVO {
+ @ApiModelProperty("二维码")
+ private String qrCode;
+ @ApiModelProperty("惠民卡id")
+ private Integer cardId;
+ @ApiModelProperty("富文本内容")
+ private String introduce;
+ @ApiModelProperty("有效期至")
+ @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+ private Date endTime;
+ @ApiModelProperty("绑定人员列表")
+ private List<TStudent> studentList;
+
+
+
+}
diff --git a/cloud-server-activity/src/main/java/com/dsh/activity/model/response/MyHuiminCardVO.java b/cloud-server-activity/src/main/java/com/dsh/activity/model/response/MyHuiminCardVO.java
new file mode 100644
index 0000000..7849a18
--- /dev/null
+++ b/cloud-server-activity/src/main/java/com/dsh/activity/model/response/MyHuiminCardVO.java
@@ -0,0 +1,43 @@
+package com.dsh.activity.model.response;
+
+import com.dsh.activity.entity.TStudent;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.Date;
+import java.util.List;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@ApiModel(value = "我的惠民卡列表VO")
+public class MyHuiminCardVO {
+ @ApiModelProperty("支付记录id")
+ private Integer id;
+ @ApiModelProperty("惠民卡id")
+ private Integer cardId;
+ @ApiModelProperty("封面图")
+ private String cover;
+ @ApiModelProperty("是否过期 0否1是")
+ private Integer isExpire;
+ @ApiModelProperty("是否可以退款 0否1是")
+ private Integer isRefund;
+ @ApiModelProperty("状态 前端忽略")
+ private Integer status;
+ @ApiModelProperty("有效期至")
+ @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+ private Date endTime;
+ @ApiModelProperty("购买日期 前端忽略")
+ @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+ private Date paymentTime;
+ @ApiModelProperty("绑定人员列表")
+ private List<TStudent> studentList;
+ @ApiModelProperty("绑定学员ids 前端忽略")
+ private String studentId;
+
+
+}
diff --git a/cloud-server-activity/src/main/java/com/dsh/activity/service/HuiminCardService.java b/cloud-server-activity/src/main/java/com/dsh/activity/service/HuiminCardService.java
index 7f83175..87bf8cb 100644
--- a/cloud-server-activity/src/main/java/com/dsh/activity/service/HuiminCardService.java
+++ b/cloud-server-activity/src/main/java/com/dsh/activity/service/HuiminCardService.java
@@ -7,6 +7,7 @@
import com.dsh.activity.model.BenefitsVideosInfoVo;
import com.dsh.activity.model.BenefitsVideosListVo;
import com.dsh.activity.model.response.HuiminCardVO;
+import com.dsh.activity.model.response.MyHuiminCardVO;
import java.util.List;
@@ -21,4 +22,6 @@
public interface HuiminCardService extends IService<THuiminCard> {
List<THuiminCard> getHuiminAgreementAndList(Integer pageNo, Integer pageSize, Integer storeId);
+
+ List<MyHuiminCardVO> getMyHuiminCardList(Integer pageNo, Integer pageSize, Integer appUserId);
}
diff --git a/cloud-server-activity/src/main/java/com/dsh/activity/service/HuiminRecordService.java b/cloud-server-activity/src/main/java/com/dsh/activity/service/HuiminRecordService.java
new file mode 100644
index 0000000..24d17ec
--- /dev/null
+++ b/cloud-server-activity/src/main/java/com/dsh/activity/service/HuiminRecordService.java
@@ -0,0 +1,20 @@
+package com.dsh.activity.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.dsh.activity.entity.THuiminCard;
+import com.dsh.activity.entity.THuiminRecord;
+import com.dsh.activity.model.response.MyHuiminCardVO;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 福利视频 服务类
+ * </p>
+ *
+ * @author jqs
+ * @since 2023-07-06
+ */
+public interface HuiminRecordService extends IService<THuiminRecord> {
+
+}
diff --git a/cloud-server-activity/src/main/java/com/dsh/activity/service/impl/HuiminCardServiceImpl.java b/cloud-server-activity/src/main/java/com/dsh/activity/service/impl/HuiminCardServiceImpl.java
index 15c6549..cff2ff1 100644
--- a/cloud-server-activity/src/main/java/com/dsh/activity/service/impl/HuiminCardServiceImpl.java
+++ b/cloud-server-activity/src/main/java/com/dsh/activity/service/impl/HuiminCardServiceImpl.java
@@ -9,6 +9,7 @@
import com.dsh.activity.model.QueryBenefitsVedioVO;
import com.dsh.activity.model.TQueryBenefitsVO;
import com.dsh.activity.model.response.HuiminCardVO;
+import com.dsh.activity.model.response.MyHuiminCardVO;
import com.dsh.activity.service.HuiminCardService;
import com.dsh.activity.service.IBenefitsVideoClassificationService;
import org.springframework.beans.factory.annotation.Autowired;
@@ -27,4 +28,9 @@
public List<THuiminCard> getHuiminAgreementAndList(Integer pageNo, Integer pageSize, Integer storeId) {
return this.baseMapper.getHuiminAgreementAndList(pageNo,pageSize,storeId);
}
+
+ @Override
+ public List<MyHuiminCardVO> getMyHuiminCardList(Integer pageNo, Integer pageSize,Integer appUserId) {
+ return this.baseMapper.getMyHuiminCardList(pageNo,pageSize,appUserId);
+ }
}
diff --git a/cloud-server-activity/src/main/java/com/dsh/activity/service/impl/HuiminRecordServiceImpl.java b/cloud-server-activity/src/main/java/com/dsh/activity/service/impl/HuiminRecordServiceImpl.java
new file mode 100644
index 0000000..bcdcd53
--- /dev/null
+++ b/cloud-server-activity/src/main/java/com/dsh/activity/service/impl/HuiminRecordServiceImpl.java
@@ -0,0 +1,23 @@
+package com.dsh.activity.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.dsh.activity.entity.THuiminCard;
+import com.dsh.activity.entity.THuiminRecord;
+import com.dsh.activity.mapper.HuiminCardMapper;
+import com.dsh.activity.mapper.HuiminRecordMapper;
+import com.dsh.activity.model.response.MyHuiminCardVO;
+import com.dsh.activity.service.HuiminCardService;
+import com.dsh.activity.service.HuiminRecordService;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * @author zhibing.pu
+ * @date 2023/7/11 17:31
+ */
+@Service
+public class HuiminRecordServiceImpl extends ServiceImpl<HuiminRecordMapper, THuiminRecord> implements HuiminRecordService {
+
+
+}
diff --git a/cloud-server-activity/src/main/java/com/dsh/activity/util/DateUtil.java b/cloud-server-activity/src/main/java/com/dsh/activity/util/DateUtil.java
index f518e50..8c70be0 100644
--- a/cloud-server-activity/src/main/java/com/dsh/activity/util/DateUtil.java
+++ b/cloud-server-activity/src/main/java/com/dsh/activity/util/DateUtil.java
@@ -330,4 +330,10 @@
return dt1.getTime();
}
+ public static Date addDay(Date paymentTime, int i) {
+ Calendar calendar = Calendar.getInstance();
+ calendar.setTime(paymentTime);
+ calendar.add(Calendar.DATE, i);
+ return calendar.getTime();
+ }
}
diff --git a/cloud-server-activity/src/main/java/com/dsh/activity/util/MD5AndKL.java b/cloud-server-activity/src/main/java/com/dsh/activity/util/MD5AndKL.java
new file mode 100644
index 0000000..771e5fe
--- /dev/null
+++ b/cloud-server-activity/src/main/java/com/dsh/activity/util/MD5AndKL.java
@@ -0,0 +1,111 @@
+package com.dsh.activity.util;
+
+import java.security.MessageDigest;
+
+public class MD5AndKL {
+
+ /**
+ * MD5加码。32位
+ *
+ * @param inStr
+ * @return
+ */
+ public static String MD5(String inStr) {
+ MessageDigest md5 = null;
+ try {
+ md5 = MessageDigest.getInstance("MD5");
+ } catch (Exception e) {
+ throw new RuntimeException(e.toString());
+ }
+ byte[] md5Bytes = md5.digest(inStr.getBytes());
+ StringBuffer hexValue = new StringBuffer();
+ for (int i = 0; i < md5Bytes.length; i++) {
+ int val = ((int) md5Bytes[i]) & 0xff;
+ if (val < 16) {
+ hexValue.append("0");
+ }
+ hexValue.append(Integer.toHexString(val));
+ }
+ return hexValue.toString();
+ }
+
+ /**
+ * 可逆的加密算法
+ *
+ * @param inStr
+ * @return
+ */
+ public static String KL(String inStr) {
+ char[] a = inStr.toCharArray();
+ for (int i = 0; i < a.length; i++) {
+ a[i] = (char) (a[i] ^ 't');
+ }
+ String s = new String(a);
+ return s;
+ }
+
+ /**
+ * 加密后解密
+ *
+ * @param inStr
+ * @return
+ */
+ public static String JM(String inStr) {
+ char[] a = inStr.toCharArray();
+ for (int i = 0; i < a.length; i++) {
+ a[i] = (char) (a[i] ^ 't');
+ }
+ String k = new String(a);
+ return k;
+ }
+
+
+ private static String byteArrayToHexString(byte b[]) {
+ StringBuffer resultSb = new StringBuffer();
+ for (int i = 0; i < b.length; i++)
+ resultSb.append(byteToHexString(b[i]));
+
+ return resultSb.toString();
+ }
+
+ private static String byteToHexString(byte b) {
+ int n = b;
+ if (n < 0)
+ n += 256;
+ int d1 = n / 16;
+ int d2 = n % 16;
+ return hexDigits[d1] + hexDigits[d2];
+ }
+
+ public static String MD5Encode(String origin, String charsetname) {
+ String resultString = null;
+ try {
+ resultString = new String(origin);
+ MessageDigest md = MessageDigest.getInstance("MD5");
+ if (charsetname == null || "".equals(charsetname)) {
+ resultString = byteArrayToHexString(md.digest(resultString.getBytes()));
+ } else {
+ resultString = byteArrayToHexString(md.digest(resultString.getBytes(charsetname)));
+ }
+ } catch (Exception exception) {
+ exception.printStackTrace();
+ }
+ return resultString;
+ }
+
+ private static final String hexDigits[] = {"0", "1", "2", "3", "4", "5",
+ "6", "7", "8", "9", "a", "b", "c", "d", "e", "f"};
+
+// public static void main(String args[]) {
+//
+// System.out.println("MD5后再加密：" + KL(MD5("123456")));
+// System.out.println(MD5("123456"));
+// // System.out.println("加密：" + KL(MD5("123456")));
+// // s = KL(s);
+// // System.out.println("解密：" + KL("81dc9bdb52d04dc20036dbd8313ed055"));
+// // System.out.println("解密：" + JM(KL(s)));
+// // System.out.println("解密为MD5后的：" + KL(KL(MD5(s))));
+// // System.out.println(JM("5d62957bb57d3e49dcf48a0df064be4c"));
+// // System.out.println(MD5AndKL.KL(MD5AndKL.MD5("admin"+"87654321")));
+// }
+}
diff --git a/cloud-server-activity/src/main/java/com/dsh/activity/util/PayMoneyUtil.java b/cloud-server-activity/src/main/java/com/dsh/activity/util/PayMoneyUtil.java
new file mode 100644
index 0000000..f660675
--- /dev/null
+++ b/cloud-server-activity/src/main/java/com/dsh/activity/util/PayMoneyUtil.java
@@ -0,0 +1,1333 @@
+package com.dsh.activity.util;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.alipay.api.AlipayApiException;
+import com.alipay.api.AlipayClient;
+import com.alipay.api.CertAlipayRequest;
+import com.alipay.api.DefaultAlipayClient;
+import com.alipay.api.domain.*;
+import com.alipay.api.request.*;
+import com.alipay.api.response.*;
+import com.dsh.activity.util.httpClinet.HttpClientUtil;
+import org.apache.commons.collections.map.HashedMap;
+import org.bouncycastle.jce.provider.BouncyCastleProvider;
+import org.dom4j.Document;
+import org.dom4j.DocumentException;
+import org.dom4j.Element;
+import org.dom4j.io.SAXReader;
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.MediaType;
+import org.springframework.stereotype.Component;
+import org.springframework.util.StringUtils;
+
+import javax.crypto.*;
+import javax.crypto.spec.SecretKeySpec;
+import javax.servlet.http.HttpServletRequest;
+import java.io.*;
+import java.math.BigDecimal;
+import java.net.InetAddress;
+import java.net.UnknownHostException;
+import java.security.InvalidKeyException;
+import java.security.NoSuchAlgorithmException;
+import java.security.NoSuchProviderException;
+import java.security.Security;
+import java.util.*;
+
+import static com.dsh.activity.util.akeylogin.Md5Util.byteArrayToHexString;
+
+
+/**
+ * 第三方支付工具类
+ */
+@Component
+public class PayMoneyUtil {
+ private String aliAppid = "2021004105665036";//支付宝appid
+
+ private String appPrivateKey = "MIIEvwIBADANBgkqhkiG9w0BAQEFAASCBKkwggSlAgEAAoIBAQCi5i9nW/hGLJ3A06cZxTQdviFC7THpdSihoTYGLr9q006hu0V26ecBMY/o4w5bvIX0Ok/yofmZsVcCJpAPvbXL/uqVrIjnRRxXiaeBFThlxoBUTdunvbUSDYfzlEhJr5NvUKI6H6lz2niXlQGx4qy8Hau4ccWit9kM8jwUvsBVQoFgJA+xrjMvooA7YLopQtpOD+UJr5thApTSf1xrnr1W12yolTLEH15JmNV372cqXrYUuqnY0QsaPtxeqJUGAOcGdVLllQ7easEznP8DFBvDdHATcmp2SHNQDUEWN6MCVPbMgY06NQVqAXxqjTAYSVh+6TRu6bofPmpYC3TZB003AgMBAAECggEBAJAcR2+PA3NBYUYHeFrqBRMS8uX8ZR19kjZ7IgoSLTFaQsP9opRylPSPXhrPVBKAE5leRQAHn4MCSlESwHvMfxo7KFjFTFAc6dffZZpipYQUOc9bGampwJh58/3e/pyBgVMG6J23CPf/HJQtNFSkjd/V9+ayb/9l2dUEL3bC0fAZ/dbx8HsxdLw8wn3fLlWLj68hOMqa2deCZe3JdSVsPbeWqkh56FFsMLug0Nd+Ar4TgRl9/jnhXF0JWiD0LmPUYLhboY7EfUBzN4w1iYbDi1P+3zvoOYsiVKAXox9GMhQ2VzOO2UcSTuizSza2e98mGpabl/GpKmCz+RDFjtkX6eECgYEA2MyCij65eO3aGIm3FUe93DULRBYTfX8qJQSJq2WOWA3mmQlEW6L3O2B5/lG2h+8WmN6iLEs9eHpgycGYp7vAqgrANEn16ACVcuyx0scFtrZfZ+kmHMzFfiUWxJjVYk/6YngsGVBLdw6ueM42C8TTP67X9tU5TdVGoGWuqEj4W98CgYEAwFqwprXOch5Pqk/RPbb49r0Ou03K/UbciWnWWKzUhFFNS8MdlQPoDvQZbMwHLeWsa2VhaKITK3x5biLQb3U+0GLOn6lTvEyrEUH+ucREyLgVYTRAvwBPtnvlrzpyxPk2HnslQjju8WrvvLLBMKWUjlTrTOzhaHT21gz3pHMiOakCgYEAhLmfaXdBITGshb054sNLDtdCkGpbgEcrzAHdLps769iGxkYQHXHFngpQZUwtTUcoNGqIKknd1jZFrv7gsD+XkgKG7PwimehRlkwmCX5ilxtLiVgJRzRt6+5U5AMVD90a0tHzXYP0z2yjj73fBJF5KtGl0a10KZxaYrQdm1UhB00CgYBZZgzx/k9rtHC8LAqIj1CYhHejT92G53c6Gkl3vyOqN4sgKhfGmSEySfrDGPRBPZxr8ZtbIPCd5mUdberH0osWGMYFaJI1UsCy7aQwvGpniz7MhZeN7dweaOjwDs8mgtjHQ96mL4XGCDhR0BZ/wIURvZ/6iaGdhbbu9unlsWj3uQKBgQCmZYdsbbZkd3ev6f8rwyvMz+DrCQyYpY44cegBYuJgrZiQnL2fJioeN7ixX0UM48SfwsZEIrzshP/LGAwnc2MdjxKUl4jLN8SEe0NAjXOnz9Zaw740+aOmLpXcLWdP4uM2gIhWsvW1tEkQZCXmm7c9s/RsU8Pmzv+YL3+fSijOzA==";//支付宝开发者应用私钥
+
+ private String alipayPublicKey = "MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAouYvZ1v4RiydwNOnGcU0Hb4hQu0x6XUooaE2Bi6/atNOobtFdunnATGP6OMOW7yF9DpP8qH5mbFXAiaQD721y/7qlayI50UcV4mngRU4ZcaAVE3bp721Eg2H85RISa+Tb1CiOh+pc9p4l5UBseKsvB2ruHHForfZDPI8FL7AVUKBYCQPsa4zL6KAO2C6KULaTg/lCa+bYQKU0n9ca569VtdsqJUyxB9eSZjVd+9nKl62FLqp2NELGj7cXqiVBgDnBnVS5ZUO3mrBM5z/AxQbw3RwE3JqdkhzUA1BFjejAlT2zIGNOjUFagF8ao0wGElYfuk0bum6Hz5qWAt02QdNNwIDAQAB";//支付宝应用公钥
+
+ private String alipay_public_key = "MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAmu8n/4yTHWbn7VOrNc9OsLtDL1bEQ8gC1dHkj8Wy5z0mkaOsjJRIG/28ze12M0V8jdCKuuDr5Z1OPKiqf+XO3ypguEh+mYUVMBM/cZodDFQfTY1TKLWjvQCuaqlA+QUTCK6f7T7stsgyQ1o9Jj0rXZDz6PM4QHSTzjrLIBaeqM5WIBvH+fy/X+QG5Utd+/UT0kc0JyvuKhZ65yVUd/C9VcwJJAPliRsAQNrqYterwAJ9zvw9tF11wj9W0XgJ8Ccu4x3gR1vrlLRJJo/OA97RmxPQ+5hSacWQZCUd1dwiBq+YCrKVHGTj14izRHXrLc0yBlRXo7tBOIqcy3IsvKVthQIDAQAB";//支付宝支付公钥
+
+ private String smid = "2088330203191220";//平台支付宝商户号
+
+ private String appid = "wx41d32f362ba0f911";//微信appid
+
+ private String appSecret = "cf0ebf950f5926a69041a0e2bbe20f3e";
+
+ private String mchId = "1501481761";//微信商户号
+
+ private String key = "6f5e0c2dcabfa9c27b5da5836a362fef";//微信商户号
+
+ private String callbackPath = "https://online.daowepark.com:443/course";//支付回调网关地址
+
+ private String app_cert_path = "C:/cert/alipay/user/app_cert_path.crt";//应用公钥证书路径
+
+ private String alipay_cert_path = "C:/cert/alipay/user/alipay_cert_path.crt";//支付宝公钥证书文件路径
+
+ private String alipay_root_cert_path = "C:/cert/alipay/user/alipay_root_cert_path.crt";//支付宝CA根证书文件路径
+
+ private String certPath = "/usr/playpai/cert/weixin/apiclient_cert.p12";//微信证书
+
+ public ResultUtil confirm(String smid,String code, String outTradeNo, String amount) {
+ AlipayClient alipayClient = new DefaultAlipayClient("https://openapi.alipay.com/gateway.do",
+ aliAppid,
+ appPrivateKey,
+ "json",
+ "GBK",
+ alipay_public_key,
+ "RSA2");
+ AlipayTradeSettleConfirmRequest request = new AlipayTradeSettleConfirmRequest();
+ request.setBizContent("{" +
+ " \"out_request_no\":\""+code+"\"," +
+ " \"trade_no\":\""+outTradeNo+"\"," +
+ " \"settle_info\":{" +
+ " \"settle_detail_infos\":[" +
+ " {" +
+ " \"trans_in_type\":\"defaultSettle\"," +
+ " \"settle_entity_id\":\""+smid+"\"," +
+ " \"settle_entity_type\":\"SecondMerchant\"," +
+ " \"amount\":"+amount+"," +
+ " }" +
+ " ]" +
+ " }," +
+ " \"extend_params\":{" +
+ " \"royalty_freeze\":\"true\"" +
+ " }" +
+ "}");
+ AlipayTradeSettleConfirmResponse response = null;
+ try {
+ response = alipayClient.execute(request);
+ } catch (AlipayApiException e) {
+ e.printStackTrace();
+ }
+ if(response.isSuccess()){
+ System.out.println("调用成功");
+ return ResultUtil.success();
+ } else {
+ System.out.println("调用失败");
+ return ResultUtil.error("出现问题啦");
+ }
+ }
+ // 属于平台的运营商 因为无需分账不冻结资金
+ public ResultUtil confirm1(String smid,String code, String outTradeNo, String amount) {
+ AlipayClient alipayClient = new DefaultAlipayClient("https://openapi.alipay.com/gateway.do",
+ aliAppid,
+ appPrivateKey,
+ "json",
+ "GBK",
+ alipay_public_key,
+ "RSA2");
+ AlipayTradeSettleConfirmRequest request = new AlipayTradeSettleConfirmRequest();
+ request.setBizContent("{" +
+ " \"out_request_no\":\""+code+"\"," +
+ " \"trade_no\":\""+outTradeNo+"\"," +
+ " \"settle_info\":{" +
+ " \"settle_detail_infos\":[" +
+ " {" +
+ " \"trans_in_type\":\"defaultSettle\"," +
+ " \"settle_entity_id\":\""+smid+"\"," +
+ " \"settle_entity_type\":\"SecondMerchant\"," +
+ " \"amount\":"+amount+"," +
+ " }" +
+ " ]" +
+ " }," +
+ " \"extend_params\":{" +
+ " \"royalty_freeze\":\"false\"" +
+ " }" +
+ "}");
+ AlipayTradeSettleConfirmResponse response = null;
+ try {
+ response = alipayClient.execute(request);
+ } catch (AlipayApiException e) {
+ e.printStackTrace();
+ }
+ if(response.isSuccess()){
+ System.out.println("调用成功");
+ return ResultUtil.success();
+ } else {
+ System.out.println("调用失败");
+ return ResultUtil.error("出现问题啦");
+ }
+ }
+ /**
+ * 支付宝支付
+ */
+ public ResultUtil alipay(String smid,String body, String subject, String passbackParams, String outTradeNo, String amount, String notifyUrl) {
+// //构造client
+// CertAlipayRequest certAlipayRequest = new CertAlipayRequest ();
+// //设置网关地址
+// certAlipayRequest.setServerUrl("https://openapi.alipay.com/gateway.do");
+// //设置应用Id
+// certAlipayRequest.setAppId(aliAppid);
+// //设置应用私钥
+// certAlipayRequest.setPrivateKey(appPrivateKey);
+// //设置请求格式，固定值json
+// certAlipayRequest.setFormat("json");
+// //设置字符集
+// certAlipayRequest.setCharset("UTF-8");
+// //设置签名类型
+// certAlipayRequest.setSignType("RSA2");
+// //设置应用公钥证书路径
+// certAlipayRequest.setCertPath(app_cert_path);
+// //设置支付宝公钥证书路径
+// certAlipayRequest.setAlipayPublicCertPath(alipay_cert_path);
+// //设置支付宝根证书路径
+// certAlipayRequest.setRootCertPath(alipay_root_cert_path);
+// //构造client
+// AlipayClient alipayClient = null;
+// try {
+// alipayClient = new DefaultAlipayClient(certAlipayRequest);
+// } catch (AlipayApiException e) {
+// e.printStackTrace();
+// }
+// //实例化具体API对应的request类,类名称和接口名称对应,当前调用接口名称：alipay.trade.app.pay
+// AlipayTradeAppPayRequest request = new AlipayTradeAppPayRequest ();
+// //SDK已经封装掉了公共参数，这里只需要传入业务参数。以下方法为sdk的model入参方式(model和biz_content同时存在的情况下取biz_content)。
+// AlipayTradeAppPayModel model = new AlipayTradeAppPayModel ();
+// model.setBody(body);
+// model.setSubject (subject);
+// model.setOutTradeNo (outTradeNo);
+// model.setTimeoutExpress ("30m" );
+// model.setTotalAmount (amount);
+// model.setProductCode ( "QUICK_MSECURITY_PAY" );
+// model.setPassbackParams(passbackParams);//自定义参数
+// request.setBizModel ( model );
+// request.setNotifyUrl (callbackPath + notifyUrl);
+// try {
+// //这里和普通的接口调用不同，使用的是sdkExecute
+// AlipayTradeAppPayResponse response = alipayClient.sdkExecute(request);
+// Map<String, String> map = new HashMap<>();
+// map.put("orderString", response.getBody());
+// System.out.println(map);//就是orderString 可以直接给客户端请求，无需再做处理。
+// return ResultUtil.success(map);
+// } catch (AlipayApiException e ) {
+// e.printStackTrace();
+// }
+ //实例化客户端
+ AlipayClient alipayClient = new DefaultAlipayClient("https://openapi.alipay.com/gateway.do", aliAppid, appPrivateKey, "json", "UTF-8", alipay_public_key, "RSA2");
+ //实例化具体API对应的request类,类名称和接口名称对应,当前调用接口名称：alipay.trade.app.pay
+ AlipayTradeAppPayRequest request = new AlipayTradeAppPayRequest();
+ //SDK已经封装掉了公共参数，这里只需要传入业务参数。以下方法为sdk的model入参方式(model和biz_content同时存在的情况下取biz_content)。
+ AlipayTradeAppPayModel model = new AlipayTradeAppPayModel();
+ model.setBody(body);//对一笔交易的具体描述信息。如果是多种商品，请将商品描述字符串累加传给body。
+ model.setSubject(subject);//商品的标题/交易标题/订单标题/订单关键字等。
+ model.setOutTradeNo(outTradeNo);//商户网站唯一订单号
+ model.setTimeoutExpress("30m");
+ model.setTotalAmount(amount);//付款金额
+ model.setProductCode("QUICK_MSECURITY_PAY");
+ model.setPassbackParams(passbackParams);//自定义参数
+ SettleInfo settleInfo = new SettleInfo();
+ settleInfo.setSettlePeriodTime("3d");
+ SettleDetailInfo settleDetailInfo = new SettleDetailInfo();
+ settleDetailInfo.setTransInType("defaultSettle");
+ settleDetailInfo.setAmount(amount);
+ List<SettleDetailInfo> settleDetailInfos = new ArrayList<>();
+ settleDetailInfos.add(settleDetailInfo);
+ settleInfo.setSettleDetailInfos(settleDetailInfos);
+ model.setSettleInfo(settleInfo);
+ SubMerchant subMerchant = new SubMerchant();
+ subMerchant.setMerchantId(smid);
+ model.setSubMerchant(subMerchant);
+ ExtendParams extendParams = new ExtendParams();
+ extendParams.setRoyaltyFreeze("false");// 冻结资金 用于后续分账处理
+ model.setExtendParams(extendParams);
+ request.setBizModel(model);
+ request.setNotifyUrl(callbackPath + notifyUrl);
+ try {
+ //这里和普通的接口调用不同，使用的是sdkExecute
+ AlipayTradeAppPayResponse response = alipayClient.sdkExecute(request);
+ Map<String, String> map = new HashMap<>();
+ map.put("orderString", response.getBody());
+ System.out.println(map);//就是orderString 可以直接给客户端请求，无需再做处理。
+ return ResultUtil.success(map);
+ } catch (AlipayApiException e) {
+ e.printStackTrace();
+ }
+ return null;
+ }
+
+
+ /**
+ * 支付宝扫码支付下单
+ *
+ * @param body
+ * @param subject
+ * @param outTradeNo
+ * @param amount
+ * @param notifyUrl
+ * @return
+ */
+ public ResultUtil aliScanCodePay(String body, String subject, String outTradeNo, String amount, String notifyUrl) {
+ AlipayClient alipayClient = new DefaultAlipayClient("https://openapi.alipay.com/gateway.do", aliAppid, appPrivateKey, "json", "UTF-8", alipay_public_key, "RSA2"); //获得初始化的AlipayClient
+ AlipayTradePrecreateRequest request = new AlipayTradePrecreateRequest();//创建API对应的request类
+ request.setBizContent("{" +
+ " \"out_trade_no\":\"" + outTradeNo + "\"," +//商户订单号
+ " \"total_amount\":\"" + 1 + "\"," +
+ " \"subject\":\"" + subject + "\"," +
+ " \"notify_url\":\"" + callbackPath + notifyUrl + "\"," +
+ " \"body\":\"" + body + "\"," +
+ " \"store_id\":\"NJ_001\"," +
+ " \"timeout_express\":\"90m\"}");//订单允许的最晚付款时间
+ AlipayTradePrecreateResponse response = null;
+ try {
+ response = alipayClient.execute(request);
+ } catch (AlipayApiException e) {
+ e.printStackTrace();
+ }
+ JSONObject alipay_trade_precreate_response = JSON.parseObject(response.getBody()).getJSONObject("alipay_trade_precreate_response");
+
+ System.err.print(alipay_trade_precreate_response.getString("qr_code"));
+ return ResultUtil.success(alipay_trade_precreate_response.getString("qr_code"));
+ }
+
+
+ /**
+ * 支付成功后的回调处理逻辑
+ *
+ * @param request
+ */
+ public Map<String, String> alipayCallback(HttpServletRequest request) {
+ //获取支付宝POST过来反馈信息
+ Map<String, String> params = new HashMap<String, String>();
+ Map requestParams = request.getParameterMap();
+ for (Iterator iter = requestParams.keySet().iterator(); iter.hasNext(); ) {
+ String name = (String) iter.next();
+ String[] values = (String[]) requestParams.get(name);
+ String valueStr = "";
+ for (int i = 0; i < values.length; i++) {
+ valueStr = (i == values.length - 1) ? valueStr + values[i]
+ : valueStr + values[i] + "_";
+ }
+ //乱码解决，这段代码在出现乱码时使用。
+ //valueStr = new String(valueStr.getBytes("ISO-8859-1"), "utf-8");
+ params.put(name, valueStr);
+ }
+ //切记alipaypublickey是支付宝的公钥，请去open.alipay.com对应应用下查看。
+ //boolean AlipaySignature.rsaCheckV1(Map<String, String> params, String publicKey, String charset, String sign_type)
+// try {
+// boolean flag = AlipaySignature.rsaCheckV1(params, alipay_public_key, "UTF-8","RSA2");
+// if(flag){
+// Map<String, String> map = new HashMap<>();
+// String out_trade_no = params.get("out_trade_no");
+// String subject = params.get("subject");
+// String total_amount = params.get("total_amount");
+// String trade_no = params.get("trade_no");
+// String passback_params = params.get("passback_params");
+// map.put("out_trade_no", out_trade_no);//商家订单号
+// map.put("subject", subject);
+// map.put("total_amount", total_amount);
+// map.put("trade_no", trade_no);//支付宝交易号
+// map.put("passback_params", passback_params);//回传参数
+// return map;
+// }else{
+// System.err.println("验签失败");
+// }
+//
+// } catch (AlipayApiException e) {
+// e.printStackTrace();
+// }
+// return null;
+
+
+ Map<String, String> map = new HashMap<>();
+ System.err.println("返回码"+params);
+ if (params.get("trade_status").equals("TRADE_SUCCESS")){
+ String out_trade_no = params.get("out_trade_no");
+ String subject = params.get("subject");
+ String total_amount = params.get("total_amount");
+ String trade_no = params.get("trade_no");
+ String passback_params = params.get("passback_params");
+ map.put("out_trade_no", out_trade_no);//商家订单号
+ map.put("subject", subject);
+ map.put("total_amount", total_amount);
+ map.put("trade_no", trade_no);//支付宝交易号
+ map.put("passback_params", passback_params);//回传参数
+ System.err.println("回调map");
+ return map;
+ }else{
+ return null;
+ }
+ }
+
+
+ /**
+ * 支付宝查询订单支付状态
+ *
+ * @param out_trade_no
+ * @return
+ * @throws Exception
+ */
+ public AlipayTradeQueryResponse queryALIOrder(String out_trade_no) throws Exception {
+ AlipayClient alipayClient = new DefaultAlipayClient("https://openapi.alipay.com/gateway.do", aliAppid, appPrivateKey, "json", "UTF-8", alipay_public_key, "RSA2");
+ AlipayTradeQueryRequest request = new AlipayTradeQueryRequest();
+ request.setBizContent("{" +
+ " \"out_trade_no\":\"" + out_trade_no + "\"" +
+ "}");
+ AlipayTradeQueryResponse response = alipayClient.execute(request);
+ if (response.isSuccess()) {
+ String tradeStatus = response.getTradeStatus();//交易状态：WAIT_BUYER_PAY（交易创建，等待买家付款）、TRADE_CLOSED（未付款交易超时关闭，或支付完成后全额退款）、TRADE_SUCCESS（交易支付成功）、TRADE_FINISHED（交易结束，不可退款）
+ return response;
+ } else {
+ return response;
+ }
+ }
+
+
+ /**
+ * 微信统一下单
+ *
+ * @param body 商品描述
+ * @param attach 附加数据
+ * @param out_trade_no 商户订单号
+ * @param total_fee 标价金额
+ * @param notify_url 通知地址
+ * @param tradeType 交易类型
+ * @return
+ */
+ public ResultUtil weixinpay(String body, String attach, String out_trade_no, String total_fee, String notify_url, String tradeType, String openId) throws Exception {
+ int i = new BigDecimal(total_fee).multiply(new BigDecimal("100")).intValue();
+ String hostAddress = null;
+ try {
+ hostAddress = InetAddress.getLocalHost().getHostAddress();
+ } catch (UnknownHostException e) {
+ e.printStackTrace();
+ }
+ String nonce_str = UUIDUtil.getRandomCode(16);
+ Map<String, Object> map = new HashMap<>();
+ map.put("appid", appid);
+ map.put("mch_id", mchId);
+ map.put("nonce_str", nonce_str);
+ String temp = "";
+ if (body.split("-").length>1){
+ temp = body.split("-")[1];
+ map.put("body", body.split("-")[0]);
+ }else{
+ map.put("body", body);
+ }
+ if (StringUtils.hasLength(temp) && temp.equals("1")){
+ // 添加分账标识
+ map.put("profit_sharing", "Y");
+ }
+ map.put("attach", attach);//存储订单id
+ map.put("out_trade_no", out_trade_no);//存储的订单code
+ map.put("total_fee", i);
+ map.put("spbill_create_ip", hostAddress);
+ map.put("notify_url", callbackPath + notify_url);
+ map.put("trade_type", tradeType);
+ if ("JSAPI".equals(tradeType)) {
+ map.put("openid", openId);
+ }
+ String s = this.weixinSignature(map);
+ map.put("sign", s);
+
+ String url = "https://api.mch.weixin.qq.com/pay/unifiedorder";
+ //设置请求头
+ HttpHeaders headers = new HttpHeaders();
+ headers.setContentType(MediaType.APPLICATION_XML);
+ StringBuffer xmlString = new StringBuffer();
+ Set<String> strings = map.keySet();
+ String[] keys = {};
+ keys = strings.toArray(keys);
+ Arrays.sort(keys);
+ xmlString.append("<xml>");
+ for (int l = 0; l < keys.length; l++) {
+ xmlString.append("<" + keys[l] + ">" + map.get(keys[l]) + "</" + keys[l] + ">");
+ }
+ xmlString.append("</xml>");
+
+ Map<String, String> map1 = null;
+ String body1 = HttpClientUtil.pushHttpRequsetXml(url, xmlString.toString(), new HashMap<>()).getData();
+ //将结果xml解析成map
+ body1 = body1.replaceAll("<!\\[CDATA\\[", "");
+ body1 = body1.replaceAll("]]>", "");
+ try {
+ map1 = this.xmlToMap(body1, "UTF-8");
+ } catch (UnsupportedEncodingException e) {
+ e.printStackTrace();
+ } catch (DocumentException e) {
+ e.printStackTrace();
+ }
+ String return_code = map1.get("return_code");
+ if ("SUCCESS".equals(return_code)) {
+ String result_code = map1.get("result_code");
+ if ("SUCCESS".equals(result_code)) {
+ String type = map1.get("trade_type");
+ String prepay_id = map1.get("prepay_id");
+ switch (type) {
+ case "JSAPI":
+ //重新进行签名后返回给前端
+ Map<String, Object> map2 = new HashMap<>();
+ map2.put("appId", map1.get("appid"));
+ map2.put("nonceStr", map1.get("nonce_str"));
+ map2.put("package", "prepay_id=" + prepay_id);
+ map2.put("signType", "MD5");
+ map2.put("timeStamp", new Date().getTime() + "");
+ String s2 = this.weixinSignature(map2);
+
+ map2.put("prepay_id", prepay_id);
+ map2.put("mch_id", map1.get("mch_id"));
+ map2.put("trade_type", map1.get("trade_type"));
+
+ map2.put("sign", s2);
+ return ResultUtil.success(map2);
+ case "NATIVE":
+ String code_url = map1.get("code_url");
+ return ResultUtil.success(code_url);
+ case "APP":
+ //重新进行签名后返回给前端
+ Map<String, Object> map3 = new HashMap<>();
+ map3.put("appid", appid);
+ map3.put("noncestr", nonce_str);
+ map3.put("package", "Sign=WXPay");
+ map3.put("partnerid", mchId);
+ map3.put("prepayid", prepay_id);
+ map3.put("timestamp", new Date().getTime() / 1000);
+ String s1 = this.weixinSignature(map3);
+ map3.put("sign", s1);
+ System.err.println(map3);
+ return ResultUtil.success(map3);
+ }
+ return null;
+ } else {
+ System.err.println(map1.get("err_code_des"));
+ return ResultUtil.error(map1.get("err_code_des"));
+ }
+ } else {
+ System.err.println(map1.get("return_msg") + appid + "----" + mchId);
+ return ResultUtil.error(map1.get("return_msg"), new JSONObject());
+ }
+ }
+
+
+
+
+ /**
+ * 微信支付成功后的回调处理
+ *
+ * @param request
+ */
+ public Map<String, String> weixinpayCallback(HttpServletRequest request) {
+ try {
+ String param = this.getParam(request);
+ param = param.replaceAll("<!\\[CDATA\\[", "");
+ param = param.replaceAll("]]>", "");
+ Map<String, String> map = this.xmlToMap(param, "UTF-8");
+ String return_code = map.get("return_code");
+ if ("SUCCESS".equals(return_code)) {
+ String result_code = map.get("result_code");
+ if ("SUCCESS".equals(result_code)) {
+ Map<String, String> map1 = new HashedMap();
+ map1.put("nonce_str", map.get("nonce_str"));
+ map1.put("out_trade_no", map.get("out_trade_no"));//存储的订单code
+ map1.put("attach", map.get("attach"));//存储订单id
+ map1.put("total_fee", map.get("total_fee"));
+ map1.put("transaction_id", map.get("transaction_id"));//微信支付订单号
+ String result = "<xml><return_code><![CDATA[SUCCESS]]></return_code><return_msg><![CDATA[OK]]></return_msg></xml>";
+ map1.put("result", result);
+ return map1;
+ } else {
+ System.err.println(map.get("err_code_des"));
+ }
+ } else {
+ System.err.println(map.get("return_msg"));
+ }
+ } catch (IOException e) {
+ e.printStackTrace();
+ } catch (DocumentException e) {
+ e.printStackTrace();
+ }
+ return null;
+ }
+
+
+ /**
+ * 微信扫码收款
+ *
+ * @param body 商品描述
+ * @param attach 附加数据
+ * @param nonce_str 随机字符串
+ * @param out_trade_no 商户订单号
+ * @param total_fee 订单金额
+ * @param auth_code 授权码 扫码支付授权码，设备读取用户微信中的条码或者二维码信息（注：用户付款码条形码规则：18位纯数字，以10、11、12、13、14、15开头）
+ * @return
+ */
+ public ResultUtil wxScanQRCodePay(String body, String attach, String nonce_str, String out_trade_no, String total_fee, String auth_code) {
+ int i = new BigDecimal(total_fee).multiply(new BigDecimal("100")).intValue();
+ String hostAddress = null;
+ try {
+ InetAddress address = InetAddress.getLocalHost();
+ hostAddress = address.getHostAddress();
+ } catch (UnknownHostException e) {
+ e.printStackTrace();
+ }
+ String randomCode = null;
+ try {
+ randomCode = UUIDUtil.getRandomCode(10);
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ Map<String, Object> map = new HashMap<>();
+ map.put("appid", appid);
+ map.put("mch_id", mchId);
+ map.put("nonce_str", nonce_str);//存储的支付人员id，员工扫描二维码支付的时候存储的是收款员工id
+ map.put("body", body);
+ map.put("attach", attach);//存储的费用月份数据，员工扫描二维码支付的时候存储的是收费项id
+ map.put("out_trade_no", randomCode + "_" + out_trade_no);//存储的房间id
+ map.put("total_fee", i);
+ map.put("spbill_create_ip", hostAddress);
+ map.put("auth_code", auth_code);
+ String s = this.weixinSignature(map);
+ map.put("sign", s);
+
+ String url = "https://api.mch.weixin.qq.com/pay/unifiedorder";
+ //设置请求头
+ HttpHeaders headers = new HttpHeaders();
+ headers.setContentType(MediaType.APPLICATION_XML);
+ StringBuffer xmlString = new StringBuffer();
+ Set<String> strings = map.keySet();
+ String[] keys = {};
+ keys = strings.toArray(keys);
+ Arrays.sort(keys);
+ xmlString.append("<xml>");
+ for (int l = 0; l < keys.length; l++) {
+ xmlString.append("<" + keys[l] + ">" + map.get(keys[l]) + "</" + keys[l] + ">");
+ }
+ xmlString.append("</xml>");
+
+ Map<String, String> map1 = null;
+ String body1 = null;
+ try {
+ body1 = HttpClientUtil.pushHttpRequsetXml(url, xmlString.toString(), new HashMap<>()).getData();
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ //将结果xml解析成map
+ body1 = body1.replaceAll("<!\\[CDATA\\[", "");
+ body1 = body1.replaceAll("]]>", "");
+ try {
+ map1 = this.xmlToMap(body1, "UTF-8");
+ } catch (UnsupportedEncodingException e) {
+ e.printStackTrace();
+ } catch (DocumentException e) {
+ e.printStackTrace();
+ }
+ String return_code = map1.get("return_code");
+ if ("SUCCESS".equals(return_code)) {
+ String result_code = map1.get("result_code");
+ if ("SUCCESS".equals(result_code)) {
+ String type = map1.get("trade_type");
+ switch (type) {
+ case "JSAPI":
+ break;
+ case "NATIVE":
+ String code_url = map1.get("code_url");
+ return ResultUtil.success(code_url);
+ case "APP":
+ String prepay_id = map1.get("prepay_id");
+ //重新进行签名后返回给前端
+ Map<String, Object> map2 = new HashMap<>();
+ map2.put("appid", appid);
+ map2.put("noncestr", nonce_str);
+ map2.put("package", "Sign=WXPay");
+ map2.put("partnerid", mchId);
+ map2.put("prepayid", prepay_id);
+ map2.put("timestamp", new Date().getTime() + "");
+ String s1 = this.weixinSignature(map2);
+
+ map2.put("pac", "Sign=WXPay");
+ map2.put("sign", s1);
+// System.err.println(map2);
+ return ResultUtil.success(map2);
+ }
+ return null;
+ } else {
+// System.err.println(map1.get("err_code_des"));
+ return ResultUtil.error(map1.get("err_code_des"));
+ }
+ } else {
+// System.err.println(map1.get("return_msg") + appid + "----" + mchId);
+ return ResultUtil.error(map1.get("return_msg"), new JSONObject());
+ }
+ }
+
+
+ /**
+ * 支付宝扫码收款
+ *
+ * @param data
+ * @return
+ */
+ public Object aliScanQRCodePay(String data) {
+ return null;
+ }
+
+
+ /**
+ * 微信退款申请
+ *
+ * @param transaction_id 微信订单号。微信生成的订单号，在支付通知中有返回
+ * @param out_refund_no 商户退款单号。商户系统内部的退款单号，商户系统内部唯一，只能是数字、大小写字母_-|*@ ，同一退款单号多次请求只退一笔。
+ * @param total_fee 订单金额。订单总金额，单位为分，只能为整数
+ * @param refund_fee 退款金额。退款总金额，订单总金额，单位为分，只能为整数
+ * @param notify_url 退款结果通知url。异步接收微信支付退款结果通知的回调地址，通知URL必须为外网可访问的url，不允许带参数 如果参数中传了notify_url，则商户平台上配置的回调地址将不会生效。
+ * @return
+ */
+ public Map<String, String> wxRefund(String transaction_id, String out_refund_no, String total_fee, String refund_fee, String notify_url) {
+ int tf = new BigDecimal(total_fee).multiply(new BigDecimal("100")).intValue();
+ int rf = new BigDecimal(refund_fee).multiply(new BigDecimal("100")).intValue();
+ String nonce_str = UUIDUtil.getRandomCode();
+ Map<String, Object> map = new HashMap<>();
+ map.put("appid", appid);
+ map.put("mch_id", mchId);
+ map.put("nonce_str", nonce_str);
+ map.put("transaction_id", transaction_id);
+ map.put("out_refund_no", out_refund_no);
+ map.put("total_fee", tf);
+ map.put("refund_fee", rf);
+ map.put("notify_url", callbackPath + notify_url);
+ String s = this.weixinSignature(map, key);
+ map.put("sign", s);
+
+ String url = "https://api.mch.weixin.qq.com/secapi/pay/refund";
+ //设置请求头
+ HttpHeaders headers = new HttpHeaders();
+ headers.setContentType(MediaType.APPLICATION_XML);
+ StringBuffer xmlString = new StringBuffer();
+ Set<String> strings = map.keySet();
+ String[] keys = {};
+ keys = strings.toArray(keys);
+ Arrays.sort(keys);
+ xmlString.append("<xml>");
+ for (int l = 0; l < keys.length; l++) {
+ xmlString.append("<" + keys[l] + ">" + map.get(keys[l]) + "</" + keys[l] + ">");
+ }
+ xmlString.append("</xml>");
+
+ Map<String, String> map1 = null;
+ String body1 = null;
+ try {
+ body1 = HttpClientUtil.pushHttpsRequsetXml(url, xmlString.toString(), new HashMap<>(), mchId, certPath, "PKCS12");
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ System.err.println(body1);
+ //将结果xml解析成map
+ body1 = body1.replaceAll("<!\\[CDATA\\[", "");
+ body1 = body1.replaceAll("]]>", "");
+ try {
+ map1 = this.xmlToMap(body1, "UTF-8");
+ } catch (UnsupportedEncodingException e) {
+ e.printStackTrace();
+ } catch (DocumentException e) {
+ e.printStackTrace();
+ }
+ String return_code = map1.get("return_code");
+ Map<String, String> map2 = new HashMap<>();
+ if ("SUCCESS".equals(return_code)) {
+ String result_code = map1.get("result_code");
+ if ("SUCCESS".equals(result_code)) {
+ map2.put("return_code", result_code);
+ map2.put("refund_id", String.valueOf(map1.get("refund_id")));//微信退款订单号
+ map2.put("refund_fee", String.valueOf(map1.get("refund_fee")));//退款金额
+ return map2;
+ } else {
+ map2.put("return_code", result_code);
+ map2.put("return_msg", map1.get("err_code_des"));
+ return map2;
+ }
+ } else {
+ map2.put("return_code", return_code);
+ map2.put("return_msg", map1.get("return_msg"));
+ return map2;
+ }
+ }
+
+
+ /**
+ * 微信退款成功后的回调处理
+ *
+ * @param request
+ * @return
+ */
+ public Map<String, String> wxRefundCallback(HttpServletRequest request) {
+ try {
+ String param = this.getParam(request);
+ param = param.replaceAll("<!\\[CDATA\\[", "");
+ param = param.replaceAll("]]>", "");
+ Map<String, String> map = this.xmlToMap(param, "UTF-8");
+ String return_code = map.get("return_code");
+ if ("SUCCESS".equals(return_code)) {
+ String req_info = map.get("req_info");//加密信息请用商户秘钥进行解密
+ String s = this.wxDecrypt(req_info);
+ s = s.replaceAll("<!\\[CDATA\\[", "");
+ s = s.replaceAll("]]>", "");
+ map = this.xmlToMap(s, "UTF-8");
+ Map<String, String> map1 = new HashMap<>();
+ map1.put("refund_id", map.get("refund_id"));
+ map1.put("out_refund_no", map.get("out_refund_no"));
+ String result = "<xml><return_code><![CDATA[SUCCESS]]></return_code><return_msg><![CDATA[OK]]></return_msg></xml>";
+ map1.put("result", result);
+ return map1;
+ } else {
+// System.err.println(map.get("return_msg"));
+ }
+ } catch (IOException e) {
+ e.printStackTrace();
+ } catch (DocumentException e) {
+ e.printStackTrace();
+ } catch (NoSuchAlgorithmException e) {
+ e.printStackTrace();
+ } catch (InvalidKeyException e) {
+ e.printStackTrace();
+ } catch (NoSuchPaddingException e) {
+ e.printStackTrace();
+ } catch (BadPaddingException e) {
+ e.printStackTrace();
+ } catch (NoSuchProviderException e) {
+ e.printStackTrace();
+ } catch (IllegalBlockSizeException e) {
+ e.printStackTrace();
+ }
+ return null;
+ }
+
+
+ /**
+ * 支付宝退款
+ *
+ * @param trade_no 支付宝交易号
+ * @param refund_amount 退款金额
+ * @return
+ * @throws AlipayApiException
+ */
+ public Map<String, String> aliRefund(String trade_no, String refund_amount) throws AlipayApiException {
+ AlipayClient alipayClient = new DefaultAlipayClient("https://openapi.alipay.com/gateway.do", aliAppid, appPrivateKey, "json", "UTF-8", alipay_public_key, "RSA2");
+ AlipayTradeRefundRequest request = new AlipayTradeRefundRequest();
+ JSONObject jsonObject = new JSONObject();
+ jsonObject.put("trade_no", trade_no);
+ jsonObject.put("refund_amount", refund_amount);
+ request.setBizContent(jsonObject.toJSONString());
+ AlipayTradeRefundResponse response = alipayClient.execute(request);
+ Map<String, String> map = new HashMap<>();
+ if (response.isSuccess()) {
+ System.out.println("调用成功");
+ String outTradeNo = response.getOutTradeNo();
+ map.put("code", response.getCode());//10000
+ map.put("trade_no", response.getTradeNo());//支付宝交易号
+ map.put("out_trade_no", outTradeNo);//商户订单号
+ } else {
+ System.out.println("调用失败");
+ map.put("code", response.getCode());
+ map.put("msg", response.getSubMsg());
+ }
+ return map;
+ }
+
+
+ /**
+ * 查询微信支付订单
+ *
+ * @return
+ * @throws Exception
+ */
+ public ResultUtil<Map<String, String>> queryWXOrder(String out_trade_no, String transaction_id) throws Exception {
+ String url = "https://api.mch.weixin.qq.com/pay/orderquery";
+ String nonce_str = UUIDUtil.getRandomCode(16);
+ Map<String, Object> map = new HashMap<>();
+ map.put("appid", appid);
+ map.put("mch_id", mchId);
+ map.put("out_trade_no", out_trade_no);//商户订单号
+ map.put("transaction_id", transaction_id);//微信订单号
+ map.put("nonce_str", nonce_str);//随机字符串
+ String s = this.weixinSignature(map);
+ map.put("sign", s);
+
+ //设置请求头
+ HttpHeaders headers = new HttpHeaders();
+ headers.setContentType(MediaType.APPLICATION_XML);
+ StringBuffer xmlString = new StringBuffer();
+ Set<String> strings = map.keySet();
+ String[] keys = {};
+ keys = strings.toArray(keys);
+ Arrays.sort(keys);
+ xmlString.append("<xml>");
+ for (int l = 0; l < keys.length; l++) {
+ xmlString.append("<" + keys[l] + ">" + map.get(keys[l]) + "</" + keys[l] + ">");
+ }
+ xmlString.append("</xml>");
+
+ Map<String, String> map1 = null;
+ String body1 = HttpClientUtil.pushHttpRequsetXml(url, xmlString.toString(), new HashMap<>()).getData();
+ //将结果xml解析成map
+ body1 = body1.replaceAll("<!\\[CDATA\\[", "");
+ body1 = body1.replaceAll("]]>", "");
+ try {
+ map1 = this.xmlToMap(body1, "UTF-8");
+ } catch (UnsupportedEncodingException e) {
+ e.printStackTrace();
+ } catch (DocumentException e) {
+ e.printStackTrace();
+ }
+ String return_code = map1.get("return_code");
+ if ("SUCCESS".equals(return_code)) {
+ String result_code = map1.get("result_code");
+ if ("SUCCESS".equals(result_code)) {
+ Map<String, String> map2 = new HashMap<>();
+ map2.put("trade_type", map1.get("trade_type"));
+ map2.put("trade_state", map1.get("trade_state"));//订单状态SUCCESS—支付成功，REFUND—转入退款，NOTPAY—未支付，CLOSED—已关闭，REVOKED—已撤销（刷卡支付），USERPAYING--用户支付中，PAYERROR--支付失败(其他原因，如银行返回失败)
+ map2.put("transaction_id", map1.get("transaction_id"));
+ return ResultUtil.success(map2);
+ } else {
+ System.err.println(map1.get("err_code_des"));
+ return ResultUtil.error(map1.get("err_code_des"));
+ }
+ } else {
+ System.err.println(map1.get("return_msg") + appid + "----" + mchId);
+ return ResultUtil.error(map1.get("return_msg"));
+ }
+ }
+
+
+ /**
+ * 微信转账功能（企业付款到零钱）
+ *
+ * @param openid 商户appid下，某用户的openid
+ * @param desc 企业付款备注，必填。
+ * @param total_fee 企业付款金额
+ * @param partner_trade_no 商户订单号，需保持唯一性
+ * @return
+ */
+ public Map<String, String> wxTransfers(String openid, String desc, String total_fee, String partner_trade_no) throws Exception {
+ int amount = new BigDecimal(total_fee).multiply(new BigDecimal("100")).intValue();
+ String nonce_str = UUIDUtil.getRandomCode();
+ Map<String, Object> map = new HashMap<>();
+ map.put("mch_appid", appid);//申请商户号的appid或商户号绑定的appid
+ map.put("mchid", mchId);//微信支付分配的商户号
+ map.put("nonce_str", nonce_str);//随机字符串，不长于32位
+ map.put("partner_trade_no", partner_trade_no);//商户订单号，需保持唯一性
+ map.put("openid", openid);//商户appid下，某用户的openid
+ map.put("check_name", "NO_CHECK");//NO_CHECK：不校验真实姓名 FORCE_CHECK：强校验真实姓名
+ map.put("amount", amount);//企业付款金额，单位为分
+ map.put("desc", desc);//企业付款备注，必填。
+ String s = this.weixinSignature(map, key);
+ map.put("sign", s);
+
+ String url = "https://api.mch.weixin.qq.com/mmpaymkttransfers/promotion/transfers";
+ //设置请求头
+ HttpHeaders headers = new HttpHeaders();
+ headers.setContentType(MediaType.APPLICATION_XML);
+ StringBuffer xmlString = new StringBuffer();
+ Set<String> strings = map.keySet();
+ String[] keys = {};
+ keys = strings.toArray(keys);
+ Arrays.sort(keys);
+ xmlString.append("<xml>");
+ for (int l = 0; l < keys.length; l++) {
+ xmlString.append("<" + keys[l] + ">" + map.get(keys[l]) + "</" + keys[l] + ">");
+ }
+ xmlString.append("</xml>");
+
+ Map<String, String> map1 = null;
+ String body1 = HttpClientUtil.pushHttpsRequsetXml(url, xmlString.toString(), new HashMap<>(), mchId, certPath, "PKCS12");
+ //将结果xml解析成map
+ body1 = body1.replaceAll("<!\\[CDATA\\[", "");
+ body1 = body1.replaceAll("]]>", "");
+ try {
+ map1 = this.xmlToMap(body1, "UTF-8");
+ } catch (UnsupportedEncodingException e) {
+ e.printStackTrace();
+ } catch (DocumentException e) {
+ e.printStackTrace();
+ }
+ String return_code = map1.get("return_code");
+ Map<String, String> map2 = new HashMap<>();
+ if ("SUCCESS".equals(return_code)) {
+ String result_code = map1.get("result_code");
+ if ("SUCCESS".equals(result_code)) {
+ map2.put("return_code", result_code);
+ map2.put("payment_no", String.valueOf(map1.get("payment_no")));//付款订单号
+ map2.put("payment_time", String.valueOf(map1.get("payment_time")));//付款时间
+ return map2;
+ } else {
+ map2.put("return_code", result_code);
+ map2.put("err_code", map1.get("err_code"));
+ map2.put("err_code_des", map1.get("err_code_des"));
+ return map2;
+ }
+ } else {
+ map2.put("return_code", return_code);
+ map2.put("return_msg", map1.get("return_msg"));
+ return map2;
+ }
+ }
+
+
+ /**
+ * 微信转账功能（企业付款到银行卡）
+ *
+ * @param desc 备注信息
+ * @param total_fee 转账金额
+ * @param partner_trade_no 订单号
+ * @param enc_bank_no 银行卡号
+ * @param enc_true_name 收款方用户名
+ * @param bankName 银行名称
+ * @return
+ * @throws Exception
+ */
+ public Map<String, String> wxPayBank(String desc, String total_fee, String partner_trade_no, String enc_bank_no, String enc_true_name, String bankName) throws Exception {
+ int amount = new BigDecimal(total_fee).multiply(new BigDecimal("100")).intValue();
+ String nonce_str = UUIDUtil.getRandomCode();
+ Map<String, Object> map = new HashMap<>();
+ map.put("mch_id", mchId);//微信支付分配的商户号
+ map.put("nonce_str", nonce_str);//随机字符串，不长于32位
+ map.put("partner_trade_no", partner_trade_no);//商户订单号，需保持唯一性
+ map.put("enc_bank_no", enc_bank_no);//收款方银行卡号（采用标准RSA算法，公钥由微信侧提供）
+ map.put("enc_true_name", enc_true_name);//收款方用户名（采用标准RSA算法，公钥由微信侧提供）
+ map.put("bank_code", findBankCode(bankName));//
+ map.put("amount", amount);//企业付款金额，单位为分
+ map.put("desc", desc);//企业付款备注，必填。
+ String s = this.weixinSignature(map, key);
+ map.put("sign", s);
+
+ String url = "https://api.mch.weixin.qq.com/mmpaysptrans/pay_bank";
+ //设置请求头
+ HttpHeaders headers = new HttpHeaders();
+ headers.setContentType(MediaType.APPLICATION_XML);
+ StringBuffer xmlString = new StringBuffer();
+ Set<String> strings = map.keySet();
+ String[] keys = {};
+ keys = strings.toArray(keys);
+ Arrays.sort(keys);
+ xmlString.append("<xml>");
+ for (int l = 0; l < keys.length; l++) {
+ xmlString.append("<" + keys[l] + ">" + map.get(keys[l]) + "</" + keys[l] + ">");
+ }
+ xmlString.append("</xml>");
+
+ Map<String, String> map1 = null;
+ String body1 = HttpClientUtil.pushHttpsRequsetXml(url, xmlString.toString(), new HashMap<>(), mchId, certPath, "PKCS12");
+ //将结果xml解析成map
+ body1 = body1.replaceAll("<!\\[CDATA\\[", "");
+ body1 = body1.replaceAll("]]>", "");
+ try {
+ map1 = this.xmlToMap(body1, "UTF-8");
+ } catch (UnsupportedEncodingException e) {
+ e.printStackTrace();
+ } catch (DocumentException e) {
+ e.printStackTrace();
+ }
+ String return_code = map1.get("return_code");
+ Map<String, String> map2 = new HashMap<>();
+ if ("SUCCESS".equals(return_code)) {
+ String result_code = map1.get("result_code");
+ if ("SUCCESS".equals(result_code)) {
+ map2.put("return_code", result_code);
+ map2.put("payment_no", String.valueOf(map1.get("payment_no")));//付款订单号
+ map2.put("cmms_amt", String.valueOf(map1.get("cmms_amt")));//手续费金额 RMB：分
+ return map2;
+ } else {
+ map2.put("return_code", result_code);
+ map2.put("err_code", map1.get("err_code"));
+ map2.put("err_code_des", map1.get("err_code_des"));
+ return map2;
+ }
+ } else {
+ map2.put("return_code", return_code);
+ map2.put("return_msg", map1.get("return_msg"));
+ return map2;
+ }
+ }
+
+ /**
+ * 微信转账到银行卡不编号
+ *
+ * @param bankName
+ * @return
+ */
+ public String findBankCode(String bankName) {
+ String json = "{\"工商银行 \":1002,\"农业银行\":1005,\"建设银行\":1003,\"中国银行\":1026,\"交通银行 \":1020,\"招商银行 \":1001,\"邮储银行\":1066,\"民生银行 \":1006,\"平安银行 \":1010,\"中信银行\":1021,\"浦发银行 \":1004,\"兴业银行 \":1009,\"光大银行 \":1022,\"广发银行\":1027,\"华夏银行\":1025,\"宁波银行\":1056,\"北京银行\":4836,\"上海银行\":1024,\"南京银行\":1054,\"长子县融汇村镇银行\":4755,\"长沙银行\":4216,\"浙江泰隆商业银行\":4051,\"中原银行 \":4753,\"企业银行（中国）\":4761,\"顺德农商银行 \":4036,\"衡水银行\":4752,\"长治银行\":4756,\"大同银行\":4767,\"河南省农村信用社\":4115,\"宁夏黄河农村商业银行\":4150,\"山西省农村信用社\":4156,\"安徽省农村信用社\":4166,\"甘肃省农村信用社\":4157,\"天津农村商业银行\":4153,\"广西壮族自治区农村信用社\":4113,\"陕西省农村信用社\":4108,\"深圳农村商业银行\":4076,\"宁波鄞州农村商业银行\":4052,\"浙江省农村信用社联合社\":4764,\"江苏省农村信用社联合社\":4217,\"江苏紫金农村商业银行股份有限公司 \":4072,\"北京中关村银行股份有限公司 \":4769,\"星展银行（ 中国） 有限公司 \":4778,\"枣庄银行股份有限公司 \":4766,\"海口联合农村商业银行股份有限公司 \":4758,\"南洋商业银行（ 中国） 有限公司 \":4763}";
+ JSONObject jsonObject = JSON.parseObject(json);
+ Set<String> strings = jsonObject.keySet();
+ for (String key : strings) {
+ if (key.indexOf(bankName) >= 0) {
+ return jsonObject.getString(key);
+ }
+ }
+ return "";
+ }
+
+
+ /**
+ * 支付宝转账
+ *
+ * @param out_biz_no 商家侧唯一订单号，由商家自定义。对于不同转账请求，商家需保证该订单号在自身系统唯一。
+ * @param trans_amount 订单总金额，单位为元，精确到小数点后两位
+ * @param order_title 转账业务的标题，用于在支付宝用户的账单里显示
+ * @param identity 参与方的唯一标识（收款方支付宝账号）
+ * @param name 参与方真实姓名，如果非空，将校验收款支付宝账号姓名一致性。
+ * @param remark 业务备注
+ * @return
+ * @throws Exception
+ */
+ public Map<String, Object> aliTransfer(String out_biz_no, Double trans_amount, String order_title, String identity, String name, String remark) throws Exception {
+ CertAlipayRequest certAlipayRequest = new CertAlipayRequest();
+ certAlipayRequest.setServerUrl("https://openapi.alipay.com/gateway.do"); //gateway:支付宝网关（固定）https://openapi.alipay.com/gateway.do
+ certAlipayRequest.setAppId(aliAppid); //APPID 即创建应用后生成,详情见创建应用并获取 APPID
+ certAlipayRequest.setPrivateKey(appPrivateKey); //开发者应用私钥，由开发者自己生成
+ certAlipayRequest.setFormat("json"); //参数返回格式，只支持 json 格式
+ certAlipayRequest.setCharset("UTF-8"); //请求和签名使用的字符编码格式，支持 GBK和 UTF-8
+ certAlipayRequest.setSignType("RSA2"); //商户生成签名字符串所使用的签名算法类型，目前支持 RSA2 和 RSA，推荐商家使用 RSA2。
+ certAlipayRequest.setCertPath(app_cert_path); //应用公钥证书路径（app_cert_path 文件绝对路径）
+ certAlipayRequest.setAlipayPublicCertPath(alipay_cert_path); //支付宝公钥证书文件路径（alipay_cert_path 文件绝对路径）
+ certAlipayRequest.setRootCertPath(alipay_root_cert_path); //支付宝CA根证书文件路径（alipay_root_cert_path 文件绝对路径）
+ AlipayClient alipayClient = new DefaultAlipayClient(certAlipayRequest);
+ AlipayFundTransUniTransferRequest request = new AlipayFundTransUniTransferRequest();
+ request.setBizContent("{" +
+ "\"out_biz_no\":\"" + out_biz_no + "\"," +
+ "\"trans_amount\":" + trans_amount + "," +
+ "\"product_code\":\"TRANS_ACCOUNT_NO_PWD\"," +
+ "\"biz_scene\":\"DIRECT_TRANSFER\"," +
+ "\"order_title\":\"" + order_title + "\"," +
+ "\"payee_info\":{" +
+ "\"identity\":\"" + identity + "\"," +
+ "\"identity_type\":\"ALIPAY_USER_ID\"," +
+ "\"name\":\"" + name + "\"," +
+ "}," +
+ "\"remark\":\"" + remark + "\"" +
+ "}");
+ AlipayFundTransUniTransferResponse response = alipayClient.certificateExecute(request);
+ Map<String, Object> map = new HashMap<>();
+ if (response.isSuccess()) {
+ String status = response.getStatus();
+ if (status.equals("SUCCESS")) {//成功
+ map.put("code", response.getCode());
+ map.put("order_id", response.getOrderId());//支付宝订单号
+ map.put("pay_fund_order_id", response.getPayFundOrderId());//支付宝流水号
+ } else {
+ map.put("code", response.getCode());
+ map.put("sub_msg", response.getSubMsg());
+ }
+ } else {
+ map.put("code", response.getSubCode());
+ map.put("sub_msg", response.getSubMsg());
+ }
+ return map;
+ }
+
+
+ /**
+ * 获取请求内容
+ *
+ * @param request
+ * @return
+ * @throws IOException
+ */
+ private String getParam(HttpServletRequest request) throws IOException {
+ // 读取参数
+ InputStream inputStream;
+ StringBuilder sb = new StringBuilder();
+ inputStream = request.getInputStream();
+ String s;
+ BufferedReader in = new BufferedReader(new InputStreamReader(inputStream, "UTF-8"));
+ while ((s = in.readLine()) != null) {
+ sb.append(s);
+ }
+ in.close();
+ inputStream.close();
+ return sb.toString();
+ }
+
+
+ /**
+ * 微信下单的签名算法
+ *
+ * @param map
+ * @return
+ */
+ private String weixinSignature(Map<String, Object> map) {
+ try {
+ Set<Map.Entry<String, Object>> entries = map.entrySet();
+ List<Map.Entry<String, Object>> infoIds = new ArrayList<Map.Entry<String, Object>>(entries);
+ // 对所有传入参数按照字段名的 ASCII 码从小到大排序（字典序）
+ Collections.sort(infoIds, new Comparator<Map.Entry<String, Object>>() {
+ public int compare(Map.Entry<String, Object> o1, Map.Entry<String, Object> o2) {
+ return (o1.getKey()).toString().compareTo(o2.getKey());
+ }
+ });
+ // 构造签名键值对的格式
+ StringBuilder sb = new StringBuilder();
+ for (Map.Entry<String, Object> item : infoIds) {
+ if (item.getKey() != null || item.getKey() != "") {
+ String key = item.getKey();
+ Object val = item.getValue();
+ if (!(val == "" || val == null)) {
+ sb.append(key + "=" + val + "&");
+ }
+ }
+ }
+ sb.append("key=" + key);
+ String sign = MD5AndKL.MD5Encode(sb.toString(), "UTF-8").toUpperCase(); //注：MD5签名方式
+ return sign;
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ return null;
+ }
+ private String weixinSignature1(Map<String, Object> map) {
+ try {
+ Set<Map.Entry<String, Object>> entries = map.entrySet();
+ List<Map.Entry<String, Object>> infoIds = new ArrayList<Map.Entry<String, Object>>(entries);
+ // 对所有传入参数按照字段名的 ASCII 码从小到大排序（字典序）
+ Collections.sort(infoIds, new Comparator<Map.Entry<String, Object>>() {
+ public int compare(Map.Entry<String, Object> o1, Map.Entry<String, Object> o2) {
+ return (o1.getKey()).toString().compareTo(o2.getKey());
+ }
+ });
+ // 构造签名键值对的格式
+ StringBuilder sb = new StringBuilder();
+ for (Map.Entry<String, Object> item : infoIds) {
+ if (item.getKey() != null || item.getKey() != "") {
+ String key = item.getKey();
+ Object val = item.getValue();
+ if (!(val == "" || val == null)) {
+ sb.append(key + "=" + val + "&");
+ }
+ }
+ }
+ sb.append("key=" + key);
+ String sign = sha256_HMAC(sb.toString(), key).toUpperCase();
+ return sign;
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ return null;
+ }
+ /**
+ * sha256_HMAC加密
+ * @param message 消息
+ * @param secret 秘钥
+ * @return 加密后字符串
+ */
+ public String sha256_HMAC(String message, String secret) {
+ String hash = "";
+ try {
+ Mac sha256_HMAC = Mac.getInstance("HmacSHA256");
+ SecretKeySpec secret_key = new SecretKeySpec(secret.getBytes(), "HmacSHA256");
+ sha256_HMAC.init(secret_key);
+ byte[] bytes = sha256_HMAC.doFinal(message.getBytes());
+ hash = byteArrayToHexString(bytes);
+ } catch (Exception e) {
+ System.out.println("Error HmacSHA256 ===========" + e.getMessage());
+ }
+ return hash;
+ }
+
+ /**
+ * 微信下单的签名算法
+ *
+ * @param map
+ * @return
+ */
+ private String weixinSignature(Map<String, Object> map, String key_) {
+ try {
+ Set<Map.Entry<String, Object>> entries = map.entrySet();
+ List<Map.Entry<String, Object>> infoIds = new ArrayList<Map.Entry<String, Object>>(entries);
+ // 对所有传入参数按照字段名的 ASCII 码从小到大排序（字典序）
+ Collections.sort(infoIds, new Comparator<Map.Entry<String, Object>>() {
+ public int compare(Map.Entry<String, Object> o1, Map.Entry<String, Object> o2) {
+ return (o1.getKey()).toString().compareTo(o2.getKey());
+ }
+ });
+ // 构造签名键值对的格式
+ StringBuilder sb = new StringBuilder();
+ for (Map.Entry<String, Object> item : infoIds) {
+ if (item.getKey() != null || item.getKey() != "") {
+ String key = item.getKey();
+ Object val = item.getValue();
+ if (!(val == "" || val == null)) {
+ sb.append(key + "=" + val + "&");
+ }
+ }
+ }
+ sb.append("key=" + key_);
+ String sign = MD5AndKL.MD5Encode(sb.toString(), "UTF-8").toUpperCase(); //注：MD5签名方式
+ return sign;
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ return null;
+ }
+
+
+ /**
+ * 微信退款成功后的解密
+ *
+ * @param req_info
+ * @return
+ */
+ private String wxDecrypt(String req_info) throws NoSuchPaddingException, NoSuchAlgorithmException, NoSuchProviderException,
+ InvalidKeyException, BadPaddingException, IllegalBlockSizeException {
+ byte[] decode = Base64.getDecoder().decode(req_info);
+ String sign = MD5AndKL.MD5Encode(key, "UTF-8").toLowerCase();
+ if (Security.getProvider("BC") == null) {
+ Security.addProvider(new BouncyCastleProvider());
+ }
+ Cipher cipher = Cipher.getInstance("AES/ECB/PKCS7Padding", "BC");
+ SecretKeySpec secretKeySpec = new SecretKeySpec(sign.getBytes(), "AES");
+ cipher.init(Cipher.DECRYPT_MODE, secretKeySpec);
+ return new String(cipher.doFinal(decode));
+ }
+
+
+// public static void main(String[] ages){
+// PayMoneyUtil payMoneyUtil = new PayMoneyUtil();
+// ResultUtil ce = payMoneyUtil.alipay("测试", "测试", "", "121456457", "10", "http://123.com");
+// System.err.println(ce);
+// ResultUtil resultUtil = null;
+// try {
+// resultUtil = payMoneyUtil.queryALIOrder("121456457");
+// } catch (Exception e) {
+// e.printStackTrace();
+// }
+// System.err.println(resultUtil);
+// }
+
+
+ /**
+ * xml转map
+ *
+ * @param xml
+ * @param charset
+ * @return
+ * @throws UnsupportedEncodingException
+ * @throws DocumentException
+ */
+ public static Map<String, String> xmlToMap(String xml, String charset) throws UnsupportedEncodingException, DocumentException {
+
+ Map<String, String> respMap = new HashMap<String, String>();
+
+ SAXReader reader = new SAXReader();
+ Document doc = reader.read(new ByteArrayInputStream(xml.getBytes(charset)));
+ Element root = doc.getRootElement();
+ xmlToMap(root, respMap);
+ return respMap;
+ }
+
+ public static Map<String, String> xmlToMap(Element tmpElement, Map<String, String> respMap) {
+ if (tmpElement.isTextOnly()) {
+ respMap.put(tmpElement.getName(), tmpElement.getText());
+ return respMap;
+ }
+
+ @SuppressWarnings("unchecked")
+ Iterator<Element> eItor = tmpElement.elementIterator();
+ while (eItor.hasNext()) {
+ Element element = eItor.next();
+ xmlToMap(element, respMap);
+ }
+ return respMap;
+ }
+}
diff --git a/cloud-server-activity/src/main/java/com/dsh/activity/util/httpClinet/HttpClientUtil.java b/cloud-server-activity/src/main/java/com/dsh/activity/util/httpClinet/HttpClientUtil.java
index dba10c1..6ad2bdf 100644
--- a/cloud-server-activity/src/main/java/com/dsh/activity/util/httpClinet/HttpClientUtil.java
+++ b/cloud-server-activity/src/main/java/com/dsh/activity/util/httpClinet/HttpClientUtil.java
@@ -199,14 +199,14 @@
* @return
* @throws Exception
*/
- public String pushHttpsRequsetXml(String url, String xml, Map<String, String> header, String certPassword, String certPath, String certType) throws Exception {
+ public static String pushHttpsRequsetXml(String url, String xml, Map<String, String> header, String certPassword, String certPath, String certType) throws Exception {
HttpPost httpPost = new HttpPost(url);
for (String key : header.keySet()) {
httpPost.setHeader(key, header.get(key));
}
httpPost.setHeader("Content-Type", "application/xml");
httpPost.setEntity(new StringEntity(xml, "UTF-8"));
- CloseableHttpClient httpCline = this.initCert(certPassword, certPath, certType);
+ CloseableHttpClient httpCline = initCert(certPassword, certPath, certType);
CloseableHttpResponse httpResponse = httpCline.execute(httpPost);
String content = null;
if (httpResponse.getStatusLine().getStatusCode() == 200) {
@@ -214,7 +214,7 @@
} else {
content = "返回状态码：" + httpResponse.getStatusLine() + "。" + EntityUtils.toString(httpResponse.getEntity());
}
- this.close(httpResponse);
+ close(httpResponse);
httpCline.close();
return content;
}
@@ -228,7 +228,7 @@
* @param certType 证书类型
* @throws Exception
*/
- private CloseableHttpClient initCert(String key, String certPath, String certType) throws Exception {
+ private static CloseableHttpClient initCert(String key, String certPath, String certType) throws Exception {
KeyStore keyStore = KeyStore.getInstance(certType);
InputStream inputStream = new FileInputStream(new File(certPath));
try {
diff --git a/cloud-server-activity/src/main/resources/mapper/HuiminCardMapper.xml b/cloud-server-activity/src/main/resources/mapper/HuiminCardMapper.xml
index 7f5681f..d85a4d5 100644
--- a/cloud-server-activity/src/main/resources/mapper/HuiminCardMapper.xml
+++ b/cloud-server-activity/src/main/resources/mapper/HuiminCardMapper.xml
@@ -6,8 +6,18 @@
<select id="getHuiminAgreementAndList" resultType="com.dsh.activity.entity.THuiminCard">
select t1.* from t_huimin_card t1
where t1.storeId = #{storeId}
+ and t1.startTime <= now()
+ and t1.endTime >= now()
+ and t1.status = 1
order by t1.sort desc
limit #{pageNo}, #{pageSize}
</select>
+ <select id="getMyHuiminCardList" resultType="com.dsh.activity.model.response.MyHuiminCardVO">
+ select t1.* from t_pay_huimin t1
+ where t1.status = 2
+ and t1.appUserId = #{appUserId}
+ limit #{pageNo}, #{pageSize}
+
+ </select>
</mapper>
diff --git a/cloud-server-activity/src/main/resources/mapper/HuiminRecordMapper.xml b/cloud-server-activity/src/main/resources/mapper/HuiminRecordMapper.xml
new file mode 100644
index 0000000..29c32b1
--- /dev/null
+++ b/cloud-server-activity/src/main/resources/mapper/HuiminRecordMapper.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.dsh.activity.mapper.HuiminRecordMapper">
+
+
+</mapper>
--
Gitblit v1.7.1