UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/OrderController.java
@@ -227,13 +227,13 @@ */ @ResponseBody @PostMapping("/api/order/queryMyTravelRecord") @ApiOperation(value = "获取消费记录", tags = {"用户端-个人中心"}, notes = "") @ApiOperation(value = "获取消费记录【2.0】", tags = {"用户端-个人中心"}, notes = "") @ApiImplicitParams({ @ApiImplicitParam(value = "页码（首页1）", name = "pageNum", required = true, dataType = "int"), @ApiImplicitParam(value = "页条数", name = "size", required = true, dataType = "int"), @ApiImplicitParam(name = "Authorization", value = "Bearer +token", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9.....") }) public ResultUtil<List<TravelRecordWarpper>> queryMyTravelRecord(Integer pageNum, Integer size, Integer language, HttpServletRequest request){ public ResultUtil<TravelRecordWarpper> queryMyTravelRecord(Integer pageNum, Integer size, Integer language, HttpServletRequest request){ try { Integer uid = userInfoService.getUserIdFormRedis(request); if(null == uid){ @@ -278,8 +278,10 @@ list.addAll(list3); // list.addAll(list4); List<TravelRecordWarpper> orderWarpper = TravelRecordWarpper.getTravelRecordWarpper(list); List<TravelRecordListWarpper> orderWarpper = TravelRecordListWarpper.getTravelRecordWarpper(list); double sum = orderWarpper.stream().mapToDouble(TravelRecordListWarpper::getMoney).sum(); //分页 if(orderWarpper.size() >= (pageNum + 1) * size){ orderWarpper = orderWarpper.subList(pageNum, pageNum + size); @@ -288,7 +290,10 @@ }else{ orderWarpper = new ArrayList<>(); } return ResultUtil.success(orderWarpper); TravelRecordWarpper travelRecordWarpper = new TravelRecordWarpper(); travelRecordWarpper.setList(orderWarpper); travelRecordWarpper.setTotal(sum); return ResultUtil.success(travelRecordWarpper); }catch (Exception e){ e.printStackTrace(); return ResultUtil.runErr(); UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/UserInfoController.java
@@ -1263,7 +1263,7 @@ if(null == uid){ return ResultUtil.tokenErr(); } // RechargeRecordWarpper rechargeRecordWarpper = new RechargeRecordWarpper(); RechargeRecordWarpper rechargeRecordWarpper = new RechargeRecordWarpper(); List<Map<String,Object>> paymentRecord = paymentRecordService.queryRechargeRecord(uid, pageNum, size); for (Map<String, Object> map : paymentRecord) { if(null != map.get("insertTime")){ @@ -1275,10 +1275,10 @@ List<TransactionDetailsWarpper> transactionDetailsWarpper = TransactionDetailsWarpper.getTransactionDetailsWarpper(paymentRecord); // 查询充值金额总和 // double sum = paymentRecordService.queryRechargeMoneySum(uid); // rechargeRecordWarpper.setSum(sum); // rechargeRecordWarpper.setTransactionDetailsWarpper(transactionDetailsWarpper); return ResultUtil.success(transactionDetailsWarpper); double sum = paymentRecordService.queryRechargeMoneySum(uid); rechargeRecordWarpper.setSum(sum); rechargeRecordWarpper.setTransactionDetailsWarpper(transactionDetailsWarpper); return ResultUtil.success(rechargeRecordWarpper); }catch (Exception e){ e.printStackTrace(); return ResultUtil.runErr(); UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/dao/mapping/OrderLogisticsMapper.xml
@@ -158,7 +158,8 @@ orderMoney as orderMoney, payMoney as payMoney, ifnull(discountMoney, 0) as discountMoney, (select price from t_order_logistics_spread where orderLogisticsId = a.id) as differenceMoney (select price from t_order_logistics_spread where orderLogisticsId = a.id) as differenceMoney, cancelMidway from t_order_logistics as a where userId = #{uid} and isDelete = 1 order by insertTime desc limit #{pageNum}, #{size} </select>
@@ -415,4 +415,9 @@ */ @TableField("startMileage") private Double startMileage; /** * 中途取消（0=否，1=是） */ @TableField("cancelMidway") private Integer cancelMidway; } UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/server/impl/OrderLogisticsServiceImpl.java
@@ -2436,6 +2436,7 @@ orderLogistics.setGetoffAddress(address); orderLogistics.setGetoffTime(new Date()); orderLogistics.setEndServiceTime(new Date()); orderLogistics.setCancelMidway(1); }else{ orderLogistics.setState(10); } @@ -2447,6 +2448,7 @@ orderLogistics.setGetoffAddress(address); orderLogistics.setGetoffTime(new Date()); orderLogistics.setEndServiceTime(new Date()); orderLogistics.setCancelMidway(1); } orderLogistics.setOldState(orderLogistics.getState()); orderLogistics.setState(12); UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/dao/mapping/OrderPrivateCarMapper.xml
@@ -344,7 +344,8 @@ (1) as orderType, state as state, oldState as oldState, isFrozen isFrozen, cancelMidway from t_order_private_car where userId = #{uid} and isDelete = 1 order by insertTime desc limit #{pageNum}, #{size} </select>
@@ -405,5 +405,10 @@ */ @TableField("destination") private String destination; /** * 中途取消（0=否，1=是） */ @TableField("cancelMidway") private Integer cancelMidway; } UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java
@@ -652,6 +652,7 @@ orderPrivateCar.setGetoffAddress(address); orderPrivateCar.setGetoffTime(new Date()); orderPrivateCar.setEndServiceTime(new Date()); orderPrivateCar.setCancelMidway(1); }else{ orderPrivateCar.setState(10); } @@ -663,6 +664,7 @@ orderPrivateCar.setGetoffAddress(address); orderPrivateCar.setGetoffTime(new Date()); orderPrivateCar.setEndServiceTime(new Date()); orderPrivateCar.setCancelMidway(1); } orderPrivateCar.setOldState(6); orderPrivateCar.setState(12); UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/OrderWarpper.java
@@ -54,6 +54,8 @@ private String receipt; @ApiModelProperty("是否冻结（1=否，2=是）") private Integer isFrozen; @ApiModelProperty("中途取消（0=否，1=是）") private Integer cancelMidway; public Integer getOrderId() { return orderId; @@ -269,6 +271,14 @@ this.isFrozen = isFrozen; } public Integer getCancelMidway() { return cancelMidway; } public void setCancelMidway(Integer cancelMidway) { this.cancelMidway = cancelMidway; } @Override public int compareTo(Object o) { if (o instanceof OrderWarpper) {
