pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voSe/VoTradeDetails.java
@@ -22,44 +22,17 @@ */ @Data @JsonPropertyOrder({"cardNum", "cashierId", "villageId", "clientNum", "districtTitle", "clientName", "phone", "operateType", "tradeAmount", "waterCost", "cardCost", "gift", "refundAmount", "paymentName", "tradeTime"}) @JsonPropertyOrder({"orderNumber", "clientName", "cardNum", "idCard", "clientNum", "phone", "operateType", "tradeAmount", "waterCost", "cardCost", "gift", "refundAmount", "money", "paymentName", "tradeTime", "cashierId", "cardState", "districtTitle", "villageId"}) @HeadRowHeight(30) @ContentRowHeight(20) public class VoTradeDetails implements BaseEntity { private static final long serialVersionUID = 202402012040001L; /** * 水卡编号 * 订单号 */ @JSONField(serializeUsing= ObjectWriterImplToString.class) private Long cardNum; /** * 收银员ID */ @JSONField(serializeUsing= ObjectWriterImplToString.class) @ExcelIgnore private Long cashierId; /** * 村庄ID */ @JSONField(serializeUsing= ObjectWriterImplToString.class) @ExcelIgnore private Long villageId; /** * 农户编号 */ @ExcelIgnore private String clientNum; /** * 村庄名称 */ @ExcelProperty(value = {"${title}", "村庄名称"}) @ColumnWidth(20) private String districtTitle; @ColumnWidth(25) private String orderNumber; /** * 农户姓名 @@ -67,6 +40,26 @@ @ExcelProperty(value = {"${title}", "农户姓名"}) @ColumnWidth(15) private String clientName; /** * 水卡编号 */ @JSONField(serializeUsing= ObjectWriterImplToString.class) @ColumnWidth(15) private Long cardNum; /** * 身份证号 */ @ColumnWidth(15) private String idCard; /** * 农户编号 */ //@ExcelIgnore @ColumnWidth(15) private String clientNum; /** * 联系电话 @@ -118,6 +111,13 @@ private Double refundAmount; /** * 余额 */ @JSONField(serializeUsing= ObjectWriterImplToString.class) @ColumnWidth(15) private Long money; /** * 付款方式 */ @ExcelProperty(value = {"${title}", "付款方式"}) @@ -132,4 +132,30 @@ @ColumnWidth(20) private Date tradeTime; /** * 收银员ID */ @JSONField(serializeUsing= ObjectWriterImplToString.class) @ExcelIgnore private Long cashierId; /** * 卡片状态 */ @ColumnWidth(15) private String cardState; /** * 村庄名称 */ @ExcelProperty(value = {"${title}", "村庄名称"}) @ColumnWidth(20) private String districtTitle; /** * 村庄ID */ @JSONField(serializeUsing= ObjectWriterImplToString.class) @ExcelIgnore private Long villageId; } pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/general/GeneralCtrl.java
@@ -212,7 +212,10 @@ }) @GetMapping(path = "getSummaries") @SsoAop() public BaseResponse<Map> getSummaries(QoSummary vo){ public BaseResponse<Map> getSummaries( @Valid QoSummary vo, BindingResult bindingResult){ if(bindingResult != null && bindingResult.hasErrors()){ return BaseResponseUtils.buildErrorMsg(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage()); } try { Map res = generalSv.getSummaries(vo); return BaseResponseUtils.buildSuccess(res); pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/general/GeneralSv.java
@@ -7,6 +7,7 @@ import com.dy.pipIrrGlobal.daoSe.*; import com.dy.pipIrrGlobal.pojoSe.SeAudits; import com.dy.pipIrrGlobal.pojoSe.SeGeneral; import com.dy.pipIrrGlobal.pojoSe.SePaymentMethod; import com.dy.pipIrrGlobal.voSe.VoGeneral; import com.dy.pipIrrGlobal.voSe.VoTradeDetails; import com.dy.pipIrrGlobal.voSe.VoTransactionStatistics; @@ -47,6 +48,9 @@ @Autowired private SeRefundMapper seRefundMapper; @Autowired private SePaymentMethodMapper sePaymentMethodMapper; /** * 获取未生成总账的交易日期列表（当天的交易记录不生成总账） @@ -154,6 +158,28 @@ // 起始索引位置 Integer startIndex = (pageCurr - 1) * pageSize; // 获取各支付方式ID Long paymentId_cash = 0L; Long paymentId_wechat = 0L; Long paymentId_alipay = 0L; Long paymentId_transfer = 0L; List<SePaymentMethod> list_payment = sePaymentMethodMapper.getPaymentMethods(); for (int i = 0; i < list_payment.size(); i++) { SePaymentMethod paymentMethod = list_payment.get(i); if(paymentMethod.getName().equals("现金")) { paymentId_cash = paymentMethod.getId(); } if(paymentMethod.getName().equals("微信支付")) { paymentId_wechat = paymentMethod.getId(); } if(paymentMethod.getName().equals("支付宝支付")) { paymentId_alipay = paymentMethod.getId(); } if(paymentMethod.getName().equals("银行转账")) { paymentId_transfer = paymentMethod.getId(); } } // 接收传入参数：交易起止日期、收银员ID JSONArray array_paymentSums = new JSONArray(); @@ -166,14 +192,16 @@ while (calendar.getTime().before(timeStop) || calendar.getTime().equals(timeStop)) { String tradeDate = dateFormat.format(calendar.getTime()) ; if(cashierId != 1000000L) { Float receivedCash = Optional.ofNullable(seGeneralMapper.getPaymentSums(tradeDate, cashierId, 1L)).orElse(0f); Float receivedQRCode = Optional.ofNullable(seGeneralMapper.getPaymentSums(tradeDate, cashierId,2L)).orElse(0f); Float receivedTransfer = Optional.ofNullable(seGeneralMapper.getPaymentSums(tradeDate, cashierId, 3L)).orElse(0f); Float receivedCash = Optional.ofNullable(seGeneralMapper.getPaymentSums(tradeDate, cashierId, paymentId_cash)).orElse(0f); Float receivedWechat = Optional.ofNullable(seGeneralMapper.getPaymentSums(tradeDate, cashierId,paymentId_wechat)).orElse(0f); Float receivedAlipay = Optional.ofNullable(seGeneralMapper.getPaymentSums(tradeDate, cashierId,paymentId_alipay)).orElse(0f); Float receivedTransfer = Optional.ofNullable(seGeneralMapper.getPaymentSums(tradeDate, cashierId, paymentId_transfer)).orElse(0f); JSONObject job = new JSONObject(); job.put("tradeDate", tradeDate); job.put("receivedCash", receivedCash); job.put("receivedQRCode", receivedQRCode); job.put("receivedWechat", receivedWechat); job.put("receivedAlipay", receivedAlipay); job.put("receivedTransfer", receivedTransfer); array_paymentSums.add(job);
