Merge branch 'feature/xgh/bug/0527' into 'master'

积分商城订单

See merge request !1858

haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/controller/marketing/MemberMarketingController.java

@@ -11,6 +11,10 @@ import java.util.Map;
 import java.util.Set;
 import java.util.stream.Collectors;
 
+import com.alibaba.fastjson.JSON;
+import com.gic.business.order.dto.ordermanage.ListOrderDTO;
+import com.gic.business.order.qdto.ordermanage.ListOrderManageQDTO;
+import com.gic.business.order.service.ordermanage.WebOrderManageApiService;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.logging.log4j.LogManager;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -92,15 +96,21 @@ public class MemberMarketingController extends WebBaseController {
     private AchievementService achievementService;
     @Autowired
     private IntegralmallService integralMallService;
+    @Autowired
+    private WebOrderManageApiService webOrderManageApiService;
 
     // 会员积分商城订单数
     @RequestMapping("/member/integral-order-num")
     private RestResponse<Object> getIntegralOrderNum(String enterpriseId, String memberId) {
-        Page<IntegralMallExchangeLogDTO> page = new Page<>();
-        page.setCurrentPage(1);
-        page.setPageSize(20);
-        page = integralMallService.findExchangeLogFromMember(enterpriseId, memberId, null, null, "1,2,3", null, page);
-        return  RestResponse.successResult(page.getTotalCount());
+        ListOrderManageQDTO qdto = new ListOrderManageQDTO();
+        qdto.setEnterpriseId(enterpriseId);
+        qdto.setMemberId(memberId);
+        qdto.setBusinessType(2);
+        logger.info("积分商城订单查询,qdto={}", JSON.toJSONString(qdto));
+        qdto.setPageNum(1);
+        qdto.setPageSize(1);
+        ServiceResponse<Page<ListOrderDTO>> ret = webOrderManageApiService.listOrder(qdto);
+        return RestResponse.successResult(ret.getResult().getTotalCount()) ;
     }
     
     /**