server/services/src/main/java/com/doumee/core/constants/Constants.java
@@ -45,7 +45,9 @@ int fail = 3; int over = 4; } public static String getUUID(){ return UUID.randomUUID().toString().replace("-",""); } public interface RedisKeys { public static final String submission_period_key = "sp_"; } server/services/src/main/java/com/doumee/dao/business/model/ActionLog.java
@@ -26,7 +26,7 @@ @ApiModelProperty(value = "创建时间") @ExcelColumn(name="创建时间") @JsonFormat(pattern = "yyyy-MM-dd") //@JsonFormat(pattern = "yyyy-MM-dd") private Date createDate; @ApiModelProperty(value = "创建人") @@ -35,7 +35,7 @@ @ApiModelProperty(value = "编辑时间") @ExcelColumn(name="编辑时间") @JsonFormat(pattern = "yyyy-MM-dd") //@JsonFormat(pattern = "yyyy-MM-dd") private Date editDate; @ApiModelProperty(value = "编辑人") server/services/src/main/java/com/doumee/dao/business/model/Ad.java
@@ -26,7 +26,7 @@ @ApiModelProperty(value = "创建时间") @ExcelColumn(name="创建时间") @JsonFormat(pattern = "yyyy-MM-dd") //@JsonFormat(pattern = "yyyy-MM-dd") private Date createDate; @ApiModelProperty(value = "创建人") @@ -35,7 +35,7 @@ @ApiModelProperty(value = "编辑时间") @ExcelColumn(name="编辑时间") @JsonFormat(pattern = "yyyy-MM-dd") //@JsonFormat(pattern = "yyyy-MM-dd") private Date editDate; @ApiModelProperty(value = "编辑人") server/services/src/main/java/com/doumee/dao/business/model/AliBillDetail.java
@@ -31,7 +31,7 @@ @ApiModelProperty(value = "交易时间") @ExcelColumn(name="交易时间") @JsonFormat(pattern = "yyyy-MM-dd") //@JsonFormat(pattern = "yyyy-MM-dd") private Date billDate; @ApiModelProperty(value = "商户号") server/services/src/main/java/com/doumee/dao/business/model/BaseParam.java
@@ -26,7 +26,7 @@ @ApiModelProperty(value = "创建时间") @ExcelColumn(name="创建时间") @JsonFormat(pattern = "yyyy-MM-dd") //@JsonFormat(pattern = "yyyy-MM-dd") private Date createDate; @ApiModelProperty(value = "创建人") @@ -35,7 +35,7 @@ @ApiModelProperty(value = "编辑时间") @ExcelColumn(name="编辑时间") @JsonFormat(pattern = "yyyy-MM-dd") //@JsonFormat(pattern = "yyyy-MM-dd") private Date editDate; @ApiModelProperty(value = "编辑人") server/services/src/main/java/com/doumee/dao/business/model/BikeRepair.java
@@ -27,7 +27,7 @@ @ApiModelProperty(value = "创建时间") @ExcelColumn(name="创建时间") @JsonFormat(pattern = "yyyy-MM-dd") //@JsonFormat(pattern = "yyyy-MM-dd") private Date createDate; @ApiModelProperty(value = "创建人") @@ -36,7 +36,7 @@ @ApiModelProperty(value = "编辑时间") @ExcelColumn(name="编辑时间") @JsonFormat(pattern = "yyyy-MM-dd") //@JsonFormat(pattern = "yyyy-MM-dd") private Date editDate; @ApiModelProperty(value = "编辑人") @@ -93,7 +93,7 @@ @ApiModelProperty(value = "处理时间") @ExcelColumn(name="处理时间") @JsonFormat(pattern = "yyyy-MM-dd") //@JsonFormat(pattern = "yyyy-MM-dd") private Date dealDate; @ApiModelProperty(value = "处理备注") server/services/src/main/java/com/doumee/dao/business/model/Bikes.java
@@ -26,7 +26,7 @@ @ApiModelProperty(value = "创建时间") @ExcelColumn(name="创建时间") @JsonFormat(pattern = "yyyy-MM-dd") //@JsonFormat(pattern = "yyyy-MM-dd") private Date createDate; @ApiModelProperty(value = "创建人") @@ -35,7 +35,7 @@ @ApiModelProperty(value = "编辑时间") @ExcelColumn(name="编辑时间") @JsonFormat(pattern = "yyyy-MM-dd") //@JsonFormat(pattern = "yyyy-MM-dd") private Date editDate; @ApiModelProperty(value = "编辑人") @@ -76,12 +76,12 @@ @ApiModelProperty(value = "最近租借时间") @ExcelColumn(name="最近租借时间") @JsonFormat(pattern = "yyyy-MM-dd") //@JsonFormat(pattern = "yyyy-MM-dd") private Date lastRentData; @ApiModelProperty(value = "出售时间") @ExcelColumn(name="出售时间") @JsonFormat(pattern = "yyyy-MM-dd") //@JsonFormat(pattern = "yyyy-MM-dd") private Date soldoutDate; } server/services/src/main/java/com/doumee/dao/business/model/Goodsorder.java
@@ -28,7 +28,7 @@ @ApiModelProperty(value = "创建时间") @ExcelColumn(name="创建时间") @JsonFormat(pattern = "yyyy-MM-dd") //@JsonFormat(pattern = "yyyy-MM-dd") private Date createDate; @ApiModelProperty(value = "创建人") @@ -37,7 +37,7 @@ @ApiModelProperty(value = "编辑时间") @ExcelColumn(name="编辑时间") @JsonFormat(pattern = "yyyy-MM-dd") //@JsonFormat(pattern = "yyyy-MM-dd") private Date editDate; @ApiModelProperty(value = "编辑人") server/services/src/main/java/com/doumee/dao/business/model/Holidays.java
@@ -26,7 +26,7 @@ @ApiModelProperty(value = "创建时间") @ExcelColumn(name="创建时间") @JsonFormat(pattern = "yyyy-MM-dd") //@JsonFormat(pattern = "yyyy-MM-dd") private Date createDate; @ApiModelProperty(value = "创建人") @@ -35,7 +35,7 @@ @ApiModelProperty(value = "编辑时间") @ExcelColumn(name="编辑时间") @JsonFormat(pattern = "yyyy-MM-dd") //@JsonFormat(pattern = "yyyy-MM-dd") private Date editDate; @ApiModelProperty(value = "编辑人") @@ -52,7 +52,7 @@ @ApiModelProperty(value = "日期") @ExcelColumn(name="日期") @JsonFormat(pattern = "yyyy-MM-dd") //@JsonFormat(pattern = "yyyy-MM-dd") private Date holiday; } server/services/src/main/java/com/doumee/dao/business/model/Locks.java
@@ -26,7 +26,7 @@ @ApiModelProperty(value = "创建时间") @ExcelColumn(name="创建时间") @JsonFormat(pattern = "yyyy-MM-dd") //@JsonFormat(pattern = "yyyy-MM-dd") private Date createDate; @ApiModelProperty(value = "创建人") @@ -35,7 +35,7 @@ @ApiModelProperty(value = "编辑时间") @ExcelColumn(name="编辑时间") @JsonFormat(pattern = "yyyy-MM-dd") //@JsonFormat(pattern = "yyyy-MM-dd") private Date editDate; @ApiModelProperty(value = "编辑人") server/services/src/main/java/com/doumee/dao/business/model/Member.java
@@ -27,7 +27,7 @@ @ApiModelProperty(value = "创建时间") @ExcelColumn(name="创建时间") @JsonFormat(pattern = "yyyy-MM-dd") //@JsonFormat(pattern = "yyyy-MM-dd") private Date createDate; @ApiModelProperty(value = "创建人") @@ -36,7 +36,7 @@ @ApiModelProperty(value = "编辑时间") @ExcelColumn(name="编辑时间") @JsonFormat(pattern = "yyyy-MM-dd") //@JsonFormat(pattern = "yyyy-MM-dd") private Date editDate; @ApiModelProperty(value = "编辑人") @@ -81,12 +81,12 @@ @ApiModelProperty(value = "注册时间") @ExcelColumn(name="注册时间") @JsonFormat(pattern = "yyyy-MM-dd") //@JsonFormat(pattern = "yyyy-MM-dd") private Date registerDate; @ApiModelProperty(value = "最近租车时间") @ExcelColumn(name="最近租车时间") @JsonFormat(pattern = "yyyy-MM-dd") //@JsonFormat(pattern = "yyyy-MM-dd") private Date lastRendId; @ApiModelProperty(value = "手机号") server/services/src/main/java/com/doumee/dao/business/model/MemberRides.java
@@ -27,7 +27,7 @@ @ApiModelProperty(value = "创建时间") @ExcelColumn(name="创建时间") @JsonFormat(pattern = "yyyy-MM-dd") //@JsonFormat(pattern = "yyyy-MM-dd") private Date createDate; @ApiModelProperty(value = "创建人") @@ -36,7 +36,7 @@ @ApiModelProperty(value = "编辑时间") @ExcelColumn(name="编辑时间") @JsonFormat(pattern = "yyyy-MM-dd") //@JsonFormat(pattern = "yyyy-MM-dd") private Date editDate; @ApiModelProperty(value = "编辑人") @@ -77,7 +77,7 @@ @ApiModelProperty(value = "租车时间") @ExcelColumn(name="租车时间") @JsonFormat(pattern = "yyyy-MM-dd") //@JsonFormat(pattern = "yyyy-MM-dd") private Date rentDate; @ApiModelProperty(value = "租车指令编码") @@ -94,7 +94,7 @@ @ApiModelProperty(value = "还车时间") @ExcelColumn(name="还车时间") @JsonFormat(pattern = "yyyy-MM-dd") //@JsonFormat(pattern = "yyyy-MM-dd") private Date backDate; @ApiModelProperty(value = "还车指令编码") @@ -131,7 +131,7 @@ @ApiModelProperty(value = "结算时间") @ExcelColumn(name="结算时间") @JsonFormat(pattern = "yyyy-MM-dd") //@JsonFormat(pattern = "yyyy-MM-dd") private Date closeDate; @ApiModelProperty(value = "结算状态 0未结算 1已结束", example = "1") server/services/src/main/java/com/doumee/dao/business/model/PricingDetail.java
@@ -26,7 +26,7 @@ @ApiModelProperty(value = "创建时间") @ExcelColumn(name="创建时间") @JsonFormat(pattern = "yyyy-MM-dd") //@JsonFormat(pattern = "yyyy-MM-dd") private Date createDate; @ApiModelProperty(value = "创建人") @@ -35,7 +35,7 @@ @ApiModelProperty(value = "编辑时间") @ExcelColumn(name="编辑时间") @JsonFormat(pattern = "yyyy-MM-dd") //@JsonFormat(pattern = "yyyy-MM-dd") private Date editDate; @ApiModelProperty(value = "编辑人") server/services/src/main/java/com/doumee/dao/business/model/PricingParam.java
@@ -26,7 +26,7 @@ @ApiModelProperty(value = "创建时间") @ExcelColumn(name="创建时间") @JsonFormat(pattern = "yyyy-MM-dd") //@JsonFormat(pattern = "yyyy-MM-dd") private Date createDate; @ApiModelProperty(value = "创建人") @@ -35,7 +35,7 @@ @ApiModelProperty(value = "编辑时间") @ExcelColumn(name="编辑时间") @JsonFormat(pattern = "yyyy-MM-dd") //@JsonFormat(pattern = "yyyy-MM-dd") private Date editDate; @ApiModelProperty(value = "编辑人") @@ -52,12 +52,12 @@ @ApiModelProperty(value = "开始时间") @ExcelColumn(name="开始时间") @JsonFormat(pattern = "yyyy-MM-dd") //@JsonFormat(pattern = "yyyy-MM-dd") private Date startDate; @ApiModelProperty(value = "结束时间") @ExcelColumn(name="结束时间") @JsonFormat(pattern = "yyyy-MM-dd") //@JsonFormat(pattern = "yyyy-MM-dd") private Date endDate; @ApiModelProperty(value = "优先级（升序）", example = "1") server/services/src/main/java/com/doumee/dao/business/model/Refund.java
@@ -27,7 +27,7 @@ @ApiModelProperty(value = "创建时间") @ExcelColumn(name="创建时间") @JsonFormat(pattern = "yyyy-MM-dd") //@JsonFormat(pattern = "yyyy-MM-dd") private Date createDate; @ApiModelProperty(value = "创建人") @@ -36,7 +36,7 @@ @ApiModelProperty(value = "编辑时间") @ExcelColumn(name="编辑时间") @JsonFormat(pattern = "yyyy-MM-dd") //@JsonFormat(pattern = "yyyy-MM-dd") private Date editDate; @ApiModelProperty(value = "编辑人") @@ -81,7 +81,7 @@ @ApiModelProperty(value = "完成时间") @ExcelColumn(name="完成时间") @JsonFormat(pattern = "yyyy-MM-dd") //@JsonFormat(pattern = "yyyy-MM-dd") private Date doneDate; @ApiModelProperty(value = "退款类型 0结算退款 1强制结算退款 2结算后退款", example = "1") server/services/src/main/java/com/doumee/dao/business/model/RentSite.java
@@ -27,7 +27,7 @@ @ApiModelProperty(value = "创建时间") @ExcelColumn(name="创建时间") @JsonFormat(pattern = "yyyy-MM-dd") //@JsonFormat(pattern = "yyyy-MM-dd") private Date createDate; @ApiModelProperty(value = "创建人") @@ -36,7 +36,7 @@ @ApiModelProperty(value = "编辑时间") @ExcelColumn(name="编辑时间") @JsonFormat(pattern = "yyyy-MM-dd") //@JsonFormat(pattern = "yyyy-MM-dd") private Date editDate; @ApiModelProperty(value = "编辑人") server/services/src/main/java/com/doumee/dao/business/model/Sites.java
@@ -26,7 +26,7 @@ @ApiModelProperty(value = "创建时间") @ExcelColumn(name="创建时间") @JsonFormat(pattern = "yyyy-MM-dd") //@JsonFormat(pattern = "yyyy-MM-dd") private Date createDate; @ApiModelProperty(value = "创建人") @@ -35,7 +35,7 @@ @ApiModelProperty(value = "编辑时间") @ExcelColumn(name="编辑时间") @JsonFormat(pattern = "yyyy-MM-dd") //@JsonFormat(pattern = "yyyy-MM-dd") private Date editDate; @ApiModelProperty(value = "编辑人") server/services/src/main/java/com/doumee/dao/business/model/Transactions.java
@@ -27,7 +27,7 @@ @ApiModelProperty(value = "创建时间") @ExcelColumn(name="创建时间") @JsonFormat(pattern = "yyyy-MM-dd") //@JsonFormat(pattern = "yyyy-MM-dd") private Date createDate; @ApiModelProperty(value = "创建人") @@ -36,7 +36,7 @@ @ApiModelProperty(value = "编辑时间") @ExcelColumn(name="编辑时间") @JsonFormat(pattern = "yyyy-MM-dd") //@JsonFormat(pattern = "yyyy-MM-dd") private Date editDate; @ApiModelProperty(value = "编辑人") server/services/src/main/java/com/doumee/dao/business/model/WxBill.java
@@ -24,7 +24,7 @@ private String id; @ApiModelProperty(value = "总交易单数", example = "1") @ExcelColumn(name="总交易单数") @ExcelColumn(name="收款交易单数") private Integer sumBill; @ApiModelProperty(value = "退款的订单数", example = "1") @@ -43,8 +43,8 @@ @ExcelColumn(name="充值券退款总金额") private BigDecimal sumCouponRefundFee; @ApiModelProperty(value = "手续费总金额", example = "1") @ExcelColumn(name="手续费总金额") @ApiModelProperty(value = "收款手续费总金额", example = "1") @ExcelColumn(name="收款手续费总金额") private BigDecimal sumCmmsAmt; @ApiModelProperty(value = "订单总金额", example = "1") server/services/src/main/java/com/doumee/dao/business/model/WxBillDetail.java
@@ -31,7 +31,7 @@ @ApiModelProperty(value = "交易时间") @ExcelColumn(name="交易时间") @JsonFormat(pattern = "yyyy-MM-dd") //@JsonFormat(pattern = "yyyy-MM-dd") private Date billDate; @ApiModelProperty(value = "公众账号ID") @@ -108,12 +108,12 @@ @ApiModelProperty(value = "退款申请时间") @ExcelColumn(name="退款申请时间") @JsonFormat(pattern = "yyyy-MM-dd") //@JsonFormat(pattern = "yyyy-MM-dd") private Date refundApplyDate; @ApiModelProperty(value = "退款成功时间") @ExcelColumn(name="退款成功时间") @JsonFormat(pattern = "yyyy-MM-dd") //@JsonFormat(pattern = "yyyy-MM-dd") private Date refundSuccessDate; @ApiModelProperty(value = "退款状态") server/services/src/main/java/com/doumee/service/business/WxBillService.java
@@ -94,5 +94,5 @@ * @return long */ long count(WxBill wxBill); void getWxBill(); void getWxBill(String billDate); } server/services/src/main/java/com/doumee/service/business/impl/WxBillServiceImpl.java
@@ -8,8 +8,10 @@ import com.doumee.core.utils.DateUtil; import com.doumee.core.utils.Utils; import com.doumee.core.wx.WxMiniConfig; import com.doumee.core.wx.WxPayProperties; import com.doumee.dao.business.WxBillDetailMapper; import com.doumee.dao.business.WxBillMapper; import com.doumee.dao.business.model.Goodsorder; import com.doumee.dao.business.model.WxBill; import com.doumee.dao.business.model.WxBillDetail; import com.doumee.service.business.WxBillService; @@ -22,6 +24,7 @@ import com.github.binarywang.wxpay.bean.result.WxPayBillResult; import com.github.binarywang.wxpay.exception.WxPayException; import org.apache.commons.lang3.StringUtils; import org.checkerframework.checker.units.qual.C; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -157,10 +160,11 @@ } @Override @Transactional(rollbackFor = {BusinessException.class,Exception.class}) public void getWxBill() { public void getWxBill(String billDate) { // 获取交易账单数据 WxPayDownloadBillRequest request = new WxPayDownloadBillRequest(); String billDate = DateUtil.beforeDateToStr(1); // String billDate = DateUtil.beforeDateToStr(1); Date ydate = DateUtil.addDaysToDate(new Date(), -1); request.setBillDate(billDate); request.setBillType("SUCCESS"); WxPayBillResult response = null; @@ -217,10 +221,23 @@ } wxBillMapper.delete(new UpdateWrapper<WxBill>().lambda().eq( WxBill::getId, bill.getId())); wxBillDetailMapper.delete(new UpdateWrapper<WxBillDetail>().lambda().eq( WxBillDetail::getPid, bill.getId())); // getTotalAndIncome(bill,ydate);//统计结算金额和自行车收入 //总结算金额（收款金额-收款手续费-退款金额-退款手续费（负数）） bill.setTotal(bill.getSumSuccessFee().subtract(bill.getSumCmmsAmt()).subtract(bill.getSumRefundFee()).subtract(bill.getSumRefundCmmsAmt())); // //自行车收入（收款金额-收款手续费-退款金额-退款手续费（负数）） // bill.setBikeFee(bill.getSumSuccessFee().subtract(bill.getSumRefundFee())); wxBillMapper.insert(bill); if(detailList.size()>0){ wxBillDetailMapper.insertBatch(detailList); } } private void getTotalAndIncome(WxBill bill,Date date) { QueryWrapper<Goodsorder> queryWrapper = new QueryWrapper<>(); queryWrapper.apply("to_char(create_date, 'yyyy-MM-dd') = {0}", date); queryWrapper.lambda().eq(Goodsorder::getIsdeleted, Constants.ZERO); queryWrapper.lambda().eq(Goodsorder::getStatus, Constants.goodsorderStatus.over);//已結算 queryWrapper.select("sum(money) as totalMoney","sum(close_money) as totalCloseMoney"); } private List<WxBillDetail> getDetialModelByInfo(WxBill bill, List<WxPayBillInfo> billInfoList) { @@ -261,7 +278,15 @@ detail.setRateRemark(info.getFeeRemark());//费率备注 detail.setRefundSuccessDate(DateUtil.getDateFromString2(info.getRefundSuccessTime()));//成功退款时间 detail.setRefundApplyDate(DateUtil.getDateFromString2(info.getRefundTime())); //申请退款时间 //计算自行车收入，匹配来自自行车小程序的所有支付成功和退款成功的金额，作为自行车收入（累计收款金额-累计退款成功金额） if(StringUtils.equals(detail.getAppid(), WxMiniConfig.wxPayService.getConfig().getAppId())){ //自行车收入累计收款金额 bill.setBikeFee(bill.getBikeFee().add(detail.getSettlementTotalFee())); if(StringUtils.equals(detail.getRefundSuccessStatus(),"SUCCESS")){ //如果退款成功，扣除退款金额 bill.setBikeFee(bill.getBikeFee().subtract(detail.getApplyRefundFee())); } } detailList.add(detail); } }
