需求

src/main/java/com/gree/mall/manager/bean/coupon/CouponVO.java

@@ -48,8 +48,6 @@ public class CouponVO  {
     @ApiModelProperty(value = "每人限领次数")
     private Integer receiveLimitCount;
 
-    @ApiModelProperty(value = "显示时间")
-    private Date displayTime;
 
     @ApiModelProperty(value = "状态")
     private CouponStatusEnum flag;

src/main/java/com/gree/mall/manager/controller/order/OrderRefundController.java

@@ -30,6 +30,7 @@ public class OrderRefundController {
     @ApiOperation("列表")
     public ResponseHelper<Page<OrderRefundDetailBean>> list(HttpServletRequest request,
                                                             @ApiParam(value = "订单号",required = false) @RequestParam(required = false) String orderId,
+                                                            @ApiParam(value = "网点",required = false) @RequestParam(required = false) String websitId,
                                                             @ApiParam(value = "售后订单号",required = false) @RequestParam(required = false) String orderRefundId,
                                                             @ApiParam(value = "用户名",required = false) @RequestParam(required = false) String userName,
                                                             @ApiParam(value = "手机号",required = false) @RequestParam(required = false) String phone,
@@ -42,7 +43,7 @@ public class OrderRefundController {
                                                             @ApiParam(value = "页大小",required = true) @RequestParam(required = true) Integer pageSize
     ) throws RemoteServiceException {
         IPage<OrderRefundDetailBean> list = orderRefundLogic
-                .list(request,orderId, orderRefundId, userName, phone, orderStatus, startCreateTime, endCreateTime, startExamineTime, endExamineTime, pageNum, pageSize);
+                .list(websitId,request,orderId, orderRefundId, userName, phone, orderStatus, startCreateTime, endCreateTime, startExamineTime, endExamineTime, pageNum, pageSize);
         return ResponseHelper.success(list);
     }
 

src/main/java/com/gree/mall/manager/logic/order/OrderRefundLogic.java

@@ -72,7 +72,7 @@ public class OrderRefundLogic {
      *
      * @return
      */
-    public IPage<OrderRefundDetailBean> list(HttpServletRequest request, String orderId, String orderRefundId, String userName, String phone, String orderStatus,
+    public IPage<OrderRefundDetailBean> list(String websitId,HttpServletRequest request, String orderId, String orderRefundId, String userName, String phone, String orderStatus,
                                              String startCreateTime, String endCreateTime, String startExamineTime, String endExamineTime,
                                              Integer pageNum, Integer pageSize) {
         AdminUserCom adminUser = commonLogic.getAdminUser(request);
@@ -85,6 +85,7 @@ public class OrderRefundLogic {
                 .like(StringUtils.isNotEmpty(userName), OrderRefund::getUserName, userName)
                 .and(StringUtils.isNotEmpty(phone), v -> v.like(OrderRefund::getPhone, phone).or().like(OrderRefund::getRecePhone, phone))
                 .eq(StringUtils.isNotEmpty(orderStatus), OrderRefund::getOrderStatus, orderStatus)
+                .eq(StringUtils.isNotEmpty(websitId), OrderRefund::getWebsitId, websitId)
                 .between(StringUtils.isNotEmpty(startCreateTime) && StringUtils.isNotEmpty(endCreateTime), OrderRefund::getCreateTime, startCreateTime, endCreateTime + " 23:59:59")
                 .between(StringUtils.isNotEmpty(startExamineTime) && StringUtils.isNotEmpty(endExamineTime), OrderRefund::getExamineTime, startExamineTime, endExamineTime + " 23:59:59")
                 .orderByDesc(OrderRefund::getCreateTime).page(new Page<>(pageNum, pageSize));

src/main/java/com/gree/mall/manager/logic/order/OrderShareLogic.java

@@ -69,6 +69,7 @@ public class OrderShareLogic {
                 .eq(StringUtils.isNotEmpty(userId), OrderShare::getUserId, userId)
                 .like(StringUtils.isNotEmpty(orderShareId), OrderShare::getOrderShareId, orderShareId)
                 .like(StringUtils.isNotEmpty(orderId), OrderShare::getOrderId, orderId)
+                .eq(StringUtils.isNotEmpty(websitId), OrderShare::getWebsitId, websitId)
                 .like(StringUtils.isNotEmpty(workUserName), OrderShare::getWorkUserName, workUserName)
                 .like(StringUtils.isNotEmpty(phone), OrderShare::getPhone, phone)
                 .eq(StringUtils.isNotEmpty(status), OrderShare::getStatus, status)
@@ -385,7 +386,9 @@ public class OrderShareLogic {
      * @return
      */
     public BigDecimal totalAmount(String userId) {
-        List<OrderShare> list = orderShareService.lambdaQuery().eq(OrderShare::getUserId, userId).list();
+        List<OrderShare> list = orderShareService.lambdaQuery().eq(OrderShare::getUserId, userId)
+                .ne(OrderShare::getOrderStatus,"CANCEL")
+                .list();
         return list.stream().map(OrderShare::getAmount).reduce(BigDecimal::add).orElse(new BigDecimal(0));
     }