修改问题

xinkeaboard-server/b2b2c-web/src/main/java/com/slodon/b2b2c/controller/statistics/seller/SellerEnquiryAnalysisController.java

@@ -83,7 +83,7 @@ public class SellerEnquiryAnalysisController extends BaseController {
         memberEnquiryValidExample.setValidStatus(EnquiryConst.ENQUIRY_VALID);
         memberEnquiryValidExample.setStatusNotEqual(EnquiryConst.ENQUIRY_DELETE);
         memberEnquiryValidExample.setItemTypeIn(itemTypeStr);
-        memberEnquiryNewExample.setWebSite(webSite);
+        memberEnquiryValidExample.setWebSite(webSite);
         enquiryOverviewVO.setValidInquiryNum(memberEnquiryModel.getMemberEnquiryCount(memberEnquiryValidExample));
 
         //待分配询盘数
@@ -91,7 +91,7 @@ public class SellerEnquiryAnalysisController extends BaseController {
         memberEnquiryToAssignExample.setStoreId(vendor.getStoreId());
         memberEnquiryToAssignExample.setStatusEqual(EnquiryConst.ENQUIRY_NEW);
         memberEnquiryToAssignExample.setItemTypeIn(itemTypeStr);
-        memberEnquiryNewExample.setWebSite(webSite);
+        memberEnquiryToAssignExample.setWebSite(webSite);
         enquiryOverviewVO.setEnquiryToBeAssignNum(memberEnquiryModel.getMemberEnquiryCount(memberEnquiryToAssignExample));
 
         return SldResponse.success(enquiryOverviewVO);

xinkeaboard-server/b2b2c-web/src/main/java/com/slodon/b2b2c/controller/statistics/seller/SellerOverviewController.java

@@ -113,17 +113,18 @@ public class SellerOverviewController extends BaseController {
         //违规商品数
         GoodsExample goodsExample = new GoodsExample();
         goodsExample.setStoreId(vendor.getStoreId());
+        goodsExample.setWebSite(webSite);
         goodsExample.setState(GoodsConst.GOODS_STATE_LOWER_BY_SYSTEM);
         goodsExample.setIsDelete(GoodsConst.GOODS_IS_DELETE_NO);
         sellerWaitDeal.setSysLowerGoodsNum(goodsModel.getGoodsCount(goodsExample));
 
-        //站点违规商品数
-        goodsExample = new GoodsExample();
-        goodsExample.setWebSite(webSite);
-        goodsExample.setStoreId(vendor.getStoreId());
-        goodsExample.setState(GoodsConst.GOODS_STATE_LOWER_BY_SYSTEM);
-        goodsExample.setIsDelete(GoodsConst.GOODS_IS_DELETE_NO);
-        sellerWaitDeal.setSysWebSiteLowerGoodsNum(goodsModel.getGoodsCount(goodsExample));
+//        //站点违规商品数
+//        goodsExample = new GoodsExample();
+//        goodsExample.setWebSite(webSite);
+//        goodsExample.setStoreId(vendor.getStoreId());
+//        goodsExample.setState(GoodsConst.GOODS_STATE_LOWER_BY_SYSTEM);
+//        goodsExample.setIsDelete(GoodsConst.GOODS_IS_DELETE_NO);
+//        sellerWaitDeal.setSysWebSiteLowerGoodsNum(goodsModel.getGoodsCount(goodsExample));
 
         //待确认结算单数
         BillExample billExample = new BillExample();
@@ -139,6 +140,7 @@ public class SellerOverviewController extends BaseController {
 
         //询盘总数
         MemberEnquiryExample memberEnquiryTotalExample = new MemberEnquiryExample();
+        memberEnquiryTotalExample.setWebSite(webSite);
         memberEnquiryTotalExample.setStoreId(vendor.getStoreId());
         memberEnquiryTotalExample.setStatusNotEqual(EnquiryConst.ENQUIRY_DELETE);
         memberEnquiryTotalExample.setItemTypeIn(itemTypeStr);
@@ -148,6 +150,7 @@ public class SellerOverviewController extends BaseController {
         Date enquiryEndTime = new Date();
         DateTime enquiryStartTime = DateUtil.beginOfDay(enquiryEndTime);
         MemberEnquiryExample memberEnquiryNewExample = new MemberEnquiryExample();
+        memberEnquiryNewExample.setWebSite(webSite);
         memberEnquiryNewExample.setStoreId(vendor.getStoreId());
         memberEnquiryNewExample.setCreateTimeGte(com.slodon.b2b2c.core.util.DateUtil.dateToString(enquiryStartTime, com.slodon.b2b2c.core.util.DateUtil.DATE_FORMAT_FIVE));
         memberEnquiryNewExample.setCreateTimeLte(com.slodon.b2b2c.core.util.DateUtil.dateToString(enquiryEndTime, com.slodon.b2b2c.core.util.DateUtil.DATE_FORMAT_FIVE));
@@ -157,6 +160,7 @@ public class SellerOverviewController extends BaseController {
 
         //有效询盘数
         MemberEnquiryExample memberEnquiryValidExample = new MemberEnquiryExample();
+        memberEnquiryValidExample.setWebSite(webSite);
         memberEnquiryValidExample.setStoreId(vendor.getStoreId());
         memberEnquiryValidExample.setValidStatus(EnquiryConst.ENQUIRY_VALID);
         memberEnquiryValidExample.setStatusNotEqual(EnquiryConst.ENQUIRY_DELETE);
@@ -165,18 +169,19 @@ public class SellerOverviewController extends BaseController {
 
         //待分配询盘数
         MemberEnquiryExample memberEnquiryToAssignExample = new MemberEnquiryExample();
+        memberEnquiryToAssignExample.setWebSite(webSite);
         memberEnquiryToAssignExample.setStoreId(vendor.getStoreId());
         memberEnquiryToAssignExample.setStatusEqual(EnquiryConst.ENQUIRY_NEW);
         memberEnquiryToAssignExample.setItemTypeIn(itemTypeStr);
         sellerWaitDeal.setEnquiryToBeAssignNum(memberEnquiryModel.getMemberEnquiryCount(memberEnquiryToAssignExample));
 
-        //站点待分配询盘数
-        memberEnquiryToAssignExample = new MemberEnquiryExample();
-        memberEnquiryToAssignExample.setWebSite(webSite);
-        memberEnquiryToAssignExample.setStoreId(vendor.getStoreId());
-        memberEnquiryToAssignExample.setStatusEqual(EnquiryConst.ENQUIRY_NEW);
-        memberEnquiryToAssignExample.setItemTypeIn(itemTypeStr);
-        sellerWaitDeal.setWebSiteEnquiryToBeAssignNum(memberEnquiryModel.getMemberEnquiryCount(memberEnquiryToAssignExample));
+//        //站点待分配询盘数
+//        memberEnquiryToAssignExample = new MemberEnquiryExample();
+//        memberEnquiryToAssignExample.setWebSite(webSite);
+//        memberEnquiryToAssignExample.setStoreId(vendor.getStoreId());
+//        memberEnquiryToAssignExample.setStatusEqual(EnquiryConst.ENQUIRY_NEW);
+//        memberEnquiryToAssignExample.setItemTypeIn(itemTypeStr);
+//        sellerWaitDeal.setWebSiteEnquiryToBeAssignNum(memberEnquiryModel.getMemberEnquiryCount(memberEnquiryToAssignExample));
 
         result.setSellerWaitDeal(sellerWaitDeal);
 

xinkeaboard-server/b2b2c-web/src/main/java/com/slodon/b2b2c/vo/statistics/SellerPresentIndexVO.java

@@ -37,8 +37,8 @@ public class SellerPresentIndexVO {
         @ApiModelProperty("违规商品数")
         private Integer sysLowerGoodsNum;
 
-        @ApiModelProperty("站点违规商品数")
-        private Integer sysWebSiteLowerGoodsNum;
+//        @ApiModelProperty("站点违规商品数")
+//        private Integer sysWebSiteLowerGoodsNum;
 
         @ApiModelProperty("待确认结算单数")
         private Integer confirmBillNum;
@@ -55,8 +55,8 @@ public class SellerPresentIndexVO {
         @ApiModelProperty("待分配询盘数")
         private Integer enquiryToBeAssignNum;
 
-        @ApiModelProperty("站点待分配询盘数")
-        private Integer webSiteEnquiryToBeAssignNum;
+//        @ApiModelProperty("站点待分配询盘数")
+//        private Integer webSiteEnquiryToBeAssignNum;
     }
 
 }