From 3f45e8fdfa31d7b764d60a7c0cb5dd11944ed418 Mon Sep 17 00:00:00 2001
From: 刘帅 <rr.iii@qq.com>
Date: 星期一, 21 九月 2026 23:38:59 +0800
Subject: [PATCH] bug:统计数据修正

---
 cloud-server-activity/src/main/java/com/dsh/activity/controller/HuiminController.java |  250 +++++++++++++++++++++++++++++++++++++++++++------
 1 files changed, 217 insertions(+), 33 deletions(-)

diff --git a/cloud-server-activity/src/main/java/com/dsh/activity/controller/HuiminController.java b/cloud-server-activity/src/main/java/com/dsh/activity/controller/HuiminController.java
index fb252be..922aa87 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
@@ -7,6 +7,7 @@
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.dsh.activity.entity.*;
+import com.dsh.activity.enums.HuiminCardPaymentTypeEnum;
 import com.dsh.activity.feignclient.account.AppUserClient;
 import com.dsh.activity.feignclient.account.CityClient;
 import com.dsh.activity.feignclient.account.StoreStaffClient;
@@ -80,13 +81,16 @@
     private HuiminRecordService huiminRecordService;
     @Resource
     private StudentClient studentClient;
+    @Resource
+    private UserCouponService userCouponService;
+    @Resource
+    private CouponStoreService couponStoreService;
 
 
     @Autowired
     private TokenUtil tokenUtil;
     private String smid = "2088330203191220";//平台支付宝商户号
-    // todo 待申请
-    private String smidVx = "2088330203191220";//平台微信商户号
+
 
 
     /**
@@ -99,9 +103,10 @@
             @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(value = "用户优惠券领取记录id;不使用时不传", name = "couponId", dataType = "long", required = false),
             @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) {
+    public ResultUtil<?> payHuiminCard(Integer id, Integer payType, String studentIds, Long couponId) {
         try {
             Integer uid = tokenUtil.getUserIdFormRedis();
             if (null == uid) {
@@ -128,7 +133,48 @@
             TPayHuimin tPayHuimin = new TPayHuimin();
             String[] split = studentIds.split(",");
 
-            tPayHuimin.setSalesMoney(huiminCard.getSalesMoney().multiply(new BigDecimal(split.length)).setScale(2));
+            BigDecimal salesMoney = huiminCard.getSalesMoney().multiply(new BigDecimal(split.length)).setScale(2);
+            UserCoupon userCoupon = null;
+            if (couponId != null && couponId != 0) {
+                if (payType != 1 && payType != 2) {
+                    return ResultUtil.error("优惠券仅支持微信或支付宝支付");
+                }
+                userCoupon = userCouponService.getById(couponId);
+                if (userCoupon == null || !uid.equals(userCoupon.getUserId()) || !Integer.valueOf(1).equals(userCoupon.getStatus())) {
+                    return ResultUtil.error("优惠券不可用");
+                }
+                Coupon coupon = couponService.getById(userCoupon.getCouponId());
+                if (coupon == null || coupon.getEndTime() == null || !coupon.getEndTime().after(new Date())) {
+                    return ResultUtil.error("优惠券已过期");
+                }
+                if (Integer.valueOf(3).equals(coupon.getUseScope())) {
+                    Set<Integer> cardStoreIds = Arrays.stream((huiminCard.getStoreIds() == null ? "" : huiminCard.getStoreIds()).split(","))
+                            .filter(value -> !value.trim().isEmpty()).map(Integer::valueOf).collect(Collectors.toSet());
+                    boolean available = couponStoreService.lambdaQuery().eq(CouponStore::getCouponId, coupon.getId()).list()
+                            .stream().map(CouponStore::getStoreId).anyMatch(cardStoreIds::contains);
+                    if (!available) {
+                        return ResultUtil.error("该优惠券不适用于此惠民卡");
+                    }
+                }
+                if (coupon.getType() == 1) {
+                    JSONObject rule = JSON.parseObject(coupon.getContent());
+                    BigDecimal condition = rule.getBigDecimal("conditionalAmount");
+                    BigDecimal deduction = rule.getBigDecimal("deductionAmount");
+                    if (condition == null || deduction == null || salesMoney.compareTo(condition) < 0) {
+                        return ResultUtil.error("该优惠券无法使用");
+                    }
+                    salesMoney = salesMoney.subtract(deduction).max(BigDecimal.ZERO).setScale(2);
+                } else if (coupon.getType() == 2) {
+                    BigDecimal deduction = JSON.parseObject(coupon.getContent()).getBigDecimal("conditionalAmount");
+                    if (deduction == null) {
+                        return ResultUtil.error("该优惠券无法使用");
+                    }
+                    salesMoney = salesMoney.subtract(deduction).max(BigDecimal.ZERO).setScale(2);
+                } else {
+                    return ResultUtil.error("该优惠券不支持购买惠民卡");
+                }
+            }
+            tPayHuimin.setSalesMoney(salesMoney);
             tPayHuimin.setAppUserId(uid);
             tPayHuimin.setStudentId(studentIds);
             switch (huiminCard.getHuiMinType()) {
@@ -155,22 +201,45 @@
             tPayHuimin.setPaymentType(payType);
             tPayHuimin.setRefundStatus(1);
             tPayHuimin.setCardId(huiminCard.getId());
+            tPayHuimin.setUserCouponId(couponId);
             SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMddHHmmssSSS");
             tPayHuimin.setCode(sdf.format(new Date()) + UUIDUtil.getNumberRandom(5));
             System.err.println("支付数据" + tPayHuimin);
             payHuiminService.save(tPayHuimin);
+            if (userCoupon != null) {
+                // t_user_coupon 以 userId 分片;updateById 会把 userId 放入 SET,
+                // ShardingSphere 会拒绝更新分片键。只更新状态,并在 WHERE 中带上 userId。
+                boolean couponUpdated = userCouponService.lambdaUpdate()
+                        .set(UserCoupon::getStatus, 2)
+                        .eq(UserCoupon::getId, userCoupon.getId())
+                        .eq(UserCoupon::getUserId, uid)
+                        .eq(UserCoupon::getStatus, 1)
+                        .update();
+                if (!couponUpdated) {
+                    return ResultUtil.error("优惠券已被使用");
+                }
+            }
             BigDecimal bigDecimal = new BigDecimal(studentIds.split(",").length);
+            if (tPayHuimin.getSalesMoney().compareTo(BigDecimal.ZERO)==0){
+                // 零元购
+                tPayHuimin.setStatus(2);
+                tPayHuimin.setPaymentTime(new Date());
+                payHuiminService.updateById(tPayHuimin);
+                JSONObject data = new JSONObject();
+                data.put("paySuccess", true);
+                return ResultUtil.success(data);
+            }
             switch (payType) {
                 case 1:
                     // todo 惠民卡收入属于平台商户 定死
-                    return payMoneyUtil.weixinpay("购买玩湃惠民卡", "", tPayHuimin.getCode(), tPayHuimin.getSalesMoney().toString(),
-                            "/base/huimin/callBack/weixinPayHuiminCallback", "APP", "");
+                    return appendPaySuccess(payMoneyUtil.weixinpay("购买玩湃惠民卡", "", tPayHuimin.getCode(), tPayHuimin.getSalesMoney().toString(),
+                            "/base/huimin/callBack/weixinPayHuiminCallback", "APP", ""));
 //                return payMoneyUtil.weixinpayV3("1720719391","购买玩湃惠民卡",tPayHuimin.getCode(),
 //                        "/base/huimin/callBack/weixinPayHuiminCallback1",tPayHuimin.getSalesMoney().toString());
                 case 2:
                     String string = tPayHuimin.getSalesMoney().toString();
-                    return payMoneyUtil.alipay("2088670241691219", "购买玩湃惠民卡", "购买玩湃惠民卡", "", tPayHuimin.getCode(), string,
-                            "/base/huimin/callBack/aliPayHuiminCallback");
+                    return appendPaySuccess(payMoneyUtil.alipay(smid, "购买玩湃惠民卡", "购买玩湃惠民卡", "", tPayHuimin.getCode(), string,
+                            "/base/huimin/callBack/aliPayHuiminCallback"));
             }
 
         } catch (Exception e) {
@@ -178,6 +247,19 @@
             return ResultUtil.success();
         }
         return ResultUtil.success();
+    }
+
+    /**
+     * 支付参数生成成功不代表实际支付成功,前端仍需拉起第三方支付。
+     */
+    private ResultUtil<?> appendPaySuccess(ResultUtil<?> paymentResult) {
+        JSONObject data = paymentResult.getData() == null ? new JSONObject()
+                : JSON.parseObject(JSON.toJSONString(paymentResult.getData()));
+        if (data == null) {
+            data = new JSONObject();
+        }
+        data.put("paySuccess", false);
+        return ResultUtil.getResult(paymentResult.getCode(), paymentResult.getMsg(), data);
     }
 
 
@@ -275,6 +357,7 @@
             if (null == uid) {
                 return ResultUtil.tokenErr();
             }
+            SimpleDateFormat simpleDateFormat1 = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
             HuiminAgreementVO huiminAgreementVO = new HuiminAgreementVO();
             List<THuiminCard> cardList = huiminCardService.getHuiminAgreementAndList(pageNo, pageSize, storeId);
             List<THuiminCard> list = huiminCardService.list();
@@ -382,17 +465,39 @@
                                 Date start = DateUtil.parse(s1, "yyyy-MM-dd HH:mm:ss");
                                 Date end = DateUtil.parse(e1, "yyyy-MM-dd HH:mm:ss");
                                 if (new Date().after(start) && new Date().before(end)) {
-//                                    jsonObject2.put("start_time", start.getTime() / 1000);
+//                                    
                                     Date date1 = new Date();
-                                    jsonObject2.put("start_time", date1.getTime() / 1000);
+                                    jsonObject2.put("start_time", date1.getTime()/ 1000);
                                     date1.setTime(date1.getTime() + 30 * 1000);
                                     if (start.before(end)) {
-                                        jsonObject2.put("end_time", date1.getTime() / 1000);
+                                        jsonObject2.put("end_time", date1.getTime()/ 1000);
                                         jsonArray.add(jsonObject2);
                                     }
                                 }
                             }
                         }
+                        if (jsonArray.isEmpty()){
+                            // 返回过期的二维码 保证开门失败即可
+                            JSONObject jsonObject3 = new JSONObject();
+                            Date date1 = new Date();
+                            date1.setTime(date1.getTime() - 300 * 1000);
+                            jsonObject3.put("end_time", date1.getTime()/ 1000);
+                            jsonObject3.put("start_time", date1.getTime()/ 1000);
+
+                            jsonArray.add(jsonObject3);
+                        }
+                    }
+                }
+                else{
+                    if (jsonArray.isEmpty()){
+                        // 返回过期的二维码 保证开门失败即可
+                        JSONObject jsonObject3 = new JSONObject();
+                        Date date1 = new Date();
+                        date1.setTime(date1.getTime() - 300 * 1000);
+                        jsonObject3.put("end_time", date1.getTime()/ 1000);
+                        jsonObject3.put("start_time", date1.getTime()/ 1000);
+
+                        jsonArray.add(jsonObject3);
                     }
                 }
                 if (!jsonArray.isEmpty()) {
@@ -400,9 +505,17 @@
                     TStudent tStudent = tStudents.stream().filter(e -> e.getId().equals(Integer.valueOf(payHuimin.getStudentId().split(",")[0]))).findFirst().orElse(null);
                     if (tStudent!=null){
                         huiminCardVO1.setStudentName(tStudent.getName());
+//                        String temp = "{\"id\":"+payHuimin.getId()  + ","+"\"sid\":" + sid.toJSONString() + "," + "\"rid\":" + rid + "," + "\"uid\":\"" + tStudent.getId() + "\"," + "\"time\":" + jsonArray.toJSONString() + ",\"type\":" + 2 + ",\"codeType\":"+4+"\"dataId\":"+payHuimin.getId()+"}";
+                        String temp = "{\"id\":"+payHuimin.getId()  + ","+"\"sid\":" + sid.toJSONString() + "," + "\"rid\":" + rid + "," + "\"uid\":\"" + tStudent.getId() + "\"," + "\"time\":" + jsonArray.toJSONString() + ",\"type\":" + 2 +"}";
+                        huiminCardVO1.setQrCode(temp);
+
+                    }else{
+                        huiminCardVO1.setStudentName("");
+
+//                        String temp = "{\"id\":"+payHuimin.getId()  + ","+"\"sid\":" + sid.toJSONString() + "," + "\"rid\":" + rid + "," + "\"uid\":\"" + 0 + "\"," + "\"time\":" + jsonArray.toJSONString() + ",\"type\":" + 2 + ",\"codeType\":"+4+"\"dataId\":"+payHuimin.getId()+"}";
+                        String temp = "{\"id\":"+payHuimin.getId()  + ","+"\"sid\":" + sid.toJSONString() + "," + "\"rid\":" + rid + "," + "\"uid\":\"" + 0 + "\"," + "\"time\":" + jsonArray.toJSONString() + ",\"type\":" + 2 +"}";
+                        huiminCardVO1.setQrCode(temp);
                     }
-                    String temp = "{\"id\":"+payHuimin.getId()  + ","+"\"sid\":" + sid.toJSONString() + "," + "\"rid\":" + rid + "," + "\"uid\":\"" + tStudent.getId() + "\"," + "\"time\":" + jsonArray.toJSONString() + ",\"type\":" + 2 + "}";
-                    huiminCardVO1.setQrCode(temp);
                     huiminCardVOS.add(huiminCardVO1);
                     integers.add(payHuimin.getCardId());
 
@@ -471,6 +584,7 @@
             if (null == uid) {
                 return ResultUtil.tokenErr();
             }
+            SimpleDateFormat simpleDateFormat1 = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
             List<TPayHuimin> payHuimins = payHuiminService.list(new LambdaQueryWrapper<TPayHuimin>()
                     .eq(TPayHuimin::getAppUserId, uid)
                     .eq(TPayHuimin::getCardId, id)
@@ -526,17 +640,38 @@
                                     Date start = DateUtil.parse(s1, "yyyy-MM-dd HH:mm:ss");
                                     Date end = DateUtil.parse(e1, "yyyy-MM-dd HH:mm:ss");
                                     if (new Date().after(start) && new Date().before(end)) {
-//                                    jsonObject2.put("start_time", start.getTime() / 1000);
+//
                                         Date date1 = new Date();
-                                        jsonObject2.put("start_time", date1.getTime() / 1000);
+                                        jsonObject2.put("start_time", date1.getTime()/ 1000);
                                         date1.setTime(date1.getTime() + 30 * 1000);
                                         if (start.before(end)) {
-                                            jsonObject2.put("end_time", date1.getTime() / 1000);
+                                            jsonObject2.put("end_time", date1.getTime()/ 1000);
                                             jsonArray.add(jsonObject2);
                                         }
                                     }
                                 }
                             }
+                            if (jsonArray.isEmpty()){
+                                // 返回过期的二维码 保证开门失败即可
+                                JSONObject jsonObject3 = new JSONObject();
+                                Date date1 = new Date();
+                                date1.setTime(date1.getTime() - 300 * 1000);
+                                jsonObject3.put("end_time", date1.getTime()/ 1000);
+                                jsonObject3.put("start_time", date1.getTime()/ 1000);
+
+                                jsonArray.add(jsonObject3);
+                            }
+                        }
+                    }else{
+                        if (jsonArray.isEmpty()){
+                            // 返回过期的二维码 保证开门失败即可
+                            JSONObject jsonObject3 = new JSONObject();
+                            Date date1 = new Date();
+                            date1.setTime(date1.getTime() - 300 * 1000);
+                            jsonObject3.put("end_time", date1.getTime()/ 1000);
+                            jsonObject3.put("start_time", date1.getTime()/ 1000);
+
+                            jsonArray.add(jsonObject3);
                         }
                     }
                     if (!jsonArray.isEmpty()) {
@@ -573,6 +708,7 @@
             if (null == uid) {
                 return ResultUtil.tokenErr();
             }
+            SimpleDateFormat simpleDateFormat1 = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
             List<TStudent> tStudents = studentClient.queryStudentList(uid);
 
             List<TPayHuimin> payHuimins = payHuiminService.list(new LambdaQueryWrapper<TPayHuimin>()
@@ -634,28 +770,55 @@
                                 // 转化为Date类型
                                 Date start = DateUtil.parse(s1, "yyyy-MM-dd HH:mm:ss");
                                 Date end = DateUtil.parse(e1, "yyyy-MM-dd HH:mm:ss");
-                                jsonObject2.put("start_time", start.getTime() / 1000);
+                                
                                 start.setTime(start.getTime() + 30 * 1000);
                                 if (new Date().after(start) && new Date().before(end)) {
-//                                    jsonObject2.put("start_time", start.getTime() / 1000);
+//                                    
                                     Date date1 = new Date();
-                                    jsonObject2.put("start_time", date1.getTime() / 1000);
+                                    jsonObject2.put("start_time", date1.getTime()/ 1000);
                                     date1.setTime(date1.getTime() + 30 * 1000);
                                     if (start.before(end)) {
-                                        jsonObject2.put("end_time", date1.getTime() / 1000);
+                                        jsonObject2.put("end_time", date1.getTime()/ 1000);
                                         jsonArray.add(jsonObject2);
                                     }
                                 }
                             }
                         }
+                        if (jsonArray.isEmpty()){
+                            // 返回过期的二维码 保证开门失败即可
+                            JSONObject jsonObject3 = new JSONObject();
+                            Date date1 = new Date();
+                            date1.setTime(date1.getTime() - 300 * 1000);
+                            jsonObject3.put("end_time", date1.getTime()/ 1000);
+                            jsonObject3.put("start_time", date1.getTime()/ 1000);
+
+                            jsonArray.add(jsonObject3);
+                        }
+                    }
+                }else{
+                    if (jsonArray.isEmpty()){
+                        // 返回过期的二维码 保证开门失败即可
+                        JSONObject jsonObject3 = new JSONObject();
+                        Date date1 = new Date();
+                        date1.setTime(date1.getTime() - 300 * 1000);
+                        jsonObject3.put("end_time", date1.getTime()/ 1000);
+                        jsonObject3.put("start_time", date1.getTime()/ 1000);
+
+                        jsonArray.add(jsonObject3);
                     }
                 }
                 TStudent tStudent = tStudents.stream().filter(e -> e.getId().equals(studentId)).findFirst().orElse(null);
                 if (tStudent!=null){
                     huiminCardStudentVO.setStudentName(tStudent.getName());
+//                    String temp = "{\"id\":"+tPayHuimin.getId()  + ","+"\"sid\":" + sid.toJSONString() + "," + "\"rid\":" + rid + "," + "\"uid\":\"" + tStudent.getId() + "\"," + "\"time\":" + jsonArray.toJSONString() + ",\"type\":" + 2 + ",\"codeType\":"+4+"\"dataId\":"+tPayHuimin.getId()+"}";
+                    String temp = "{\"id\":"+tPayHuimin.getId()  + ","+"\"sid\":" + sid.toJSONString() + "," + "\"rid\":" + rid + "," + "\"uid\":\"" + tStudent.getId() + "\"," + "\"time\":" + jsonArray.toJSONString() + ",\"type\":" + 2 +"}";
+                    huiminCardStudentVO.setQrCode(temp);
+                }else{
+                    huiminCardStudentVO.setStudentName("");
+//                    String temp = "{\"id\":"+tPayHuimin.getId()  + ","+"\"sid\":" + sid.toJSONString() + "," + "\"rid\":" + rid + "," + "\"uid\":\"" + 0 + "\"," + "\"time\":" + jsonArray.toJSONString() + ",\"type\":" + 2 + ",\"codeType\":"+4+"\"dataId\":"+tPayHuimin.getId()+"}";
+                    String temp = "{\"id\":"+tPayHuimin.getId()  + ","+"\"sid\":" + sid.toJSONString() + "," + "\"rid\":" + rid + "," + "\"uid\":\"" + 0 + "\"," + "\"time\":" + jsonArray.toJSONString() + ",\"type\":" + 2 +"}";
+                    huiminCardStudentVO.setQrCode(temp);
                 }
-                String temp = "{\"id\":"+tPayHuimin.getId()  + ","+"\"sid\":" + sid.toJSONString() + "," + "\"rid\":" + rid + "," + "\"uid\":\"" + tStudent.getId() + "\"," + "\"time\":" + jsonArray.toJSONString() + ",\"type\":" + 2 + "}";
-                huiminCardStudentVO.setQrCode(temp);
 
             }
 
@@ -747,14 +910,11 @@
                 return ResultUtil.tokenErr();
             }
             TPayHuimin tPayHuimin = payHuiminService.getById(id);
-            if (tPayHuimin.getPaymentType()==3){
-                // 后台录入直接退款
-                tPayHuimin.setStatus(3);
-                payHuiminService.updateById(tPayHuimin);
-                return ResultUtil.success();
-            }
             if (tPayHuimin == null) {
                 return ResultUtil.error("订单不存在");
+            }
+            if (HuiminCardPaymentTypeEnum.isGift(tPayHuimin.getPaymentType())){
+                return ResultUtil.error("赠送惠民卡不允许退款");
             }
             if (tPayHuimin.getStatus() == 3 && tPayHuimin.getRefundStatus() != 1) {
                 return ResultUtil.error("不可重复退款");
@@ -826,6 +986,7 @@
             if (tPayHuimin == null) {
                 return ResultUtil.error("玩湃惠民卡不存在");
             }
+            SimpleDateFormat simpleDateFormat1 = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
             THuiminCard byId = huiminCardService.getById(tPayHuimin.getCardId());
             MyHuiminCardDetailVO myHuiminCardDetailVO = new MyHuiminCardDetailVO();
             List<TStudent> studentByIds1 = studentClient.getStudentByIds(tPayHuimin.getStudentId());
@@ -876,24 +1037,46 @@
                             // 转化为Date类型
                             Date start = DateUtil.parse(s1, "yyyy-MM-dd HH:mm:ss");
                             Date end = DateUtil.parse(e1, "yyyy-MM-dd HH:mm:ss");
-                            jsonObject2.put("start_time", start.getTime() / 1000);
+                            
                             start.setTime(start.getTime() + 30 * 1000);
                             if (new Date().after(start) && new Date().before(end)) {
-//                                    jsonObject2.put("start_time", start.getTime() / 1000);
+//                                    
                                 Date date1 = new Date();
-                                jsonObject2.put("start_time", date1.getTime() / 1000);
+                                jsonObject2.put("start_time", date1.getTime()/ 1000);
                                 date1.setTime(date1.getTime() + 30 * 1000);
                                 if (start.before(end)) {
-                                    jsonObject2.put("end_time", date1.getTime() / 1000);
+                                    jsonObject2.put("end_time", date1.getTime()/ 1000);
                                     jsonArray.add(jsonObject2);
                                 }
                             }
                         }
                     }
+                    if (jsonArray.isEmpty()){
+                        // 返回过期的二维码 保证开门失败即可
+                        JSONObject jsonObject3 = new JSONObject();
+                        Date date1 = new Date();
+                        date1.setTime(date1.getTime() - 300 * 1000);
+                        jsonObject3.put("end_time", date1.getTime()/ 1000);
+                        jsonObject3.put("start_time", date1.getTime()/ 1000);
+
+                        jsonArray.add(jsonObject3);
+                    }
+                }
+            }else{
+                if (jsonArray.isEmpty()){
+                    // 返回过期的二维码 保证开门失败即可
+                    JSONObject jsonObject3 = new JSONObject();
+                    Date date1 = new Date();
+                    date1.setTime(date1.getTime() - 300 * 1000);
+                    jsonObject3.put("end_time", date1.getTime()/ 1000);
+                    jsonObject3.put("start_time", date1.getTime()/ 1000);
+
+                    jsonArray.add(jsonObject3);
                 }
             }
 
-            String temp = "{\"id\":"+tPayHuimin.getId()  + ","+"\"sid\":" + sid.toJSONString() + "," + "\"rid\":" + rid + "," + "\"uid\":\"" + tPayHuimin.getStudentId().split(",")[0] + "\"," + "\"time\":" + jsonArray.toJSONString() + ",\"type\":" + 2 + "}";
+//            String temp = "{\"id\":"+tPayHuimin.getId()  + ","+"\"sid\":" + sid.toJSONString() + "," + "\"rid\":" + rid + "," + "\"uid\":\"" + tPayHuimin.getStudentId().split(",")[0] + "\"," + "\"time\":" + jsonArray.toJSONString() + ",\"type\":" + 2 + ",\"codeType\":"+4+"\"dataId\":"+tPayHuimin.getId()+"}";
+            String temp = "{\"id\":"+tPayHuimin.getId()  + ","+"\"sid\":" + sid.toJSONString() + "," + "\"rid\":" + rid + "," + "\"uid\":\"" + tPayHuimin.getStudentId().split(",")[0] + "\"," + "\"time\":" + jsonArray.toJSONString() + ",\"type\":" + 2 +"}";
             myHuiminCardDetailVO.setQrCode(temp);
             myHuiminCardDetailVO.setCardId(tPayHuimin.getCardId());
             myHuiminCardDetailVO.setHuiminCard(byId);
@@ -909,6 +1092,7 @@
         }
     }
 
+
     /**
      * 获取添加人员、选择人员说明文案
      */

--
Gitblit v1.7.1