phis-feign/src/main/java/com/hz/his/dto/order/OrderRefundDto.java
@@ -40,6 +40,8 @@ //////系统参数 /** 可退款总金额（额外数据）,parameterVerification方法校验的时候赋值 */ private BigDecimal totalAmount; /** 可退款总积分（额外数据）,parameterVerification方法校验的时候赋值 */ private BigDecimal totalIntegral; /** 选择退款总金额（额外数据）,parameterVerification方法校验的时候赋值 */ private BigDecimal refundTotal; /** 可退款方式集合 */ phis-feign/src/main/java/com/hz/his/dto/report/TmkOrderPerfReqDto.java
@@ -22,4 +22,8 @@ private String chatCorpUserId; //前置天数 private Integer leadDays; //操作人 private String operatorId; private String operatorName; } phis-feign/src/main/java/com/hz/his/dto/user/UserDto.java
@@ -5,6 +5,8 @@ import com.hz.his.dto.PageDto; import lombok.Data; import java.util.Date; /**查询用户详情数据*/ @Data @@ -37,6 +39,9 @@ private Integer isHaveShop; /**是否有顾问*/ private Integer isHaveCorp; /*开单平台，来源应用appId*/ private String appId; private Date startTime; private Date endTime; } phis-feign/src/main/java/com/hz/his/feign/service/phis/SUserService.java
@@ -295,4 +295,10 @@ * */ @PostMapping(value = "/user/first/day/consumption") Result firstDayConsumption(@RequestBody UserDto userDto); /** * 查询用户首天消费累计 * */ @PostMapping(value = "/user/accumulat/consumption") Result accumulateConsumption(@RequestBody UserDto userDto); } phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiTmkPerfService.java
@@ -16,7 +16,7 @@ public interface BiTmkPerfService { /** * 订单业绩明细列表 * 电网业绩明细列表 */ @PostMapping("/admin/tmk/perf/orderPerfList") Result orderPerfList(@RequestBody TmkOrderPerfReqDto tmkOrderPerfReqDto); @@ -33,5 +33,17 @@ @PostMapping("/admin/tmk/perf/summary/sumData") Result sumData(@RequestBody TmkOrderPerfReqDto tmkOrderPerfReqDto); /** * 电网业绩导出 */ @PostMapping("/admin/tmk/perf/orderPerfExport") Result export(@RequestBody TmkOrderPerfReqDto tmkOrderPerfReqDto); /** * 电网业绩汇总导出 */ @PostMapping("/admin/tmk/perf/summary/export") Result sumExport(@RequestBody TmkOrderPerfReqDto tmkOrderPerfReqDto); } phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/SExportService.java
@@ -1,11 +1,8 @@ package com.hz.his.feign.service.platform.bi; import com.hx.resultTool.Result; import com.hz.his.dto.file.FileExUpdateDto; import com.hz.his.dto.file.FileExportDto; import com.hz.his.vo.bi.exp.CashierSettlementVo; import com.hz.his.vo.bi.exp.CashierSurfaceVo; import com.hz.his.vo.bi.exp.DeductionSurfaceVo; import com.hz.his.dto.report.CashierSettlementDto; import com.hz.his.dto.report.DeductionSurfaceDto; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; @@ -21,21 +18,21 @@ * 无转换 */ @PostMapping(value = "/exp/cashier/settlement") Result cashierSettlement(@RequestBody CashierSettlementVo cashierSettlementVo); Result cashierSettlement(@RequestBody CashierSettlementDto cashierSettlementDto); /** * 导出收银报表 * 转换无 */ @PostMapping(value = "/exp/cashier/surface") Result cashierSurface(@RequestBody CashierSurfaceVo cashierSurfaceVo); Result cashierSurface(@RequestBody CashierSettlementDto cashierSettlementDto); /** * 导出划扣报表 * 转换无 */ @PostMapping(value = "/exp/deduction/surface") Result deductionSurface(@RequestBody DeductionSurfaceVo deductionSurfaceVo); Result deductionSurface(@RequestBody DeductionSurfaceDto deductionSurfaceDto); } phis-feign/src/main/java/com/hz/his/vo/order/refund/RefundMethodVo.java
New file @@ -0,0 +1,32 @@ package com.hz.his.vo.order.refund; import lombok.Data; import java.math.BigDecimal; /** * @author CJH * 退回支付记录扩展 */ @Data public class RefundMethodVo { /** 可退支付方式编码 */ private String payMethodNo; /** 可退支付方式名称 */ private String payMethodName; /** 可退支付金额 */ private BigDecimal payTotal; /**是否现金支付 0否1是*/ private Integer isMoneyPay; /**是否划扣计算：0否1是*/ private Integer isExecute; /** 转换方式编码 （实际退款方式编码）*/ private String refundNumberNo; /** 转换方式名称 （实际退款方式编码）*/ private String refundNumberName; /** 转换实退金额 （实际退款金额）*/ private BigDecimal refundTotal; } phis-feign/src/main/java/com/hz/his/vo/order/refund/card/RefundUserCardEquityVo.java
New file @@ -0,0 +1,31 @@ package com.hz.his.vo.order.refund.card; import lombok.Data; import java.math.BigDecimal; import java.util.List; /**卡项（卡包）退款金额信息计算结构体-权益 * @author CJH * */ @Data public class RefundUserCardEquityVo { /** 用户卡包卡项条目标识 */ private String cardEquityId; /** 用户卡包卡项条目名称 */ private String cardEquityName; /** 退款卡项条目 */ private List<RefundUserCardItemVo> refundUserCardItemVoList; //---用于系统返回参数计算 /** 可退总金额*/ private BigDecimal approveRefundTotal = BigDecimal.ZERO; /** 可退总积分*/ private BigDecimal approveRefundIntegral = BigDecimal.ZERO; /**分配金额*/ private BigDecimal occupyRefundTotal = BigDecimal.ZERO; /**分配积分*/ private BigDecimal occupyRefundIntegral = BigDecimal.ZERO; } phis-feign/src/main/java/com/hz/his/vo/order/refund/card/RefundUserCardItemVo.java
New file @@ -0,0 +1,31 @@ package com.hz.his.vo.order.refund.card; import lombok.Data; import java.math.BigDecimal; /**卡项（卡包）退款金额信息计算结构体-条目 * @author CJH * */ @Data public class RefundUserCardItemVo { /** 用户卡包卡项条目标识 */ private String cardItemInfoId; /** 用户卡包卡项条目名称 */ private String cardItemInfoName; /**退款数量（抵扣次数）*/ private Integer refundQuantity; //---用于系统返回参数计算 /** 可退总金额*/ private BigDecimal approveRefundTotal = BigDecimal.ZERO; /** 可退总积分*/ private BigDecimal approveRefundIntegral = BigDecimal.ZERO; /**分配金额*/ private BigDecimal occupyRefundTotal = BigDecimal.ZERO; /**分配积分*/ private BigDecimal occupyRefundIntegral = BigDecimal.ZERO; } phis-feign/src/main/java/com/hz/his/vo/order/refund/card/RefundUserCardVo.java
New file @@ -0,0 +1,47 @@ package com.hz.his.vo.order.refund.card; import com.hz.his.vo.order.refund.RefundMethodVo; import lombok.Data; import java.math.BigDecimal; import java.util.List; /**卡项（卡包）退款金额信息计算结构体-总信息 * */ @Data public class RefundUserCardVo { /** 用户卡包标识 */ private String userCardId; /** 用户卡包名称 */ private String userCardName; /** 退款原因（员工） */ private String remarks; /** 退款原因（用户） */ private String refundReason; /** 卡项权益 */ private List<RefundUserCardEquityVo> refundUserCardEquityVoList; /**支付方式*/ private List<RefundMethodVo> payMethodVos; /**退款支付方式*/ private List<RefundMethodVo> refundMethodVos; //-----用于系统返回参数计算 /** 可退总金额*/ private BigDecimal approveRefundTotal = BigDecimal.ZERO; /** 可退总积分*/ private BigDecimal approveRefundIntegral = BigDecimal.ZERO; /**分配金额*/ private BigDecimal occupyRefundTotal = BigDecimal.ZERO; /**分配积分*/ private BigDecimal occupyRefundIntegral = BigDecimal.ZERO; /**操作员工标识*/ private String staffId; /**操作员工角色标识*/ private String staffRoleId; }
