会员支付相关

无关风月

15 小时以前 f172e16d519c0abd6c888dce5d246844a93a7790

会员支付相关

 cloud-server-account/src/main/java/com/dsh/account/controller/AppUserController.java

@@ -490,6 +490,7 @@
        }
        return ResultUtil.success();
    }

//
//    /**
//     * 购买年度会员支付微信回调V3版本回调

 cloud-server-activity/src/main/java/com/dsh/activity/controller/HuiminRecordController.java

@@ -40,4 +40,22 @@
            huiminRecordService.save(huiminRecord);
        }
    }
    /**
     * 硬件开门后回调 存储会员使用明细
     */
    @PostMapping("/recordVipDetail")
    public void recordVipDetail(Integer id,Integer uid) {
        System.err.println("硬件开门后回调 存储会员卡门票权益使用记录");
        System.err.println("id:"+id);
        System.err.println("uid:"+uid);
        if (id!=null){
            THuiminRecord huiminRecord = new THuiminRecord();
            TPayHuimin payHuimin = payHuiminService.getById(id);
            huiminRecord.setPayId(id);
            huiminRecord.setHuiminCardId(payHuimin.getCardId());
            huiminRecord.setInsertTime(new Date());
            huiminRecord.setAppUserId(uid);
            huiminRecordService.save(huiminRecord);
        }
    }
}

 cloud-server-activity/src/main/java/com/dsh/activity/controller/PointMercharsController.java

@@ -1038,7 +1038,6 @@


                }
                detailsResponse.setIsVipCode(0);
                responses.add(detailsResponse);
            }
            detailsVo.setDetailsResponses(responses);
@@ -1054,11 +1053,10 @@
                detailsResponse.setGoodName(vipDetail.getTicketName());
                detailsResponse.setStartTime(simpleDateFormat.format(vipDetail.getStartTime()));
                detailsResponse.setEndTime(simpleDateFormat.format(vipDetail.getEndTime()));
                detailsResponse.setIsVipCode(1);
                detailsResponse.setUseStatus(vipDetail.getStatus());
                detailsResponse.setGoodType(3);
                // 表明是会员赠送的门票
                detailsResponse.setExchangeType(3);
                detailsResponse.setExchangeType(4);
                // 全国通用
            detailsResponse.setRid(Collections.singletonList(0));
            detailsResponse.setSid(Collections.singletonList(0));
@@ -1085,13 +1083,12 @@
                    detailsResponse.setCash(c.getCash());
                }
                if (userCoupon.getIsVipGrant()!=null && userCoupon.getIsVipGrant()==1){
                    detailsResponse.setExchangeType(3);
                    detailsResponse.setExchangeType(4);
                }
                detailsResponse.setStartTime(simpleDateFormat.format(c.getStartTime()));
                detailsResponse.setEndTime(simpleDateFormat.format(c.getEndTime()));
                detailsResponse.setUseStatus(userCoupon.getStatus() == 1 ? 2 : 1);
                detailsResponse.setGoodType(4);
                detailsResponse.setIsVipCode(0);
                responses.add(detailsResponse);
            }
            Comparator<ExchangeDetailsResponse> comparator = Comparator.comparing(ExchangeDetailsResponse::getStartTime).reversed();

 cloud-server-activity/src/main/java/com/dsh/activity/feignclient/model/ExchangeDetailsResponse.java

@@ -22,7 +22,7 @@
    @ApiModelProperty(value = "现金")
    private BigDecimal cash;

    @ApiModelProperty(value = "兑换方式(1=积分，2=积分+现金 3=会员赠送)")
    @ApiModelProperty(value = "兑换方式(1=积分，2=积分+现金 3=现金 4=会员赠送 当该字段为4时 展示的二维码内容增加一个id:当前数据id)")
    private Integer exchangeType;

    @ApiModelProperty(value = "有效期开始时间")
@@ -45,9 +45,7 @@

    private List<Integer> sid;

    @ApiModelProperty(value = "当exchangeType=3会员赠送时存储1 门票二维码格式内容新增该字段 用于标明该门票为会员赠送" +
            "，使用时存储门票记录")
    private Integer isVipCode;


    @ApiModelProperty(value = "1日卡 2月卡 3季卡 4年卡")
    private Integer cardType;