ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/entity/Order.java
@@ -149,6 +149,9 @@ @ApiModelProperty("置顶顺序") @TableField("top_sort") private Integer topSort; @ApiModelProperty("虚假订单") @TableField("fake") private Integer fake; @ApiModelProperty("是否评价(0:未评价,1:已评价)") @TableField("is_evaluate") ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/entity/OrderResultVO.java
@@ -21,6 +21,8 @@ @ApiModelProperty("订单总数量") private Integer orderTotalNumber; @ApiModelProperty("虚假订单数量") private Integer fakeTotalNumber; @ApiModelProperty("柱状图数据") private List<OrderQueryVO> orderList; ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/entity/OrderSubmitRequest.java
@@ -1,5 +1,6 @@ package com.ruoyi.order.api.entity; import com.baomidou.mybatisplus.annotation.TableField; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -18,5 +19,16 @@ @ApiModelProperty("现场照片") private List<String> photo; @ApiModelProperty("是否虚假订单") private Integer fake; @ApiModelProperty("铭牌图片(多张照片 ','隔开)") @TableField("card_pic") private String cardPic; @ApiModelProperty("机型图片(多张照片 ','隔开)") @TableField("machine_pic") private String machinePic; @ApiModelProperty("回收单凭证(多张照片 ','隔开)") @TableField("paper_pic") private String paperPic; } ruoyi-service/ruoyi-admin/pom.xml
@@ -193,6 +193,12 @@ <groupId>com.ruoyi</groupId> <artifactId>ruoyi-common-security</artifactId> </dependency> <dependency> <groupId>com.github.wechatpay-apiv3</groupId> <artifactId>wechatpay-java-core</artifactId> <version>0.2.12</version> <scope>compile</scope> </dependency> </dependencies> <build> ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/OrderController.java
@@ -1,6 +1,7 @@ package com.ruoyi.admin.controller; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.ruoyi.admin.entity.*; import com.ruoyi.admin.netty.NettyChannelMap; @@ -424,7 +425,7 @@ @ApiOperation(value = "ocr识别", tags = {"后台-首页"}) @PostMapping (value = "/ocr") public R<AddressDto> ocr(String ocrAddress) { public R<JSONObject> ocr(String ocrAddress) { return R.ok(DescribeInstances.ocr(ocrAddress)); }
@@ -18,7 +18,7 @@ public class DescribeInstances { public static AddressDto ocr(String address){ public static JSONObject ocr(String address){ String host = "https://addre.market.alicloudapi.com"; String path = "/format"; @@ -65,12 +65,12 @@ addressDto.setAddress(address1); addressDto.setName(person1); addressDto.setPhone(phonenum1); return addressDto; return data; //获取response的body } catch (Exception e) { e.printStackTrace(); } return new AddressDto(); return new JSONObject(); } public static AddressDto orcr(String args) { ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/OrderController.java
@@ -621,11 +621,15 @@ } order.setCompleteTime(new Date()); order.setState(Constants.THREE); order.setFake(orderSubmitRequest.getFake()); boolean update = orderService.updateById(order); // 服务记录 ServeRecord serveRecord = new ServeRecord(); serveRecord.setOrderId(order.getId()); serveRecord.setPhoto(String.join(",", orderSubmitRequest.getPhoto())); serveRecord.setPaperPic(orderSubmitRequest.getPaperPic()); serveRecord.setCardPic(orderSubmitRequest.getCardPic()); serveRecord.setMachinePic(orderSubmitRequest.getMachinePic()); boolean save = serveRecordService.save(serveRecord); return R.ok(update && save); } ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/entity/Order.java
@@ -170,4 +170,9 @@ @TableField("is_reinvest") private Integer isReinvest; @ApiModelProperty("1虚假订单0正常订单") @TableField("fake") private Integer fake; } ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/entity/ServeRecord.java
@@ -39,4 +39,13 @@ @TableField("remark") private String remark; @ApiModelProperty("现场照片(多张照片 ','隔开)") @TableField("card_pic") private String cardPic; @ApiModelProperty("现场照片(多张照片 ','隔开)") @TableField("machine_pic") private String machinePic; @ApiModelProperty("现场照片(多张照片 ','隔开)") @TableField("paper_pic") private String paperPic; } ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/request/OrderSubmitRequest.java
@@ -1,5 +1,6 @@ package com.ruoyi.order.request; import com.baomidou.mybatisplus.annotation.TableField; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -18,5 +19,16 @@ @ApiModelProperty("现场照片") private List<String> photo; @ApiModelProperty("是否虚假订单") private Integer fake; @ApiModelProperty("现场照片(多张照片 ','隔开)") @TableField("card_pic") private String cardPic; @ApiModelProperty("现场照片(多张照片 ','隔开)") @TableField("machine_pic") private String machinePic; @ApiModelProperty("现场照片(多张照片 ','隔开)") @TableField("paper_pic") private String paperPic; } ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/request/UserOrderRequest.java
@@ -63,4 +63,7 @@ @ApiModelProperty("下单用户id") private Integer userId; } ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderServiceImpl.java
@@ -89,18 +89,23 @@ // 计算订单总额及总订单数量 BigDecimal totalMoney; int orderNumber; int fakeNumber; if (list.isEmpty()) { totalMoney = BigDecimal.ZERO; orderNumber = 0; fakeNumber = 0; } else { totalMoney = list.stream().map(OrderQueryVO::getTotalPrice) .filter(Objects::nonNull).reduce(BigDecimal.ZERO, BigDecimal::add); orderNumber = list.stream().filter(order -> order.getNumber() != null) .mapToInt(OrderQueryVO::getNumber).sum(); fakeNumber = list.stream().filter(order -> order.getFakeCount() != null) .mapToInt(OrderQueryVO::getNumber).sum(); } return new OrderResultVO(totalMoney, orderNumber, list); OrderResultVO(totalMoney, orderNumber, list,fakeNumber); }
@@ -23,5 +23,6 @@ @ApiModelProperty("订单数量") private Integer number; private Integer fakeCount; } ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/vo/OrderResultVO.java
@@ -21,6 +21,8 @@ @ApiModelProperty("订单总数量") private Integer orderTotalNumber; @ApiModelProperty("虚假订单数量") private Integer fakeTotalNumber; @ApiModelProperty("柱状图数据") private List<OrderQueryVO> orderList; @@ -28,9 +30,10 @@ public OrderResultVO() { } public OrderResultVO(BigDecimal orderTotalMoney, Integer orderTotalNumber, List<OrderQueryVO> orderList) { public OrderResultVO(BigDecimal orderTotalMoney, Integer orderTotalNumber, List<OrderQueryVO> orderList,Integer fakeTotalNumber) { this.orderTotalMoney = orderTotalMoney; this.orderTotalNumber = orderTotalNumber; this.orderList = orderList; this.fakeTotalNumber = fakeTotalNumber; } } ruoyi-service/ruoyi-order/src/main/resources/mapper/order/OrderMapper.xml
@@ -25,6 +25,7 @@ <result column="createTime" property="createTime"/> <result column="updateTime" property="updateTime"/> <result column="is_delete" property="isDelete"/> <result column="fake" property="fake"/> <result column="apply_reason" property="applyReason"/> </resultMap> @@ -32,7 +33,8 @@ <select id="orderCountByYear" resultType="com.ruoyi.order.vo.OrderQueryVO"> SELECT DATE_FORMAT(createTime, '%Y-%m') AS dateTime, COUNT(*) AS number, sum(IFNULL(order_money, 0)) as totalPrice sum(IFNULL(order_money, 0)) as totalPrice, COUNT(CASE WHEN fake = 1 THEN 1 END) AS fakeCount FROM t_order <where> is_delete = 0 @@ -54,7 +56,8 @@ <select id="orderCountByWeek" resultType="com.ruoyi.order.vo.OrderQueryVO"> SELECT DATE_FORMAT(createTime, '%Y-%m-%d') AS dateTime, COUNT(*) AS number, sum(IFNULL(order_money, 0)) as totalPrice sum(IFNULL(order_money, 0)) as totalPrice, COUNT(CASE WHEN fake = 1 THEN 1 END) AS fakeCount FROM t_order <where> is_delete = 0 @@ -76,7 +79,8 @@ <select id="orderCountByMonth" resultType="com.ruoyi.order.vo.OrderQueryVO"> SELECT DATE_FORMAT(createTime, '%Y-%m-%d') AS dateTime, COUNT(*) AS number, sum(IFNULL(order_money, 0)) as totalPrice sum(IFNULL(order_money, 0)) as totalPrice, COUNT(CASE WHEN fake = 1 THEN 1 END) AS fakeCount FROM t_order <where> is_delete = 0 @@ -99,7 +103,8 @@ <select id="orderCountByToday" resultType="com.ruoyi.order.vo.OrderQueryVO"> SELECT DATE_FORMAT(createTime, '%Y-%m-%d') AS dateTime, COUNT(*) AS number, sum(IFNULL(order_money, 0)) as totalPrice sum(IFNULL(order_money, 0)) as totalPrice, COUNT(CASE WHEN fake = 1 THEN 1 END) AS fakeCount FROM t_order <where> is_delete = 0 @@ -414,7 +419,8 @@ <select id="orderCountByTimeRange" resultType="com.ruoyi.order.vo.OrderQueryVO"> SELECT DATE_FORMAT(createTime, '%Y-%m-%d') AS dateTime, COUNT(*) AS number, sum(IFNULL(order_money, 0)) as totalPrice sum(IFNULL(order_money, 0)) as totalPrice, COUNT(CASE WHEN fake = 1 THEN 1 END) AS fakeCount FROM t_order <where> is_delete = 0 @@ -439,7 +445,8 @@ </select> <select id="orderCountByTimeRangeYear" resultType="com.ruoyi.order.vo.OrderQueryVO"> SELECT DATE_FORMAT(createTime, '%Y') AS dateTime, COUNT(*) AS number, sum(IFNULL(order_money, 0)) as totalPrice SELECT DATE_FORMAT(createTime, '%Y') AS dateTime, COUNT(*) AS number, sum(IFNULL(order_money, 0)) as totalPrice, COUNT(CASE WHEN fake = 1 THEN 1 END) AS fakeCount FROM t_order <where> is_delete = 0 @@ -466,7 +473,8 @@ <select id="orderCountByTimeRangeMonth" resultType="com.ruoyi.order.vo.OrderQueryVO"> SELECT DATE_FORMAT(createTime, '%Y-%m') AS dateTime, COUNT(*) AS number, sum(IFNULL(order_money, 0)) as totalPrice sum(IFNULL(order_money, 0)) as totalPrice, COUNT(CASE WHEN fake = 1 THEN 1 END) AS fakeCount FROM t_order <where> is_delete = 0 ruoyi-service/ruoyi-worker/src/main/java/com/ruoyi/worker/service/impl/MasterWorkerServiceImpl.java
@@ -94,6 +94,7 @@ orderListVO.setLongitude(order.getLongitude()); orderListVO.setLatitude(order.getLatitude()); orderListVO.setTopSort(topSort); orderListVO.setFake(order.getFake()==null?0:order.getFake()); OrderNotHandleVO vo = new OrderNotHandleVO(distance, orderListVO); list.add(vo); } ruoyi-service/ruoyi-worker/src/main/java/com/ruoyi/worker/vo/OrderListVO.java
@@ -34,6 +34,9 @@ @ApiModelProperty("回收服务id") private Integer serveId; @ApiModelProperty("虚假订单") private Integer fake; @ApiModelProperty("回收服务名称") private String serveName;
