店铺管理--概况+商品列表区分站点

xinkeaboard-server/b2b2c-entity/src/main/java/com/slodon/b2b2c/member/example/MemberEnquiryExample.java

@@ -65,6 +65,11 @@ public class MemberEnquiryExample implements Serializable {
     private String createTimeGte;
 
     /**
+     * 渠道  1-海外站；2-国内站
+     */
+    private Integer channel;
+
+    /**
      * 店铺Id查询
      */
     private Long storeId;

xinkeaboard-server/b2b2c-entity/src/main/java/com/slodon/b2b2c/member/pojo/MemberEnquiry.java

@@ -12,6 +12,10 @@ public class MemberEnquiry {
      */
     private Long id;
 
+
+
+    private Integer channel;
+
     /**
      *
      * This field was generated by MyBatis Generator.
@@ -719,4 +723,8 @@ public class MemberEnquiry {
     public void setGoodsName(String goodsName) {
         this.goodsName = goodsName;
     }
+
+    public Integer getChannel() {return channel;}
+
+    public void setChannel(Integer channel) {this.channel = channel;}
 }

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

@@ -36,6 +36,7 @@ import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.util.CollectionUtils;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.Resource;
@@ -164,6 +165,38 @@ public class SellerOverviewController extends BaseController {
         return SldResponse.success(result);
     }
 
+    @ApiOperation("首页不同站点概况实时统计数据")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "source", value = "站点来源 1:海外站 2:国内站")
+    })
+    @GetMapping("source/presentData")
+    public JsonResult<SellerSourcePresentIndexVO> indexSourcePresentData(HttpServletRequest request, @RequestParam(required = false, defaultValue = "1") Integer source) {
+        Vendor vendor = UserUtil.getUser(request, Vendor.class);
+        SellerSourcePresentIndexVO result = new SellerSourcePresentIndexVO();
+        //违规商品数
+        GoodsExample goodsExample = new GoodsExample();
+        goodsExample.setStoreId(vendor.getStoreId());
+        goodsExample.setDistributionChannel(source);
+        goodsExample.setState(GoodsConst.GOODS_STATE_LOWER_BY_SYSTEM);
+        goodsExample.setIsDelete(GoodsConst.GOODS_IS_DELETE_NO);
+        result.setSysLowerGoodsNum(goodsModel.getGoodsCount(goodsExample));
+
+        //询盘数据
+        List<String> itemTypes = new ArrayList<>();
+        itemTypes.add(EnquiryConst.ENQUIRY_ITEM_TYPE_GOODS);
+        itemTypes.add(EnquiryConst.ENQUIRY_ITEM_TYPE_SHOP);
+        String itemTypeStr = StringUtil.listToString(itemTypes);
+
+        //待分配询盘数
+        MemberEnquiryExample memberEnquiryToAssignExample = new MemberEnquiryExample();
+        memberEnquiryToAssignExample.setStoreId(vendor.getStoreId());
+        memberEnquiryToAssignExample.setChannel(source);
+        memberEnquiryToAssignExample.setStatusEqual(EnquiryConst.ENQUIRY_NEW);
+        memberEnquiryToAssignExample.setItemTypeIn(itemTypeStr);
+        result.setEnquiryToBeAssignNum(memberEnquiryModel.getMemberEnquiryCount(memberEnquiryToAssignExample));
+        return SldResponse.success(result);
+    }
+
     @ApiOperation("支付或下单金额趋势")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "startTime", value = "开始时间", required = true),

xinkeaboard-server/b2b2c-web/src/main/java/com/slodon/b2b2c/controller/system/seller/SellerSettingController.java

@@ -55,6 +55,14 @@ public class SellerSettingController extends BaseController {
         return SldResponse.success(list);
     }
 
+
+    @ApiOperation("获取站点配置信息")
+    @GetMapping("getSiteSettingList")
+    public JsonResult<List<Setting>> getSiteSettingList() {
+        List<Setting> list = settingModel.getSiteSetting();
+        return SldResponse.success(list);
+    }
+
     /**
      * 获取Setting参数
      *

xinkeaboard-server/b2b2c-web/src/main/java/com/slodon/b2b2c/model/seller/VendorModel.java

@@ -126,8 +126,8 @@ public class VendorModel {
         vendorExample.setVendorMobile(vendorRegisterDTO.getVendorMobile());
         vendorExample.setIsAllowLoginNotEquals(VendorConst.LOGOUT_ALLOW_LOGIN);
         List<Vendor> vendorList = vendorReadMapper.listByExample(vendorExample);
-        // todo 测试期间 手机号验证放开
-//        AssertUtil.isTrue(!CollectionUtils.isEmpty(vendorList), "该手机号已被其他账号绑定，请重新填写");
+
+        AssertUtil.isTrue(!CollectionUtils.isEmpty(vendorList), "此手机号已绑定商家账号");
 
         Vendor vendor = new Vendor();
         PropertyUtils.copyProperties(vendor, vendorRegisterDTO);

xinkeaboard-server/b2b2c-web/src/main/java/com/slodon/b2b2c/model/system/SettingModel.java

@@ -155,4 +155,10 @@ public class SettingModel {
         }
         return settingList;
     }
+
+    public List<Setting> getSiteSetting() {
+        SettingExample example = new SettingExample();
+        example.setNameLike("site_source_");
+        return settingReadMapper.listByExample(example);
+    }
 }

xinkeaboard-server/b2b2c-web/src/main/java/com/slodon/b2b2c/vo/goods/GoodsVO.java

@@ -25,6 +25,9 @@ public class GoodsVO {
     @ApiModelProperty("商品ID")
     private Long goodsId;
 
+    @ApiModelProperty("发布渠道 1-海外站；2-国内站")
+    private Integer distributionChannel;
+
     @ApiModelProperty("商品名称")
     private String goodsName;
 
@@ -116,6 +119,7 @@ public class GoodsVO {
 
     public GoodsVO(Goods goods, GoodsExtend goodsExtend) {
         this.goodsId = goods.getGoodsId();
+        this.distributionChannel = goods.getDistributionChannel();
         this.goodsName = goods.getGoodsName();
         this.goodsBrief = goods.getGoodsBrief();
         this.categoryPath = goods.getCategoryPath();

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

@@ -0,0 +1,19 @@
+package com.slodon.b2b2c.vo.statistics;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * seller首页概况实时统计vo
+ */
+@Data
+public class SellerSourcePresentIndexVO {
+
+    @ApiModelProperty("违规商品数")
+    private Integer sysLowerGoodsNum;
+
+    @ApiModelProperty("待分配询盘数")
+    private Integer enquiryToBeAssignNum;
+
+
+}

xinkeaboard-server/b2b2c-web/src/main/resources/mapper/read/goods/GoodsReadMapper.xml

@@ -3,6 +3,7 @@
 <mapper namespace="com.slodon.b2b2c.dao.read.goods.GoodsReadMapper">
   <resultMap id="resultMap" type="com.slodon.b2b2c.goods.pojo.Goods">
     <id column="goods_id" property="goodsId" />
+    <result column="distribution_channel" property="distributionChannel" />
     <result column="goods_name" property="goodsName" />
     <result column="goods_brief" property="goodsBrief" />
     <result column="keyword" property="keyword" />
@@ -68,6 +69,9 @@
         <if test="example.goodsIdNotIn != null and example.goodsIdNotIn != ''">
           AND `goods_id` not in (${example.goodsIdNotIn})
         </if>
+        <if test="example.distributionChannel != null">
+            AND `distribution_channel` = #{example.distributionChannel}
+        </if>
         <if test="example.goodsName != null">
           AND `goods_name` = #{example.goodsName}
         </if>

xinkeaboard-server/b2b2c-web/src/main/resources/mapper/read/member/MemberEnquiryReadMapper.xml

@@ -3,6 +3,7 @@
 <mapper namespace="com.slodon.b2b2c.dao.read.member.MemberEnquiryReadMapper">
     <resultMap id="resultMap" type="com.slodon.b2b2c.member.pojo.MemberEnquiry">
         <id column="id" property="id"/>
+        <result column="channel" property="channel"/>
         <result column="name" property="name"/>
         <result column="email" property="email"/>
         <result column="phone_code" property="phoneCode"/>
@@ -44,6 +45,9 @@
                 <if test="example.statusNotEqual != null">
                     AND `status` != #{example.statusNotEqual}
                 </if>
+                <if test="example.channel != null">
+                    AND `channel` = #{example.channel}
+                </if>
                 <if test="example.storeId != null">
                     AND `store_id` = #{example.storeId}
                 </if>

xinkeaboard-server/b2b2c-web/src/main/resources/mapper/read/system/SettingReadMapper.xml

@@ -37,6 +37,9 @@
         <if test="example.value != null">
           AND `value` = #{example.value}
         </if>
+        <if test="example.nameLike != null">
+          AND `name` like concat('%',#{example.nameLike},'%')
+        </if>
       </trim>
     </if>
   </sql>

xinkeaboard-server/doc/DDL/update.sql

@@ -5,4 +5,7 @@ ADD COLUMN member_type TINYINT NOT NULL DEFAULT 1 COMMENT '会员类型 1:海外
 
 
 ALTER TABLE goods
-ADD COLUMN distribution_channel TINYINT NOT NULL DEFAULT 1 COMMENT '发布渠道 1：国外站 2：国内站' AFTER goods_id;
+ADD COLUMN distribution_channel TINYINT NOT NULL DEFAULT 1 COMMENT '发布渠道 1：国外站 2：国内站' AFTER goods_id;
+
+
+ALTER TABLE enquiry ADD COLUMN channel TINYINT NOT NULL DEFAULT 1 COMMENT '询盘渠道 1:海外门户 2:国内分销门户';