diff --git a/jeecg-module-system/jeecg-system-api/jeecg-system-local-api/src/main/java/org/jeecg/payment/entity/StConsumptionExceptionRecord.java b/jeecg-module-system/jeecg-system-api/jeecg-system-local-api/src/main/java/org/jeecg/payment/entity/StConsumptionExceptionRecord.java index 47ebe97..6744622 100644 --- a/jeecg-module-system/jeecg-system-api/jeecg-system-local-api/src/main/java/org/jeecg/payment/entity/StConsumptionExceptionRecord.java +++ b/jeecg-module-system/jeecg-system-api/jeecg-system-local-api/src/main/java/org/jeecg/payment/entity/StConsumptionExceptionRecord.java @@ -49,8 +49,11 @@ public class StConsumptionExceptionRecord implements Serializable { private Integer secondChargeFlag; @Schema(title ="自定义扣费标记 1 是 ; 0 否") private Integer isCustom; - @Schema(title ="恢复标记 1 是; 0 否") + @Schema(title ="恢复标记 1 是; 0 否; 3 不展示恢复标记") private Integer isRestore; + @Schema(title ="异常提示") + private String errorMsg; + /**创建日期*/ diff --git a/jeecg-module-system/jeecg-system-api/jeecg-system-local-api/src/main/java/org/jeecg/payment/vo/StExceptionRecordVo.java b/jeecg-module-system/jeecg-system-api/jeecg-system-local-api/src/main/java/org/jeecg/payment/vo/StExceptionRecordVo.java index 4da6be5..d5a8518 100644 --- a/jeecg-module-system/jeecg-system-api/jeecg-system-local-api/src/main/java/org/jeecg/payment/vo/StExceptionRecordVo.java +++ b/jeecg-module-system/jeecg-system-api/jeecg-system-local-api/src/main/java/org/jeecg/payment/vo/StExceptionRecordVo.java @@ -48,4 +48,6 @@ public class StExceptionRecordVo { @Schema(title ="部门名称") private String deptName; + private String errorMsg; + } diff --git a/jeecg-module-system/jeecg-system-api/jeecg-system-local-api/src/main/java/org/jeecg/payment/vo/StRfidVo.java b/jeecg-module-system/jeecg-system-api/jeecg-system-local-api/src/main/java/org/jeecg/payment/vo/StRfidVo.java index 84a8ea3..7287214 100644 --- a/jeecg-module-system/jeecg-system-api/jeecg-system-local-api/src/main/java/org/jeecg/payment/vo/StRfidVo.java +++ b/jeecg-module-system/jeecg-system-api/jeecg-system-local-api/src/main/java/org/jeecg/payment/vo/StRfidVo.java @@ -55,4 +55,6 @@ public class StRfidVo { * 恢复标记 1 是; 0 否 */ private Integer isRestore; + + private String errorMsg; } diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/payment/controller/StBbzxOrderInfoController.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/payment/controller/StBbzxOrderInfoController.java index d8ccdb3..1bdb543 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/payment/controller/StBbzxOrderInfoController.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/payment/controller/StBbzxOrderInfoController.java @@ -306,8 +306,8 @@ public class StBbzxOrderInfoController { } else { return Result.OK(); } - query.setStatus(3);//(充值=102 - return Result.OK(iStClientMemberTransactionRecordService.pageQuery(query)); + query.setStatus(102);//(充值=102 + return Result.OK(iStClientMemberTransactionRecordService.pageQueryNew(query)); } /** diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/payment/controller/StClientMemberBalanceController.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/payment/controller/StClientMemberBalanceController.java index b9b492c..d53f27f 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/payment/controller/StClientMemberBalanceController.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/payment/controller/StClientMemberBalanceController.java @@ -37,7 +37,6 @@ import org.springframework.web.multipart.MultipartFile; import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import javax.validation.Valid; import java.io.ByteArrayOutputStream; import java.io.IOException; import java.io.InputStream; @@ -115,16 +114,11 @@ public class StClientMemberBalanceController { clientMemberWrapper.eq(StClientMemberBalance::getMemberId, userId); StClientMemberBalance balance = iStClientMemberBalanceService.getOne(clientMemberWrapper); -// Map map = iStClientMemberLevelDemotionTimeService.topUpAwardService(null, value.floatValue(),canteenId); BigDecimal rewardBalance = new BigDecimal(0); int integralBalance = 0; StClientMemberTopUpDTO query = new StClientMemberTopUpDTO(); query.setId(balance.getId()); query.setCanteenId(canteenId); -// if(null != map){ -// rewardBalance = BigDecimal.valueOf(Float.parseFloat(map.get("amount").toString())); -// integralBalance = Integer.parseInt(map.get("integral").toString()); -// } query.setTopUpBalance(value); query.setRewardBalance(rewardBalance); query.setIntegralBalance(integralBalance); @@ -408,26 +402,8 @@ public class StClientMemberBalanceController { if(null == transactionRecord || StringUtils.isBlank(transactionRecord.getId())){ return Result.error("订单未找到"); } -// List onLine = Arrays.asList(MemberEnum.PAYMENT_METHOD_BY_ALI.getCode(), -// MemberEnum.PAYMENT_METHOD_BY_WX.getCode()); -// if(!onLine.contains(transactionRecord.getPaymentMethod()) && onLine.contains(query.getPaymentMethod())){ -// //原充值方式不是线上，但是撤销充值时是线上提示，不支持线上退款请选择其他退回 -// return Result.error("原订单非线上充值，不支持原路退回，请选择其他方式"); -// } -// if(onLine.contains(transactionRecord.getPaymentMethod())){//线上退款 -// RefundDTO refundDTO = new RefundDTO(); -// refundDTO.setPayOrderNo(query.getPayOrderNo()); -// refundDTO.setTotalFee(query.getTotalFee()); -// refundDTO.setPaymentMethod(query.getPaymentMethod()); -// refundDTO.setRemark(query.getRemark()); -// if(StringUtils.isBlank(query.getPayOrderNo())){ -// return Result.error("商户订单号不能为空"); -// } -// return stBbzxOrderInfoService.returnPayInfoTopUpOnline(refundDTO); -// } else { //线下退款 return iStClientMemberBalanceService.backOutTopUpOffLine(query); -// } } @@ -461,8 +437,9 @@ public class StClientMemberBalanceController { LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); String canteenId = sysUser.getCanteenId(); query.setCanteenId(canteenId); - query.setStatus(1);//消费=101 - return Result.OK(iStClientMemberTransactionRecordService.pageQuery(query)); + //消费=101 + query.setStatus(101); + return Result.OK(iStClientMemberTransactionRecordService.pageQueryNew(query)); } /** @@ -516,7 +493,7 @@ public class StClientMemberBalanceController { query.setStartTime(query.getStartDate()); } if(StringUtils.isNotBlank(query.getEndDate())){ - query.setStartTime(query.getEndDate()); + query.setEndTime(query.getEndDate()); } LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); //餐品总库只查询内置食堂 @@ -581,70 +558,6 @@ public class StClientMemberBalanceController { } -// /** -// * 企业付款到个人微信余额退款后台审核接口 -// * @param orderNo -// * @return -// */ -// @GetMapping("/btoc/refund/check") -// @Operation(summary= "用户退费-企业付款到个人微信余额退款后台审核接口") -// @SendNotification() -// public Result btocRefund(@RequestParam String orderNo) { -// String auditorId = JwtUtil.getUserId(); -// LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); -// queryWrapper.eq(StClientMemberTransactionRecord::getOrderNo, orderNo); -// StClientMemberTransactionRecord one = iStClientMemberTransactionRecordService.getOne(queryWrapper); -// if(null == one){ -// return Result.error("申请订单不存在"); -// } -// if(one.getStatus().equals(MemberTransactionTypeEnum.B_TO_C_REFUND_301.getCode())){ -// return Result.error("订单已经退款成功！"); -// } -// TransfersDto transfersDto = new TransfersDto(); -// transfersDto.setAmount(one.getTransactionAmount().multiply(BigDecimal.valueOf(100)).intValue()); -// SysUser sysUser = feignSystemService.getById(one.getMemberId()); -// if(null == sysUser){ -// return Result.error("用户不存在"); -// } -// if(StringUtils.isBlank(sysUser.getThirdId())){ -// return Result.error("用户微信标识为空，请先绑定微信后再试"); -// } -// transfersDto.setOpenid(sysUser.getThirdId()); -// transfersDto.setCheck_name("FORCE_CHECK"); -// transfersDto.setRe_user_name(sysUser.getRealname()); -// transfersDto.setDesc("企业付款到个人微信余额退款"); -// transfersDto.setPartner_trade_no(StMemberUtil.getOrderNoTransfer(orderNo)); -// Result result = iPayInfo.btocRefund(transfersDto); -// one.setCreateBy(auditorId);//审核人ID -// one.setPayTime(new Date());//审核人时间 -// one.setIsSync(0); -// iStClientMemberTransactionRecordService.updateById(one); -// if(null != result && result.getCode() == HttpServletResponse.SC_OK && result.getResult()){ -// LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); -// wrapper.eq(StClientMemberBalance::getMemberId, one.getMemberId()); -// StClientMemberBalance swClientMemberBalance = iStClientMemberBalanceService.getBaseMapper().selectOne(wrapper); -// if (swClientMemberBalance != null) { -// swClientMemberBalance.setTopUpBalance(new BigDecimal(0)); -// swClientMemberBalance.setRewardBalance(new BigDecimal(0)); -// swClientMemberBalance.setIntegralBalance(0); -// swClientMemberBalance.setUpdateTime(new Date()); -// swClientMemberBalance.setCreateBy(one.getCreateBy()); -// swClientMemberBalance.setUpdateBy(one.getUpdateBy()); -// swClientMemberBalance.setCanteenId(one.getCanteenId()); -// swClientMemberBalance.setIsSync(0); -// boolean flag = iStClientMemberBalanceService.saveOrUpdate(swClientMemberBalance); -// if(flag){ -// one.setStatus(MemberTransactionTypeEnum.B_TO_C_REFUND_301.getCode()); -// one.setIsSync(0); -// iStClientMemberTransactionRecordService.updateById(one); -// } -// } -// return Result.OK("退款成功"); -// } else { -// return Result.error("退款失败"); -// } -// -// } //===================================================================================== @@ -679,12 +592,6 @@ public class StClientMemberBalanceController { } -// @PostMapping("/updateFeign") -// @Operation(summary = "会员余额更新feign") -// public void memberBalanceUpdateFeign(@RequestBody StClientMemberSpendDTO balance) throws Exception { -// balance.setInvoice(false); -//// iStClientMemberBalanceService.memberSpend(balance); 迁移至client服务更新余额 -// } @PostMapping("/returnSpendFeign") @Operation(summary="会员余额退款") diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/payment/mapper/StClientMemberTransactionRecordMapper.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/payment/mapper/StClientMemberTransactionRecordMapper.java index 723f8f6..5f06025 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/payment/mapper/StClientMemberTransactionRecordMapper.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/payment/mapper/StClientMemberTransactionRecordMapper.java @@ -1,6 +1,7 @@ package org.jeecg.payment.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.apache.ibatis.annotations.Param; import org.jeecg.payment.dto.StClientMemberTransactionRecordDTO; @@ -22,6 +23,9 @@ public interface StClientMemberTransactionRecordMapper extends BaseMapper pageList(Page page, @Param("vo") StClientMemberTransactionRecordDTO query); + long pageListCount(@Param("vo") StClientMemberTransactionRecordDTO query); + IPage pageList2(Page page, @Param("vo") StClientMemberTransactionRecordDTO query); + /** * 列表查询 * @return diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/payment/mapper/xml/StClientMemberTransactionRecordMapper.xml b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/payment/mapper/xml/StClientMemberTransactionRecordMapper.xml index b967d23..6d01685 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/payment/mapper/xml/StClientMemberTransactionRecordMapper.xml +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/payment/mapper/xml/StClientMemberTransactionRecordMapper.xml @@ -132,6 +132,129 @@ order by a.create_time desc + + +