同步svn代码

sailun-allsteel-admin-rest/src/main/java/io/platform/store/web/controller/rest/StoreAgentBrandLvRestController.java

@@ -2,22 +2,12 @@
 package io.platform.store.web.controller.rest;
 
 
-import io.platform.store.dto.StoreAgentBrandLvDto;
-import io.platform.store.web.remote.StoreAgentBrandLvServiceRemote;
-import org.springframework.web.bind.annotation.*;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-
-import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
-import io.platform.base.common.controller.AbstractController;
-import io.platform.base.common.utils.R;
-import io.platform.base.common.validator.ValidatorUtils;
-
-import io.platform.base.common.annotation.SysLog;
-import io.platform.base.common.utils.ExecuteResult;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
-import java.util.List;
-import java.util.Map;
+import io.platform.base.common.controller.AbstractController;
+import io.platform.store.web.remote.StoreAgentBrandLvServiceRemote;
 
 
 @RestController
@@ -26,80 +16,4 @@ public class StoreAgentBrandLvRestController extends AbstractController {
 
     @Autowired
 	private StoreAgentBrandLvServiceRemote storeAgentBrandLvServiceRemote;
-	
-	/**
-	 * 所有列表
-	 */
-	@RequestMapping("/list")
-	@RequiresPermissions("store:storeAgentBrandLv:list")
-	public R list(@RequestParam Map<String, Object> params){
-		//查询列表数据
-		return R.ok().put("list", storeAgentBrandLvServiceRemote.getList(params));
-	}
-
-	/**
-	 * 分页列表
-	 */
-	@RequestMapping("/page")
-	@RequiresPermissions("store:storeAgentBrandLv:page")
-	public R page(Page page,StoreAgentBrandLvDto storeAgentBrandLvDto){
-		return R.ok().put("page", storeAgentBrandLvServiceRemote.getPage(page,storeAgentBrandLvDto));
-	}
-	/**
-	 * 信息
-	 */
-	@RequestMapping("/info/{id}")
-	@RequiresPermissions("store:storeAgentBrandLv:info")
-	public R info(@PathVariable("id") Long id){
-		StoreAgentBrandLvDto storeAgentBrandLvDto = storeAgentBrandLvServiceRemote.getOne(id);
-		return R.ok().put("storeAgentBrandLvDto", storeAgentBrandLvDto);
-	}
-	
-	/**
-	 * 保存
-	 */
-	@SysLog("保存")
-	@RequestMapping("/save")
-	@RequiresPermissions("store:storeAgentBrandLv:save")
-	public R save(@RequestBody StoreAgentBrandLvDto storeAgentBrandLvDto){
-        ValidatorUtils.validateEntity(storeAgentBrandLvDto);
-        ExecuteResult<String> result= storeAgentBrandLvServiceRemote.save(storeAgentBrandLvDto);
-        if(result.isSuccess()){
-            return R.ok(result.getSuccessMessage());
-        }else{
-            return R.error(result.getErrorMessages().get(0));
-        }
-	}
-	
-	/**
-	 * 修改
-	 */
-	@SysLog("修改")
-	@RequestMapping("/update")
-	@RequiresPermissions("store:storeAgentBrandLv:edit")
-	public R update(@RequestBody StoreAgentBrandLvDto storeAgentBrandLvDto){
-        ValidatorUtils.validateEntity(storeAgentBrandLvDto);
-        ExecuteResult<String> result= storeAgentBrandLvServiceRemote.update(storeAgentBrandLvDto);
-        if(result.isSuccess()){
-        	return R.ok(result.getSuccessMessage());
-        }else{
-        	return R.error(result.getErrorMessages().get(0));
-        }
-	}
-	
-	/**
-	 * 删除
-	 */
-	@SysLog("删除")
-	@RequestMapping("/delete")
-	@RequiresPermissions("store:storeAgentBrandLv:delete")
-	public R delete(@RequestBody List<Long> ids){
-        ExecuteResult<String> result= storeAgentBrandLvServiceRemote.deleteBatch(ids);
-        if(result.isSuccess()){
-        	return R.ok(result.getSuccessMessage());
-        }else{
-        	return R.error(result.getErrorMessages().get(0));
-        }
-	}
-
 }

sailun-allsteel-admin-rest/src/main/java/io/platform/store/web/remote/StoreAgentBrandLvServiceRemote.java

@@ -16,46 +16,4 @@ public class StoreAgentBrandLvServiceRemote {
 
     @Reference(check = false)
     private StoreAgentBrandLvServiceClient storeAgentBrandLvServiceClient;
-    /**
-     * 根据参数获取列表  无分页
-     */
-    public List<StoreAgentBrandLvDto> getList(Map<String, Object> params){
-        return storeAgentBrandLvServiceClient.queryList(params);
-    }
-    /**
-     * 根据参数进行 分页查询
-     */
-    public Page<StoreAgentBrandLvDto> getPage(Page<StoreAgentBrandLvDto> page,StoreAgentBrandLvDto storeAgentBrandLvDto){
-        return storeAgentBrandLvServiceClient.getPage(page,storeAgentBrandLvDto);
-    }
-    /**
-     * 根据主键 获取单条数据明细
-     */
-    public StoreAgentBrandLvDto getOne(Long id){
-        StoreAgentBrandLvDto storeAgentBrandLvDto = storeAgentBrandLvServiceClient.queryObject(id);
-        return storeAgentBrandLvDto;
-    }
-    /**
-     * 保存 数据
-     */
-    public ExecuteResult<String> save(StoreAgentBrandLvDto storeAgentBrandLvDto){
-
-       return  storeAgentBrandLvServiceClient.save(storeAgentBrandLvDto);
-    }
-    /**
-     * 修改单条数据
-     */
-    public ExecuteResult<String> update(StoreAgentBrandLvDto storeAgentBrandLvDto){
-
-        return storeAgentBrandLvServiceClient.update(storeAgentBrandLvDto);
-    }
-    /**
-     * 批量删除
-     */
-    public ExecuteResult<String> deleteBatch(List<Long> ids){
-        return  storeAgentBrandLvServiceClient.deleteBatch(ids);
-    }
-
-
-
 }

sailun-allsteel-app-rest/src/main/java/io/platform/app/web/controller/MyPageController.java

@@ -7,7 +7,7 @@ import io.platform.base.common.utils.ExecuteResult;
 import io.platform.base.common.utils.R;
 import io.platform.base.dto.ScanRecordPageDTO;
 import io.platform.base.dto.StoreScanRewordDTO;
-import io.platform.base.vo.StoreScanRewordVO;
+import io.platform.base.vo.StoreScanRecordVO;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -47,7 +47,9 @@ public class MyPageController {
         if (null == scanRecordPageDTO.getStoreId()) {
             return R.error("门店ID缺失!");
         }
+
         // 获取扫码记录
+        List<StoreScanRecordVO> storeScanRecord = this.myPageRemote.getPageScanRecordList(scanRecordPageDTO);
         //Long storeStock = this.myPageRemote.getStoreStock(scanRecordPageDTO);
         // 获取扫码记录
         return R.ok();
@@ -76,14 +78,6 @@ public class MyPageController {
 
 
 
-    @PostMapping("/getStoreTaskStatistics")
-    @ApiOperation("门店任务量统计")
-    public R getStoreTaskStatistics () {
-
-        return R.ok();
-    }
-
-
 
 
 

sailun-allsteel-app-rest/src/main/java/io/platform/app/web/remote/MyPageRemote.java

@@ -1,9 +1,12 @@
 package io.platform.app.web.remote;
 
 import com.alibaba.dubbo.config.annotation.Reference;
+import io.platform.base.common.exception.RRException;
 import io.platform.base.common.utils.ExecuteResult;
+import io.platform.base.dto.ScanRecordPageDTO;
 import io.platform.base.dto.StoreScanRewordDTO;
-import io.platform.base.vo.StoreScanRewordVO;
+import io.platform.base.vo.StoreScanRecordVO;
+import io.platform.scan.service.client.api.ScanRecordServiceClient;
 import io.platform.store.service.client.api.StoreRewardServiceClient;
 import org.springframework.stereotype.Service;
 
@@ -23,12 +26,22 @@ public class MyPageRemote {
     @Reference(check = false)
     private StoreRewardServiceClient storeRewardServiceClient;
 
+    @Reference(check = false)
+    private ScanRecordServiceClient scanRecordServiceClient;
+
     public ExecuteResult<List> getPageScanReword(StoreScanRewordDTO storeScanRewordDTO) {
         return this.storeRewardServiceClient.getPageScanReword(storeScanRewordDTO);
     }
 
 
-
+    /**
+     * 获取门店扫码记录
+     * @param scanRecordPageDTO
+     * @return
+     */
+    public List<StoreScanRecordVO> getPageScanRecordList(ScanRecordPageDTO scanRecordPageDTO) throws RRException {
+        return this.scanRecordServiceClient.getPageScanRecordList(scanRecordPageDTO);
+    }
 
 
 

sailun-allsteel-bus-provider/saillun-allsteel-bus-api/src/main/java/io/platform/scan/dto/AppStoreScanNumDto.java

@@ -0,0 +1,28 @@
+package io.platform.scan.dto;
+
+import lombok.Data;
+
+@Data
+public class AppStoreScanNumDto  implements java.io.Serializable{
+private static final long serialVersionUID = 5454155825314635342L;
+
+
+    /**
+     * mainId       db_column: MAIN_ID
+     */
+    private Long mainId;
+    /**
+     * 门店id       db_column: STORE_ID
+     */
+    private Long storeId;
+    /**
+     * 扫码号       db_column: SCAN_NUM
+     */
+    private String scanNum;
+    /**
+     * 创建时间       db_column: CREATE_TIME
+     */
+    private java.util.Date createTime;
+    //columns END
+
+}

sailun-allsteel-bus-provider/saillun-allsteel-bus-api/src/main/java/io/platform/scan/service/client/api/AppStoreScanNumServiceClient.java

@@ -0,0 +1,45 @@
+
+package io.platform.scan.service.client.api;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import io.platform.scan.dto.AppStoreScanNumDto;
+
+import java.util.List;
+import java.util.Map;
+import io.platform.base.common.utils.ExecuteResult;
+
+
+public interface AppStoreScanNumServiceClient{
+        /**
+         * 根据ID 查询单个对象
+         */
+        AppStoreScanNumDto queryObject(Long id);
+        /**
+         * 根据参数查询 列表  无分页
+         */
+        List<AppStoreScanNumDto>queryList(Map<String, Object> map);
+        /**
+         * 根据参数查询 对应参数的 集合大小
+         */
+        int queryTotal(Map<String, Object> map);
+        /**
+         * 保存对象
+         */
+        ExecuteResult<String> save(AppStoreScanNumDto appStoreScanNumDto);
+        /**
+         * 更新对象
+         */
+        ExecuteResult<String> update(AppStoreScanNumDto appStoreScanNumDto);
+        /**
+         * 根据主键 删除对象
+         */
+        ExecuteResult<String> delete(Long id);
+        /**
+         * 根据主键集合 批量删除
+         */
+        ExecuteResult<String> deleteBatch(List<Long> idList);
+        /**
+         * 根据分页参数 获取 分页集合
+         */
+        Page<AppStoreScanNumDto>getPage(Page<AppStoreScanNumDto>page,AppStoreScanNumDto appStoreScanNumDto);
+}

sailun-allsteel-bus-provider/saillun-allsteel-bus-api/src/main/java/io/platform/scan/service/client/api/ScanRecordServiceClient.java

@@ -3,17 +3,13 @@ package io.platform.scan.service.client.api;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import io.platform.base.common.exception.RRException;
-import io.platform.base.dto.StoreScanDTO;
-import io.platform.base.dto.StoreScanOutDTO;
-import io.platform.base.dto.StoreScanResDTO;
-import io.platform.base.dto.TyreMsgDTO;
+import io.platform.base.dto.*;
+import io.platform.base.vo.StoreScanRecordVO;
 import io.platform.scan.dto.ScanRecordDto;
 
 import java.util.List;
 import java.util.Map;
 import io.platform.base.common.utils.ExecuteResult;
-import io.platform.scan.dto.ScanRecordListDto;
-import io.platform.store.dto.StoreRewardDto;
 
 
 public interface ScanRecordServiceClient{
@@ -72,4 +68,11 @@ public interface ScanRecordServiceClient{
          * @return
          */
         ExecuteResult<StoreScanOutDTO> storeScanOutTyres(StoreScanDTO storeScanDTO);
+
+        /**
+         * 获取门店扫码记录
+         * @param scanRecordPageDTO
+         * @return
+         */
+        List<StoreScanRecordVO> getPageScanRecordList(ScanRecordPageDTO scanRecordPageDTO)  throws RRException;
 }

sailun-allsteel-bus-provider/saillun-allsteel-bus-api/src/main/java/io/platform/store/service/client/api/StoreAgentBrandLvServiceClient.java

@@ -1,52 +1,57 @@
 
 package io.platform.store.service.client.api;
 
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import io.platform.store.dto.StoreAgentBrandLvDto;
-
 import java.util.List;
 import java.util.Map;
-import io.platform.base.common.utils.ExecuteResult;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+
+import io.platform.base.common.utils.ExecuteResult;
+import io.platform.store.dto.StoreAgentBrandLvDto;
 
 public interface StoreAgentBrandLvServiceClient{
-        /**
-         * 根据ID 查询单个对象
-         */
-        StoreAgentBrandLvDto queryObject(Long id);
-        /**
-         * 根据参数查询 列表  无分页
-         */
-        List<StoreAgentBrandLvDto>queryList(Map<String, Object> map);
-        /**
-         * 根据参数查询 对应参数的 集合大小
-         */
-        int queryTotal(Map<String, Object> map);
-        /**
-         * 保存对象
-         */
-        ExecuteResult<String> save(StoreAgentBrandLvDto storeAgentBrandLvDto);
-        /**
-         * 更新对象
-         */
-        ExecuteResult<String> update(StoreAgentBrandLvDto storeAgentBrandLvDto);
-        /**
-         * 根据主键 删除对象
-         */
-        ExecuteResult<String> delete(Long id);
-        /**
-         * 根据主键集合 批量删除
-         */
-        ExecuteResult<String> deleteBatch(List<Long> idList);
-        /**
-         * 根据分页参数 获取 分页集合
-         */
-        Page<StoreAgentBrandLvDto>getPage(Page<StoreAgentBrandLvDto>page,StoreAgentBrandLvDto storeAgentBrandLvDto);
+	Map<String,Object> getUncheckStoresByAgentId(Long size,Long current,String agentid);
+	void UpdateStoreAgentStatus(String mainid,String status)throws Exception;
+	void RefuseStoreAgentStatus(String mainid,String status)throws Exception;
+	void deleteSignInfo(String storeid,String agentid,String brandcode) throws Exception;
+
+	/**
+     * 根据ID 查询单个对象
+     */
+    StoreAgentBrandLvDto queryObject(Long id);
+    /**
+     * 根据参数查询 列表  无分页
+     */
+    List<StoreAgentBrandLvDto>queryList(Map<String, Object> map);
+    /**
+     * 根据参数查询 对应参数的 集合大小
+     */
+    int queryTotal(Map<String, Object> map);
+    /**
+     * 保存对象
+     */
+    ExecuteResult<String> save(StoreAgentBrandLvDto storeAgentBrandLvDto);
+    /**
+     * 更新对象
+     */
+    ExecuteResult<String> update(StoreAgentBrandLvDto storeAgentBrandLvDto);
+    /**
+     * 根据主键 删除对象
+     */
+    ExecuteResult<String> delete(Long id);
+    /**
+     * 根据主键集合 批量删除
+     */
+    ExecuteResult<String> deleteBatch(List<Long> idList);
+    /**
+     * 根据分页参数 获取 分页集合
+     */
+    Page<StoreAgentBrandLvDto>getPage(Page<StoreAgentBrandLvDto>page,StoreAgentBrandLvDto storeAgentBrandLvDto);
 
-        /**
-         * 获取门店对应经销商
-         * @param storeId
-         * @return
-         */
-        List<String> getStoreAgents(Long storeId);
+    /**
+     * 获取门店对应经销商
+     * @param storeId
+     * @return
+     */
+    List<String> getStoreAgents(Long storeId);
 }

sailun-allsteel-bus-provider/saillun-allsteel-bus-api/src/main/java/io/platform/store/service/client/api/StoreRewardServiceClient.java

@@ -2,7 +2,9 @@
 package io.platform.store.service.client.api;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import io.platform.base.dto.ScanRecordPageDTO;
 import io.platform.base.dto.StoreScanRewordDTO;
+import io.platform.base.vo.StoreScanRecordVO;
 import io.platform.base.vo.StoreScanRewordVO;
 import io.platform.store.dto.StoreRewardDto;
 
@@ -52,4 +54,6 @@ public interface StoreRewardServiceClient{
          * @return
          */
         ExecuteResult<List> getPageScanReword(StoreScanRewordDTO storeScanRewordDTO);
+
+
 }

sailun-allsteel-bus-provider/sailun-allsteel-bus-service/src/main/java/io/platform/scan/biz/entity/AppStoreScanNum.java

@@ -0,0 +1,57 @@
+package io.platform.scan.biz.entity;
+
+import com.baomidou.mybatisplus.annotation.*;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+
+import java.io.Serializable;
+import lombok.Data;
+
+@Data
+@TableName("APP_STORE_SCAN_NUM")
+@KeySequence(value="SEQ_BUS",clazz=Long.class)
+public class AppStoreScanNum extends Model<AppStoreScanNum>  implements Serializable{
+
+    private static final long serialVersionUID = 5454155825314635342L;
+
+
+    /**
+     * mainId       db_column: MAIN_ID
+     */
+    @TableId(value="MAIN_ID", type= IdType.INPUT)
+    private Long mainId;
+
+
+    @Override
+    protected Serializable pkVal() {
+        return this.mainId;
+    }
+
+    /**
+     * 门店id       db_column: STORE_ID
+     */
+    @TableField("STORE_ID")
+    private Long storeId;
+
+    /**
+     * 扫码号       db_column: SCAN_NUM
+     */
+    @TableField("SCAN_NUM")
+    private String scanNum;
+
+    /**
+     * 创建时间       db_column: CREATE_TIME
+     */
+    @TableField("CREATE_TIME")
+    private java.util.Date createTime;
+//columns END
+
+
+    /**
+     * 扫码类型  1入库 2出库
+     */
+    @TableField("SCAN_TYPE")
+    private Integer scanType;
+
+
+
+}

sailun-allsteel-bus-provider/sailun-allsteel-bus-service/src/main/java/io/platform/scan/biz/mapper/AppStoreScanNumMapper.java

@@ -0,0 +1,14 @@
+package io.platform.scan.biz.mapper;
+
+import io.platform.base.common.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+import io.platform.scan.biz.entity.AppStoreScanNum;
+
+
+/**
+ * Created by sevelli on 2017/9/6.
+ */
+@Mapper
+public interface AppStoreScanNumMapper extends BaseMapper<AppStoreScanNum>{
+
+}

sailun-allsteel-bus-provider/sailun-allsteel-bus-service/src/main/java/io/platform/scan/biz/mapper/ScanRecordMapper.java

@@ -3,6 +3,7 @@ package io.platform.scan.biz.mapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import io.platform.activity.biz.entity.Activity;
 import io.platform.base.common.BaseMapper;
+import io.platform.base.dto.ScanRecordPageDTO;
 import io.platform.scan.dto.ScanRecordDto;
 import io.platform.scan.dto.ScanRecordListDto;
 import io.platform.scan.dto.TireInfo;
@@ -36,4 +37,5 @@ public interface ScanRecordMapper extends BaseMapper<ScanRecord>{
 
     // 查询出入库中是否存在此胎号
     int selectCountByTyre(@Param("tireNumber") String tireNumber);
+
 }

sailun-allsteel-bus-provider/sailun-allsteel-bus-service/src/main/java/io/platform/scan/biz/service/AppStoreScanNumService.java

@@ -0,0 +1,21 @@
+
+package io.platform.scan.biz.service;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+import io.platform.scan.biz.mapper.AppStoreScanNumMapper;
+import io.platform.scan.biz.entity.AppStoreScanNum;
+
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+import java.util.Map;
+
+@Service("appStoreScanNumService")
+public class AppStoreScanNumService extends ServiceImpl<AppStoreScanNumMapper,AppStoreScanNum>{
+
+    public List<AppStoreScanNum> selectByMap(Map<String, Object> map) {
+        return baseMapper.selectByMap(map);
+    }
+
+}

sailun-allsteel-bus-provider/sailun-allsteel-bus-service/src/main/java/io/platform/scan/biz/service/ScanRecordService.java

@@ -12,10 +12,9 @@ import io.platform.base.common.exception.RRException;
 
 import io.platform.base.common.utils.ExecuteResult;
 import io.platform.base.constant.enums.B2B_AGREE_STATUS_ENUMS;
-import io.platform.base.dto.StoreScanDTO;
-import io.platform.base.dto.StoreScanOutDTO;
-import io.platform.base.dto.StoreScanResDTO;
-import io.platform.base.dto.TyreMsgDTO;
+import io.platform.base.dto.*;
+import io.platform.base.vo.StoreScanRecordVO;
+import io.platform.scan.biz.entity.AppStoreScanNum;
 import io.platform.scan.biz.mapper.ScanRecordMapper;
 import io.platform.scan.biz.entity.ScanRecord;
 
@@ -96,22 +95,24 @@ public class ScanRecordService extends ServiceImpl<ScanRecordMapper,ScanRecord>{
     @Resource
     private RedisUtils redisUtils;
 
+    // 扫码记录中间表
+    @Resource
+    private AppStoreScanNumService appStoreScanNumService;
+
 
 
 
 
     /**
      * 门店扫码时 获取轮胎对应的奖励
-     * 1.非门店签约品牌  0
-     * 2.根据门店签约级别 + 门店所在省份 + 物料编号
-     * 3.根据物料匹配规则在筛选
-     * 4.最终确定轮胎奖励金额
+     * 1.获取门店信息：门店存在 且已审核
+     * 2.循环物料 信息：
      * @param storeScanDTO
      * @return
      */
     public List<TyreMsgDTO> getTyreReword(StoreScanDTO storeScanDTO) {
         List<TyreMsgDTO> materialList = storeScanDTO.getMaterialList();
-        StoreBasicInfo storeInfo = storeBasicInfoServices.getById(storeScanDTO.getStoreId());
+        StoreBasicInfo storeInfo = storeBasicInfoServices.getByIdAndStatus(storeScanDTO.getStoreId(),1);
         if (null == storeInfo) {
             throw new RRException("门店信息异常，请联系管理员");
         }
@@ -184,11 +185,12 @@ public class ScanRecordService extends ServiceImpl<ScanRecordMapper,ScanRecord>{
         storeScanResDTO.setNotBelongStoreBrandTyreNumbers(errBrandTyreNums);
 
         String putInCode = IdUtil.createIdByTimeAndRandom();
+        this.saveScanNum(putInCode,true,storeScanDTO.getStoreId());
         for (TyreMsgDTO tyreMsgDTO : storeBrandTyres) {
             RLock lock = redissonClient.getLock(tyreMsgDTO.getTireNumber());
             lock.lock(30, TimeUnit.SECONDS);
-            StoreAgentBrandLv storeBrandLv = this.getStoreAgentBrandLv(storeScanDTO.getStoreId(),tyreMsgDTO.getBrand());
             try {
+                StoreAgentBrandLv storeBrandLv = this.getStoreAgentBrandLv(storeScanDTO.getStoreId(),tyreMsgDTO.getBrand());
                 if (null == tyreMsgDTO.getFlagRegular()) {
                     throw new RRException("轮胎正规信息不能为空");
                 } else if ("0".equals(tyreMsgDTO.getFlagRegular().toString())) {
@@ -219,8 +221,12 @@ public class ScanRecordService extends ServiceImpl<ScanRecordMapper,ScanRecord>{
                             tyreMsgDTO,
                             storeScanDTO.getScanAddress());
                     // 入库并满足活动进行后续操作
-                    if (saveScanRecord && satisfyActivity) {
-                        // 算奖励（加钱 + 记录日志 + 门店积分）、加库存、月度核算
+                    if (saveScanRecord) {
+                        // 加库存
+                        this.storeStockService.recordStoreStock(storeScanDTO.getStoreId(),tyreMsgDTO,true);
+                    }
+                    if (satisfyActivity) {
+                        // 算奖励（加钱 + 记录奖励日志 + 门店积分）、月度核算
                         this.storeScanGetSettlement(storeScanDTO.getStoreId(),
                                 activity,
                                 tyreMsgDTO,
@@ -463,9 +469,6 @@ public class ScanRecordService extends ServiceImpl<ScanRecordMapper,ScanRecord>{
         lock.lock(30,TimeUnit.SECONDS);
         try {
             if (flagScanIn) {
-                // 入库操作
-                // +库存
-                this.storeStockService.recordStoreStock(storeId,tyreMsgDTO,true);
                 if (null != activity) {
                     // 满足活动 进行奖励核算
                     // 1.更新门店品牌表对应奖励
@@ -513,6 +516,12 @@ public class ScanRecordService extends ServiceImpl<ScanRecordMapper,ScanRecord>{
     }
 
 
+
+
+
+
+
+
     /**
      * 门店扫码出库接口
      * @param storeScanDTO
@@ -548,6 +557,7 @@ public class ScanRecordService extends ServiceImpl<ScanRecordMapper,ScanRecord>{
 
 
         String putOutCode = IdUtil.createIdByTimeAndRandom();
+        this.saveScanNum(putOutCode,false,storeScanDTO.getStoreId());
         // 物料列表
         for (TyreMsgDTO tyreMsgDTO : storeBrandTyres) {
             RLock lock = redissonClient.getLock(tyreMsgDTO.getTireNumber());
@@ -609,6 +619,28 @@ public class ScanRecordService extends ServiceImpl<ScanRecordMapper,ScanRecord>{
     }
 
 
+    /**
+     * 保存扫码条号
+     * @param scanCOde
+     * @param flagScanIn
+     * @param storeId
+     * @return
+     */
+    public Boolean saveScanNum (String scanCOde,Boolean flagScanIn,Long storeId) {
+        AppStoreScanNum appStoreScanNum = new AppStoreScanNum();
+        appStoreScanNum.setScanNum(scanCOde);
+
+        appStoreScanNum.setCreateTime(new Date());
+        appStoreScanNum.setStoreId(storeId);
+        if (flagScanIn) {
+            appStoreScanNum.setScanType(1);
+        } else {
+            appStoreScanNum.setScanType(2);
+        }
+        appStoreScanNumService.save(appStoreScanNum);
+        return true;
+    }
+
 
 
 

sailun-allsteel-bus-provider/sailun-allsteel-bus-service/src/main/java/io/platform/scan/service/client/impl/AppStoreScanNumServiceClientImpl.java

@@ -0,0 +1,145 @@
+
+package io.platform.scan.service.client.impl;
+
+import com.alibaba.dubbo.config.annotation.Service;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+
+import io.platform.base.common.BaseServiceClient;
+import io.platform.base.common.utils.ExecuteResult;
+
+import io.platform.scan.biz.entity.AppStoreScanNum;
+import io.platform.scan.biz.service.AppStoreScanNumService;
+import io.platform.scan.dto.AppStoreScanNumDto;
+import io.platform.scan.service.client.api.AppStoreScanNumServiceClient;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import org.springframework.beans.BeanUtils;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.Resource;
+import java.util.List;
+import java.util.Map;
+
+
+
+@Component
+@Service()
+public class AppStoreScanNumServiceClientImpl extends BaseServiceClient<AppStoreScanNum,AppStoreScanNumDto> implements AppStoreScanNumServiceClient {
+
+    private Logger logger = LoggerFactory.getLogger(getClass());
+
+    @Resource
+    private AppStoreScanNumService appStoreScanNumService;
+
+    @Override
+    public AppStoreScanNumDto queryObject(Long id) {
+        AppStoreScanNum appStoreScanNum = appStoreScanNumService.getById(id);
+        AppStoreScanNumDto appStoreScanNumDto = new AppStoreScanNumDto();
+        BeanUtils.copyProperties(appStoreScanNum,appStoreScanNumDto);
+        return appStoreScanNumDto;
+    }
+
+    @Override
+    public List<AppStoreScanNumDto> queryList(Map<String, Object> map) {
+        List<AppStoreScanNum> appStoreScanNumList = appStoreScanNumService.selectByMap(map);
+        return convertList(appStoreScanNumList,AppStoreScanNumDto.class);
+    }
+
+    @Override
+    public int queryTotal(Map<String, Object> map) {
+        QueryWrapper<AppStoreScanNum> ew = new QueryWrapper<>();
+        ew.allEq(map);
+        return appStoreScanNumService.count(ew);
+    }
+
+    @Override
+    public ExecuteResult<String> save(AppStoreScanNumDto appStoreScanNumDto) {
+        ExecuteResult<String> result = new ExecuteResult<String>();
+        try{
+            AppStoreScanNum appStoreScanNum = new AppStoreScanNum();
+            revert(appStoreScanNumDto,appStoreScanNum);
+            boolean flag = appStoreScanNumService.save(appStoreScanNum);
+            if(!flag){
+                result.addErrorMessage("保存失败。");
+            }
+        }
+        catch (Exception e) {
+            logger.error(" 保存错误：" + e.toString(), e);
+            result.addErrorMessage("保存错误：" + e.toString());
+        }
+        return result;
+    }
+
+    @Override
+    public ExecuteResult<String> update(AppStoreScanNumDto appStoreScanNumDto) {
+        ExecuteResult<String> result = new ExecuteResult<String>();
+        try{
+            AppStoreScanNum appStoreScanNum = new AppStoreScanNum();
+            revert(appStoreScanNumDto,appStoreScanNum);
+            boolean flag = appStoreScanNumService.updateById(appStoreScanNum);
+            if(!flag){
+                result.addErrorMessage("更新失败。");
+            }
+        }
+        catch (Exception e) {
+            logger.error(" 更新错误：" + e.toString(), e);
+            result.addErrorMessage("更新错误：" + e.toString());
+        }
+        return result;
+    }
+
+    @Override
+    public ExecuteResult<String> delete(Long id) {
+        ExecuteResult<String> result = new ExecuteResult<String>();
+        try{
+            boolean flag = appStoreScanNumService.removeById(id);
+            if(!flag){
+                result.addErrorMessage("删除失败。");
+            }
+        }
+        catch (Exception e) {
+            logger.error(" 删除错误：" + e.toString(), e);
+            result.addErrorMessage("删除错误：" + e.toString());
+        }
+        return result;
+    }
+
+    @Override
+    public ExecuteResult<String> deleteBatch(List<Long> ids) {
+        ExecuteResult<String> result = new ExecuteResult<String>();
+        try{
+            boolean flag = appStoreScanNumService.removeByIds(ids);
+            if(!flag){
+                result.addErrorMessage("批量删除失败。");
+            }
+        }
+        catch (Exception e) {
+            logger.error(" 删除错误：" + e.toString(), e);
+            result.addErrorMessage("删除错误：" + e.toString());
+        }
+        return result;
+    }
+
+    @Override
+    public Page<AppStoreScanNumDto> getPage(Page<AppStoreScanNumDto> pageDto,AppStoreScanNumDto appStoreScanNumDto) {
+        Page<AppStoreScanNum> page = new Page<>(pageDto.getCurrent(),pageDto.getSize());
+
+        page.setAsc(pageDto.ascs());
+        page.setDesc(pageDto.descs());
+        page.condition().putAll(pageDto.condition());
+
+        AppStoreScanNum appStoreScanNum = new AppStoreScanNum();
+        revert(appStoreScanNumDto,appStoreScanNum);
+
+        QueryWrapper<AppStoreScanNum> wrapper = new QueryWrapper<>();
+        wrapper.setEntity(appStoreScanNum);
+
+        List<AppStoreScanNumDto> appStoreScanNumDtoList = convertList(appStoreScanNumService.page(page,wrapper).getRecords(),AppStoreScanNumDto.class);
+        pageDto.setTotal(appStoreScanNumService.count(wrapper));
+        pageDto.setRecords(appStoreScanNumDtoList);
+        return pageDto;
+    }
+}

sailun-allsteel-bus-provider/sailun-allsteel-bus-service/src/main/java/io/platform/scan/service/client/impl/ScanRecordServiceClientImpl.java

@@ -9,17 +9,16 @@ import io.platform.base.common.BaseServiceClient;
 import io.platform.base.common.exception.RRException;
 import io.platform.base.common.utils.ExecuteResult;
 
-import io.platform.base.dto.StoreScanDTO;
-import io.platform.base.dto.StoreScanOutDTO;
-import io.platform.base.dto.StoreScanResDTO;
-import io.platform.base.dto.TyreMsgDTO;
+import io.platform.base.dto.*;
+import io.platform.base.vo.StoreScanRecordVO;
 import io.platform.scan.biz.entity.ScanRecord;
 import io.platform.scan.biz.service.ScanRecordService;
 import io.platform.scan.dto.ScanRecordDto;
-import io.platform.scan.dto.ScanRecordListDto;
 import io.platform.scan.service.client.api.ScanRecordServiceClient;
 
-import io.platform.utils.PageUtil;
+import io.platform.store.biz.entity.StoreBasicInfo;
+import io.platform.store.biz.service.StoreAgentBrandLvService;
+import io.platform.store.biz.service.StoreBasicInfoService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -41,6 +40,14 @@ public class ScanRecordServiceClientImpl extends BaseServiceClient<ScanRecord,Sc
     @Resource
     private ScanRecordService scanRecordService;
 
+    @Resource
+    private StoreAgentBrandLvService storeAgentBrandLvService;
+
+    @Resource
+    private StoreBasicInfoService storeBasicInfoService;
+
+
+
     @Override
     public ScanRecordDto queryObject(Long id) {
         ScanRecord scanRecord = scanRecordService.getById(id);
@@ -181,5 +188,24 @@ public class ScanRecordServiceClientImpl extends BaseServiceClient<ScanRecord,Sc
         return this.scanRecordService.storeScanOutTyres(storeScanDTO);
     }
 
+    /**
+     * 获取门店扫码记录
+     * @param scanRecordPageDTO
+     * @return
+     */
+    @Override
+    public List<StoreScanRecordVO> getPageScanRecordList(ScanRecordPageDTO scanRecordPageDTO) {
+        Long storeId = scanRecordPageDTO.getStoreId();
+        StoreBasicInfo store = this.storeBasicInfoService.getByIdAndStatus(storeId, 1);
+        if (null == store) {
+            throw new RRException("门店信息异常，请联系管理员!");
+        }
+        // 分页分组查单号
+        //List<String> scanNums = this.scanRecordService.getStoreScanNums(scanRecordPageDTO);
+
+
+        return null;
+    }
+
 
 }

sailun-allsteel-bus-provider/sailun-allsteel-bus-service/src/main/java/io/platform/store/biz/service/StoreAgentBrandLvService.java

@@ -1,23 +1,216 @@
 
 package io.platform.store.biz.service;
 
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-
-import io.platform.store.biz.mapper.StoreAgentBrandLvMapper;
-import io.platform.store.biz.entity.StoreAgentBrandLv;
+import java.util.Date;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
 
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.util.List;
-import java.util.Map;
+import com.alibaba.dubbo.common.utils.CollectionUtils;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+import io.platform.store.biz.entity.StoreAgentBrandLv;
+import io.platform.store.biz.entity.StoreBasicInfo;
+import io.platform.store.biz.mapper.StoreAgentBrandLvMapper;
+import io.platform.store.biz.mapper.StoreBasicInfoMapper;
 
 @Service("storeAgentBrandLvService")
 public class StoreAgentBrandLvService extends ServiceImpl<StoreAgentBrandLvMapper,StoreAgentBrandLv>{
 
+	@Autowired
+	private StoreBasicInfoMapper storeBasicInfoMapper;
+	
     public List<StoreAgentBrandLv> selectByMap(Map<String, Object> map) {
         return baseMapper.selectByMap(map);
     }
-
+    public IPage<StoreAgentBrandLv> getUncheckStoresByAgentId(Long size,Long current,String agentid){
+    	IPage<StoreAgentBrandLv> page=new Page<StoreAgentBrandLv>(current, size);
+    	QueryWrapper<StoreAgentBrandLv> wrapper=new QueryWrapper<StoreAgentBrandLv>();
+    	wrapper.eq("agent_id", agentid);
+    	wrapper.eq("AGENT_STATUS", "0");
+    	wrapper.orderByDesc("CREATED_TIME");
+    	IPage<StoreAgentBrandLv> result=baseMapper.selectPage(page, wrapper);
+    	return result;
+    }
+    public void UpdateStoreAgentStatus(String mainid,String status) {
+    	QueryWrapper<StoreAgentBrandLv> wrapper=new QueryWrapper<StoreAgentBrandLv>();
+    	wrapper.eq("MAIN_ID", mainid);
+    	List<StoreAgentBrandLv> storeAgentBrandLvs=baseMapper.selectList(wrapper);
+    	if (CollectionUtils.isNotEmpty(storeAgentBrandLvs)) {
+    		StoreAgentBrandLv storeAgentBrandLv=storeAgentBrandLvs.get(0);
+    		if (!"0".equals(storeAgentBrandLv.getAgentStatus())) {
+				throw new RuntimeException("数据状态异常，无法更改");
+			}
+    		storeAgentBrandLv.setAgentStatus(status);
+    		storeAgentBrandLv.setAgentOpDate(new Date());
+    		baseMapper.updateById(storeAgentBrandLv);
+		}else {
+			throw new RuntimeException("数据不存在!");
+		}
+    }
+    /**
+     * 在拒绝签约品牌任务的一条数据时判断此门店的签约品牌任务是否已经全部被拒绝并更改门店基础表的数据
+     * @Date:2020-11-9
+     * @Title: UpdateStoreStatus
+     * @Description: TODO(这里用一句话描述这个方法的作用)
+     * @param @param mainid 参数
+     * @return void 返回类型
+     * @throws
+     * @author jibin.wang
+     */
+    public void UpdateStoreStatus(String mainid) {
+    	StoreAgentBrandLv storeAgentBrandLv=baseMapper.selectById(mainid);
+    	if (storeAgentBrandLv!=null) {
+			Long storeid=storeAgentBrandLv.getStoreId();
+			if (storeid!=null) {
+				Set<String> agent_store_brandids=new HashSet<String>();
+				QueryWrapper<StoreAgentBrandLv> queryWrapper=new QueryWrapper<StoreAgentBrandLv>();
+				queryWrapper.eq("STORE_ID",storeid);
+				List<StoreAgentBrandLv> alllist=baseMapper.selectList(queryWrapper);
+				for (StoreAgentBrandLv entity : alllist) {
+					//去除重复数据()
+					String agent_store_brandid=entity.getStoreId()+","+entity.getAgentId()+","+entity.getBrandCode();
+					agent_store_brandids.add(agent_store_brandid);
+					//
+				}
+				Boolean canupdate=true;
+				for (String multid: agent_store_brandids) {
+					String [] multidarray=multid.split(",");
+					String eachstoreid=multidarray[0];
+					String eachagentid=multidarray[1];
+					String eachbrandcode=multidarray[2];
+					//
+					QueryWrapper<StoreAgentBrandLv> eachQueryWrapper=new QueryWrapper<StoreAgentBrandLv>();
+					eachQueryWrapper.eq("STORE_ID", eachstoreid);
+					eachQueryWrapper.eq("AGENT_ID", eachagentid);
+					eachQueryWrapper.eq("BRAND_CODE", eachbrandcode);
+					eachQueryWrapper.eq("AGENT_STATUS", "2");
+					Integer refushcount=baseMapper.selectCount(eachQueryWrapper);
+					//
+					QueryWrapper<StoreAgentBrandLv> AllQueryWrapper=new QueryWrapper<StoreAgentBrandLv>();
+					AllQueryWrapper.eq("STORE_ID", eachstoreid);
+					AllQueryWrapper.eq("AGENT_ID", eachagentid);
+					AllQueryWrapper.eq("BRAND_CODE", eachbrandcode);
+					Integer allcount=baseMapper.selectCount(AllQueryWrapper);
+					if (refushcount<allcount) {
+						canupdate=false;
+						break;
+					}
+				}
+				if (canupdate) {
+					StoreBasicInfo basicInfo=storeBasicInfoMapper.selectById(storeid);
+					if (basicInfo!=null) {
+						basicInfo.setStatus(2L);
+						storeBasicInfoMapper.updateById(basicInfo);
+					}
+				}
+			}
+		}
+    }
+    /**
+     * 根据门店id去签约表里判断这个门店是否需要更改门店基础信息表的状态
+     * @Date:2020-11-11
+     * @Title: updateStoreStatusBySignInfo
+     * @Description: TODO(这里用一句话描述这个方法的作用)
+     * @param @param storeid 参数
+     * @return void 返回类型
+     * @throws
+     */
+    public void updateStoreStatusBySignInfo(String storeid) {
+    	//默认状态为未审核
+    	String defaultstatus="0";
+    	//去除重复数据
+    	Set<String> agent_store_brandids=new HashSet<String>();
+		QueryWrapper<StoreAgentBrandLv> queryWrapper=new QueryWrapper<StoreAgentBrandLv>();
+		queryWrapper.eq("STORE_ID",storeid);
+		List<StoreAgentBrandLv> alllist=baseMapper.selectList(queryWrapper);
+		for (StoreAgentBrandLv entity : alllist) {
+			String agent_store_brandid=entity.getStoreId()+","+entity.getAgentId()+","+entity.getBrandCode();
+			agent_store_brandids.add(agent_store_brandid);
+		}
+		if (CollectionUtils.isNotEmpty(agent_store_brandids)) {
+			//首先判断是否需要改为未审核状态
+			Boolean canupdaterefuse=true;
+			for (String multid: agent_store_brandids) {
+				String [] multidarray=multid.split(",");
+				String eachstoreid=multidarray[0];
+				String eachagentid=multidarray[1];
+				String eachbrandcode=multidarray[2];
+				//
+				QueryWrapper<StoreAgentBrandLv> eachQueryWrapper=new QueryWrapper<StoreAgentBrandLv>();
+				eachQueryWrapper.eq("STORE_ID", eachstoreid);
+				eachQueryWrapper.eq("AGENT_ID", eachagentid);
+				eachQueryWrapper.eq("BRAND_CODE", eachbrandcode);
+				eachQueryWrapper.eq("AGENT_STATUS", "2");
+				Integer refushcount=baseMapper.selectCount(eachQueryWrapper);
+				//
+				QueryWrapper<StoreAgentBrandLv> AllQueryWrapper=new QueryWrapper<StoreAgentBrandLv>();
+				AllQueryWrapper.eq("STORE_ID", eachstoreid);
+				AllQueryWrapper.eq("AGENT_ID", eachagentid);
+				AllQueryWrapper.eq("BRAND_CODE", eachbrandcode);
+				Integer allcount=baseMapper.selectCount(AllQueryWrapper);
+				if (refushcount<allcount) {
+					canupdaterefuse=false;
+					break;
+				}
+			}
+			if (canupdaterefuse) {
+				defaultstatus="2";
+			}
+			//判断是否需要更改为审核通过状态
+			Boolean canupdatepass=true;
+			for (String multid: agent_store_brandids) {
+				String [] multidarray=multid.split(",");
+				String eachstoreid=multidarray[0];
+				String eachagentid=multidarray[1];
+				String eachbrandcode=multidarray[2];
+				//
+				QueryWrapper<StoreAgentBrandLv> eachQueryWrapper=new QueryWrapper<StoreAgentBrandLv>();
+				eachQueryWrapper.eq("STORE_ID", eachstoreid);
+				eachQueryWrapper.eq("AGENT_ID", eachagentid);
+				eachQueryWrapper.eq("BRAND_CODE", eachbrandcode);
+				eachQueryWrapper.eq("AGENT_STATUS", "1");
+				Integer passcount=baseMapper.selectCount(eachQueryWrapper);
+				if (passcount==0) {
+					canupdatepass=false;
+				}
+			}
+			if (canupdatepass) {
+				defaultstatus="1";
+			}
+			//更新状态
+			StoreBasicInfo basicInfo=storeBasicInfoMapper.selectById(storeid);
+			if (basicInfo!=null) {
+				basicInfo.setStatus(Long.parseLong(defaultstatus));
+				storeBasicInfoMapper.updateById(basicInfo);
+			}
+		}
+    }
+    /**
+     * 经销商删除门店的品牌的签约
+     * @Date:2020-11-11
+     * @Title: deleteSignByAgentAndStoreAndBrand
+     * @Description: TODO(这里用一句话描述这个方法的作用)
+     * @param @param storeid
+     * @param @param agentid
+     * @param @param brandcode 参数
+     * @return void 返回类型
+     * @throws
+     */
+    public void deleteSignByAgentAndStoreAndBrand(String storeid,String agentid,String brandcode) {
+    	QueryWrapper<StoreAgentBrandLv> queryWrapper=new QueryWrapper<StoreAgentBrandLv>();
+    	queryWrapper.eq("STORE_ID", storeid);
+    	queryWrapper.eq("AGENT_ID",agentid);
+    	queryWrapper.eq("BRAND_CODE", brandcode);
+    	baseMapper.delete(queryWrapper);
+    }
     /**
      * 根据门店id获取门店经营品牌集合
      * @param storeId

sailun-allsteel-bus-provider/sailun-allsteel-bus-service/src/main/java/io/platform/store/service/client/impl/StoreAgentBrandLvServiceClientImpl.java

@@ -1,28 +1,28 @@
 
 package io.platform.store.service.client.impl;
 
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import javax.annotation.Resource;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.BeanUtils;
+import org.springframework.stereotype.Component;
+
 import com.alibaba.dubbo.config.annotation.Service;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 
 import io.platform.base.common.BaseServiceClient;
 import io.platform.base.common.utils.ExecuteResult;
-
 import io.platform.store.biz.entity.StoreAgentBrandLv;
 import io.platform.store.biz.service.StoreAgentBrandLvService;
 import io.platform.store.dto.StoreAgentBrandLvDto;
 import io.platform.store.service.client.api.StoreAgentBrandLvServiceClient;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import org.springframework.beans.BeanUtils;
-import org.springframework.stereotype.Component;
-
-import javax.annotation.Resource;
-import java.util.List;
-import java.util.Map;
-
 
 
 @Component
@@ -34,7 +34,44 @@ public class StoreAgentBrandLvServiceClientImpl extends BaseServiceClient<StoreA
     @Resource
     private StoreAgentBrandLvService storeAgentBrandLvService;
 
-    @Override
+	@Override
+	public Map<String, Object> getUncheckStoresByAgentId(Long size,Long current,String agentid) {
+		Map<String, Object> result=new HashMap<String, Object>();
+		result.put("result", storeAgentBrandLvService.getUncheckStoresByAgentId(size, current, agentid));
+		return result;
+	}
+
+	@Override
+	public void UpdateStoreAgentStatus(String mainid, String status) throws Exception{
+		try {
+			storeAgentBrandLvService.UpdateStoreAgentStatus(mainid, status);
+		} catch (Exception e) {
+			throw new Exception(e.getMessage());
+		}
+	}
+
+	@Override
+	public void RefuseStoreAgentStatus(String mainid, String status) throws Exception {
+		try {
+			storeAgentBrandLvService.UpdateStoreAgentStatus(mainid, status);
+			storeAgentBrandLvService.UpdateStoreStatus(mainid);
+		} catch (Exception e) {
+			throw new Exception(e.getMessage());
+		}
+	}
+
+	@Override
+	public void deleteSignInfo(String storeid, String agentid, String brandcode) throws Exception{
+		try {
+			storeAgentBrandLvService.deleteSignByAgentAndStoreAndBrand(storeid, agentid, brandcode);
+			storeAgentBrandLvService.updateStoreStatusBySignInfo(storeid);
+		} catch (Exception e) {
+			throw new Exception(e.getMessage());
+		}
+	}
+
+
+	@Override
     public StoreAgentBrandLvDto queryObject(Long id) {
         StoreAgentBrandLv storeAgentBrandLv = storeAgentBrandLvService.getById(id);
         StoreAgentBrandLvDto storeAgentBrandLvDto = new StoreAgentBrandLvDto();

sailun-allsteel-bus-provider/sailun-allsteel-bus-service/src/main/java/io/platform/store/service/client/impl/StoreRewardServiceClientImpl.java

@@ -7,11 +7,17 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 
 import com.github.pagehelper.PageHelper;
 import io.platform.base.common.BaseServiceClient;
+import io.platform.base.common.exception.RRException;
 import io.platform.base.common.utils.ExecuteResult;
 
+import io.platform.base.dto.ScanRecordPageDTO;
 import io.platform.base.dto.StoreScanRewordDTO;
+import io.platform.base.vo.StoreScanRecordVO;
 import io.platform.base.vo.StoreScanRewordVO;
+import io.platform.store.biz.entity.StoreBasicInfo;
 import io.platform.store.biz.entity.StoreReward;
+import io.platform.store.biz.service.StoreAgentBrandLvService;
+import io.platform.store.biz.service.StoreBasicInfoService;
 import io.platform.store.biz.service.StoreRewardService;
 import io.platform.store.dto.StoreRewardDto;
 import io.platform.store.service.client.api.StoreRewardServiceClient;
@@ -37,6 +43,10 @@ public class StoreRewardServiceClientImpl extends BaseServiceClient<StoreReward,
     @Resource
     private StoreRewardService storeRewardService;
 
+
+    @Resource
+    private StoreBasicInfoService storeBasicInfoService;
+
     @Override
     public StoreRewardDto queryObject(Long id) {
         StoreReward storeReward = storeRewardService.getById(id);
@@ -164,10 +174,4 @@ public class StoreRewardServiceClientImpl extends BaseServiceClient<StoreReward,
 
 
 
-
-
-
-
-
-
 }

sailun-allsteel-bus-provider/sailun-allsteel-bus-service/src/main/resources/mybatis/scan/AppStoreScanNumMapper.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="io.platform.scan.biz.mapper.AppStoreScanNumMapper">
+
+
+
+</mapper>

sailun-allsteel-bus-provider/sailun-allsteel-bus-service/src/main/resources/mybatis/scan/ScanRecordMapper.xml

@@ -44,4 +44,6 @@
     </select>
 
 
+
+
 </mapper>

sailun-allsteel-common/src/main/java/io/platform/base/vo/StoreTaskStatisticsVO.java

@@ -1,77 +0,0 @@
-package io.platform.base.vo;
-
-import lombok.Data;
-
-import java.io.Serializable;
-
-/**
- * TODO
- *
- * 1.门店任务量统计VO显示
- * @author shanxin
- * @version 1.0
- * @date 2020/11/18 11:05
- */
-@Data
-public class StoreTaskStatisticsVO implements Serializable {
-
-    private static final long serialVersionUID = 5454155825314635342L;
-
-
-    /**
-     * 品牌
-     */
-    private String brand;
-
-    /**
-     * 季度
-     */
-    private String quarter;
-
-    /**
-     * 任务量
-     */
-    private Long taskNum;
-
-
-    /**
-     * 月度完成量
-     */
-    private Long monthCompleteNum;
-
-    /**
-     * 月度未完成量
-     */
-    private Long monthNotCompleteNum;
-
-
-    /**
-     * 月度完成占比
-     */
-    private String monthProportion;
-
-
-    /**
-     * 季度完成量
-     */
-    private Long quarterCompleteNum;
-
-
-    /**
-     * 季度未完成量
-     */
-    private Long quarterNotCompleteNum;
-
-
-    /**
-     * 月度完成占比
-     */
-    private String quarterProportion;
-
-
-
-
-
-
-
-}