积分商城

order-application-service/src/main/java/cn/freemud/controller/OrderController.java

@@ -376,12 +376,21 @@ public class OrderController {
     }
 
     /**
-     * 积分兑换记录查询（农工商加开个店积分商城）
+     * 积分兑换记录查询（农工商）
      */
     @ApiAnnotation(logMessage = "scoreRecord")
     @PostMapping("/scoreRecord")
     public BaseResponse scoreRecord(@Validated @LogParams @RequestBody QueryOrderVo queryOrderVo) {
-        return pointsMallOrderService.scoreRecord(queryOrderVo);
+        return orderservice.scoreRecord(queryOrderVo);
+    }
+
+    /**
+     * 开个店积分商城-积分兑换记录查询
+     */
+    @ApiAnnotation(logMessage = "scoreRecords")
+    @PostMapping("/scoreRecords")
+    public BaseResponse scoreRecords(@Validated @LogParams @RequestBody QueryOrderVo queryOrderVo) {
+        return pointsMallOrderService.scoreRecords(queryOrderVo);
     }
 
     /**

order-application-service/src/main/java/cn/freemud/service/Orderservice.java

@@ -159,7 +159,7 @@ public interface Orderservice {
     BaseResponse spellGroupOrderFailRefund(SpellGroupFailRefundVo refundVo);
 
 
-//    BaseResponse scoreRecord(QueryOrderVo queryOrderVo);
+    BaseResponse scoreRecord(QueryOrderVo queryOrderVo);
 
     /**
      * 【ID1028455】 【订单】非码-腾讯有数数据上报V1.0.0

order-application-service/src/main/java/cn/freemud/service/PointsMallOrderService.java

@@ -12,7 +12,7 @@ public interface PointsMallOrderService {
     BaseResponse createOrder(CreateOrderVo createOrderVo);
 
 
-    BaseResponse scoreRecord(QueryOrderVo queryOrderVo);
+    BaseResponse scoreRecords(QueryOrderVo queryOrderVo);
 
     BaseResponse scoreRecordDetail(QueryOrderVo queryOrderVo);
 }

order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java

@@ -4075,6 +4075,65 @@ public class OrderServiceImpl implements Orderservice {
         return ResponseUtil.success();
     }
 
+
+    @Override
+    public BaseResponse scoreRecord(QueryOrderVo queryOrderVo) {
+        AssortmentCustomerInfoVo userLoginInfoDto = customerInfoManager.getCustomerInfoByObject(queryOrderVo.getSessionId());
+        if (userLoginInfoDto == null || StringUtils.isBlank(userLoginInfoDto.getMemberId())) {
+            return ResponseUtil.error(ResponseResult.NOT_LOGIN);
+        }
+        Date startDate;
+        Date endDate;
+        if (StringUtils.isBlank(queryOrderVo.getStartDate()) || StringUtils.isBlank(queryOrderVo.getEndDate())) {
+            Date now = new Date();
+            startDate = DateUtil.addMonths(now, -6);
+            endDate = DateUtil.addDays(now, 1);
+        } else {
+            String startDateStr = queryOrderVo.getStartDate() + " 00:00:00";
+            String endDateStr = queryOrderVo.getEndDate() + " 23:59:59";
+            startDate = DateUtil.convert2Date(startDateStr, "yyyy-MM-dd HH:mm:ss");
+            if (startDate == null) {
+                return ResponseUtil.error(ResponseResult.ORDER_QUERYORDER_ERROR.getCode(), "查询订单开始时间格式不正确");
+            }
+            endDate = DateUtil.convert2Date(endDateStr, "yyyy-MM-dd HH:mm:ss");
+            if (endDate == null) {
+                return ResponseUtil.error(ResponseResult.ORDER_QUERYORDER_ERROR.getCode(), "查询订单结束时间格式不正确");
+            }
+        }
+
+        OrderConditionsReq queryOrdersDto = new OrderConditionsReq();
+        queryOrdersDto.setUserId(userLoginInfoDto.getMemberId());
+        queryOrdersDto.setPartnerId(userLoginInfoDto.getPartnerId());
+        queryOrdersDto.setPageSize(queryOrderVo.getPageSize() != null ? queryOrderVo.getPageSize() : 500);
+        queryOrdersDto.setPageNum(queryOrderVo.getPageNumber() != null ? queryOrderVo.getPageNumber() : 1);
+        queryOrdersDto.setStartTimestamp(startDate.getTime() / 1000);
+        queryOrdersDto.setEndTimestamp(endDate.getTime() / 1000);
+        queryOrdersDto.setOrderClients(Arrays.asList(OrderClientType.I_MEMBER.getIndex()));
+        queryOrdersDto.setBizType(4);
+        queryOrdersDto.setOrderStatus(OrderStatus.CALCEL.getCode());
+//        queryOrdersDto.setPayStatuses(Arrays.asList(PayStatus.HAVE_PAID.getCode()));
+        BaseDownLoadResponse<List<OrderInfoReqs>> response = orderDownLoadSdkService.queryOrderByConditions(queryOrdersDto, LogThreadLocal.getTrackingNo());
+
+        List<ScoreRecordVo> result = new ArrayList<>();
+        if (null == response || null == response.getResult()) {
+            return ResponseUtil.success(result);
+        }
+        List<OrderInfoReqs> list = response.getResult();
+        list.forEach(order -> {
+            ScoreRecordVo responseVo = new ScoreRecordVo();
+            responseVo.setOrderCode(order.getOrderCode());
+            if (order.getCreateTime() != null) {
+                responseVo.setCreateTime(Long.parseLong(order.getCreateTime()));
+            }
+            if (CollectionUtils.isNotEmpty(order.getOrderItemList())) {
+                responseVo.setProductName(order.getOrderItemList().get(0).getProductName());
+                responseVo.setProductQuantity(order.getOrderItemList().get(0).getProductQuantity());
+            }
+            result.add(responseVo);
+        });
+        return ResponseUtil.success(result);
+    }
+
     @Override
     public BaseResponse<List<OrderCountResp>> selectCountOrdersByPartnerIds(OrderCountRequestVo orderCountRequestVo, String trackingNo) {
         OrderCountReqs orderCountReqs = new OrderCountReqs();

order-application-service/src/main/java/cn/freemud/service/impl/PointsMallOrderServiceImpl.java

@@ -12,10 +12,7 @@ import cn.freemud.entities.dto.user.CustomerPropertyBaseResponse;
 import cn.freemud.entities.dto.user.StatislScoreResponse;
 import cn.freemud.entities.dto.user.StatisticalScoreRequestVo;
 import cn.freemud.entities.dto.user.UseScoreRequest;
-import cn.freemud.entities.vo.CreateOrderResponseVo;
-import cn.freemud.entities.vo.CreateOrderVo;
-import cn.freemud.entities.vo.QueryOrderVo;
-import cn.freemud.entities.vo.ScoreRecordVo;
+import cn.freemud.entities.vo.*;
 import cn.freemud.enums.ResponseResult;
 import cn.freemud.service.CouponService;
 import cn.freemud.service.PointsMallOrderService;
@@ -219,7 +216,7 @@ public class PointsMallOrderServiceImpl implements PointsMallOrderService {
 
 
     @Override
-    public BaseResponse scoreRecord(QueryOrderVo queryOrderVo) {
+    public BaseResponse scoreRecords(QueryOrderVo queryOrderVo) {
         AssortmentCustomerInfoVo userLoginInfoDto = customerInfoManager.getCustomerInfoByObject(queryOrderVo.getSessionId());
         if (userLoginInfoDto == null || StringUtils.isBlank(userLoginInfoDto.getMemberId())) {
             return ResponseUtil.error(ResponseResult.NOT_LOGIN);
@@ -266,11 +263,10 @@ public class PointsMallOrderServiceImpl implements PointsMallOrderService {
             queryOrdersDto.setOrderStatus(6);
         }
         BaseDownLoadResponse<List<OrderInfoReqs>> response = orderDownLoadSdkService.queryOrderByConditions(queryOrdersDto, LogThreadLocal.getTrackingNo());
-
-        List<ScoreRecordVo> result = new ArrayList<>();
         if (null == response || null == response.getResult()) {
-            return ResponseUtil.success(result);
+            return ResponseUtil.success();
         }
+        List<ScoreRecordVo> result = new ArrayList<>();
         List<OrderInfoReqs> list = response.getResult();
         list.forEach(order -> {
             ScoreRecordVo responseVo = new ScoreRecordVo();
@@ -302,6 +298,9 @@ public class PointsMallOrderServiceImpl implements PointsMallOrderService {
             }
             result.add(responseVo);
         });
+        PageInfo<ScoreRecordVo> pageInfo = new PageInfo<>();
+        pageInfo.setList(result);
+        pageInfo.setTotal(response.getTotalNum());
         return ResponseUtil.success(result);
     }
 
@@ -317,9 +316,8 @@ public class PointsMallOrderServiceImpl implements PointsMallOrderService {
         String orderCode = queryOrderVo.getOid();
         QueryByCodeResponse queryByCodeResponse = orderSdkService.getOrderInfo("", orderCode, "", null, LogThreadLocal.getTrackingNo());
 
-        List<ScoreRecordVo> result = new ArrayList<>();
         if (null == queryByCodeResponse || null == queryByCodeResponse.getResult()) {
-            return ResponseUtil.success(result);
+            return ResponseUtil.success();
         }
         OrderInfoReqs order = queryByCodeResponse.getResult();
         ScoreRecordVo responseVo = new ScoreRecordVo();
@@ -339,8 +337,7 @@ public class PointsMallOrderServiceImpl implements PointsMallOrderService {
             responseVo.setCashPrice(orderItemResp.getSalePrice().intValue());
             responseVo.setProductPicUrl(orderItemResp.getProductPicUrl());
         }
-        result.add(responseVo);
-        return ResponseUtil.success(result);
+        return ResponseUtil.success(responseVo);
     }