积分商城查数据库

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

@@ -28,13 +28,13 @@ import com.freemud.application.sdk.api.ordercenter.enums.OrderClientType;
 import com.freemud.application.sdk.api.ordercenter.enums.OrderSettlementType;
 import com.freemud.application.sdk.api.ordercenter.enums.OrderType;
 import com.freemud.application.sdk.api.ordercenter.request.OrderAffirmReq;
-import com.freemud.application.sdk.api.ordercenter.request.OrderConditionsReq;
+import com.freemud.application.sdk.api.ordercenter.request.OrderUserConditionsReq;
 import com.freemud.application.sdk.api.ordercenter.request.PaySuccessReq;
 import com.freemud.application.sdk.api.ordercenter.request.create.CreateOrderRequest;
 import com.freemud.application.sdk.api.ordercenter.request.create.DeliveryContactInfoCreateReq;
 import com.freemud.application.sdk.api.ordercenter.request.create.OrderItemCreateReq;
 import com.freemud.application.sdk.api.ordercenter.request.create.OrderSettlementCreateReq;
-import com.freemud.application.sdk.api.ordercenter.response.BaseDownLoadResponse;
+import com.freemud.application.sdk.api.ordercenter.response.QueryOrderForUserResp;
 import com.freemud.application.sdk.api.ordercenter.response.orderInfo.DeliveryContactInfoResp;
 import com.freemud.application.sdk.api.ordercenter.response.orderInfo.OrderInfoReqs;
 import com.freemud.application.sdk.api.ordercenter.response.orderInfo.OrderItemResp;
@@ -239,8 +239,7 @@ public class PointsMallOrderServiceImpl implements PointsMallOrderService {
                 return ResponseUtil.error(ResponseResult.ORDER_QUERYORDER_ERROR.getCode(), "查询订单结束时间格式不正确");
             }
         }
-
-        OrderConditionsReq queryOrdersDto = new OrderConditionsReq();
+        OrderUserConditionsReq queryOrdersDto = new OrderUserConditionsReq();
         queryOrdersDto.setUserId(userLoginInfoDto.getMemberId());
         queryOrdersDto.setPartnerId(userLoginInfoDto.getPartnerId());
         queryOrdersDto.setPageSize(queryOrderVo.getPageSize() != null ? queryOrderVo.getPageSize() : 500);
@@ -248,26 +247,26 @@ public class PointsMallOrderServiceImpl implements PointsMallOrderService {
         queryOrdersDto.setStartTimestamp(startDate.getTime() / 1000);
         queryOrdersDto.setEndTimestamp(endDate.getTime() / 1000);
         queryOrdersDto.setOrderClients(Arrays.asList(OrderClientType.I_MEMBER.getIndex()));
-        queryOrdersDto.setBizType(4);
+        queryOrdersDto.setBizTypes(Arrays.asList(4));
         if (queryOrderVo.getQueryOrderStatus() != null) {
             if (queryOrderVo.getQueryOrderStatus() == 1) {
-                queryOrdersDto.setOrderStatus(2);
+                queryOrdersDto.setOrderStatus(Arrays.asList(2));
             }
             if (queryOrderVo.getQueryOrderStatus() == 2) {
-                queryOrdersDto.setOrderStatus(6);
+                queryOrdersDto.setOrderStatus(Arrays.asList(6));
             }
             if (queryOrderVo.getQueryOrderStatus() == 3) {
-                queryOrdersDto.setOrderStatuses(Arrays.asList(2, 6));
+                queryOrdersDto.setOrderStatus(Arrays.asList(2, 6));
             }
         } else {
-            queryOrdersDto.setOrderStatus(6);
+            queryOrdersDto.setOrderStatus(Arrays.asList(6));
         }
-        BaseDownLoadResponse<List<OrderInfoReqs>> response = orderDownLoadSdkService.queryOrderByConditions(queryOrdersDto, LogThreadLocal.getTrackingNo());
-        if (null == response || null == response.getResult()) {
+        com.freemud.application.sdk.api.ordercenter.response.BaseResponse<QueryOrderForUserResp> userorderResponse = orderSdkService.queryOrderForUser(queryOrdersDto, LogThreadLocal.getTrackingNo());
+        if (null == userorderResponse || null == userorderResponse.getResult()) {
             return ResponseUtil.success();
         }
         List<ScoreRecordVo> result = new ArrayList<>();
-        List<OrderInfoReqs> list = response.getResult();
+        List<OrderInfoReqs> list = userorderResponse.getResult().getItemList();
         list.forEach(order -> {
             ScoreRecordVo responseVo = new ScoreRecordVo();
             responseVo.setOrderCode(order.getOrderCode());
@@ -300,7 +299,7 @@ public class PointsMallOrderServiceImpl implements PointsMallOrderService {
         });
         PageInfo<ScoreRecordVo> pageInfo = new PageInfo<>();
         pageInfo.setList(result);
-        pageInfo.setTotal(response.getTotalNum());
+        pageInfo.setTotal(userorderResponse.getResult().getTotal());
         return ResponseUtil.success(pageInfo);
     }