Explorar el Código

扫码入库初次提交

shanxin hace 4 años
padre
commit
7baa1e5c5f
Se han modificado 25 ficheros con 442 adiciones y 16 borrados
  1. 19 1
      sailun-allsteel-admin-rest/src/main/java/io/platform/base/common/utils/HuaweiOBSUtil.java
  2. 1 1
      sailun-allsteel-admin-rest/src/main/java/io/platform/homepage/web/controller/rest/ConfigArticleRestController.java
  3. 33 1
      sailun-allsteel-admin-rest/src/main/java/io/platform/sys/web/controller/rest/AppVersionLogRestController.java
  4. 4 1
      sailun-allsteel-admin-rest/src/main/resources/application.yml
  5. 9 0
      sailun-allsteel-admin-rest/src/test/java/io/platform/TestOBS.java
  6. 13 0
      sailun-allsteel-app-rest/pom.xml
  7. 43 0
      sailun-allsteel-app-rest/src/main/java/io/platform/app/web/controller/BaseReqController.java
  8. 34 0
      sailun-allsteel-app-rest/src/main/java/io/platform/app/web/controller/MyPageController.java
  9. 1 2
      sailun-allsteel-app-rest/src/main/java/io/platform/app/web/controller/StoreScanController.java
  10. 31 0
      sailun-allsteel-app-rest/src/main/java/io/platform/app/web/remote/BaseReqRemote.java
  11. 18 0
      sailun-allsteel-app-rest/src/main/java/io/platform/app/web/remote/MyPageRemote.java
  12. 1 1
      sailun-allsteel-app-rest/src/main/java/io/platform/config/header/ExceptionHeader.java
  13. 7 0
      sailun-allsteel-bus-provider/saillun-allsteel-bus-api/src/main/java/io/platform/homepage/service/client/api/ConfigBannerServiceClient.java
  14. 7 0
      sailun-allsteel-bus-provider/saillun-allsteel-bus-api/src/main/java/io/platform/homepage/service/client/api/ConfigBrandServiceClient.java
  15. 8 3
      sailun-allsteel-bus-provider/saillun-allsteel-bus-api/src/main/java/io/platform/store/service/client/api/StoreRewardServiceClient.java
  16. 13 0
      sailun-allsteel-bus-provider/sailun-allsteel-bus-service/src/main/java/io/platform/homepage/service/client/impl/ConfigBannerServiceClientImpl.java
  17. 9 0
      sailun-allsteel-bus-provider/sailun-allsteel-bus-service/src/main/java/io/platform/homepage/service/client/impl/ConfigBrandServiceClientImpl.java
  18. 5 3
      sailun-allsteel-bus-provider/sailun-allsteel-bus-service/src/main/java/io/platform/store/biz/mapper/StoreRewardMapper.java
  19. 6 0
      sailun-allsteel-bus-provider/sailun-allsteel-bus-service/src/main/java/io/platform/store/biz/service/StoreRewardService.java
  20. 26 0
      sailun-allsteel-bus-provider/sailun-allsteel-bus-service/src/main/java/io/platform/store/service/client/impl/StoreRewardServiceClientImpl.java
  21. 27 0
      sailun-allsteel-bus-provider/sailun-allsteel-bus-service/src/main/resources/mybatis/store/StoreRewardMapper.xml
  22. 71 0
      sailun-allsteel-common/src/main/java/io/platform/base/dto/StoreScanRewordDTO.java
  23. 0 1
      sailun-allsteel-common/src/main/java/io/platform/base/vo/StoreScanMatnrMsgVO.java
  24. 54 0
      sailun-allsteel-common/src/main/java/io/platform/base/vo/StoreScanRewordVO.java
  25. 2 2
      sailun-allsteel-sys-provider/sailun-allsteel-sys-service/src/main/java/io/platform/sys/service/client/impl/SysConfigServiceClientImpl.java

+ 19 - 1
sailun-allsteel-admin-rest/src/main/java/io/platform/base/common/utils/HuaweiOBSUtil.java

@@ -2,7 +2,7 @@ package io.platform.base.common.utils;
 
 import com.obs.services.ObsClient;
 import com.obs.services.exception.ObsException;
-import com.obs.services.model.PutObjectResult;
+import com.obs.services.model.*;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.stereotype.Component;
@@ -53,6 +53,24 @@ public class HuaweiOBSUtil {
     }
 
 
+    /**
+     * 设置对象为私有读写,设置后不可下载
+     * @param objName
+     * @return
+     */
+    public Boolean privateFileOBS (String objName) {
+        ObsClient obsClient = new ObsClient(ak, sk, endPoint);
+        BucketVersioningConfiguration status = obsClient.getBucketVersioning(bucketName);
+        System.out.println("\t" + status.getVersioningStatus());
+        return true;
+    }
+
+
+
+
+
+
+
 
 
 

+ 1 - 1
sailun-allsteel-admin-rest/src/main/java/io/platform/homepage/web/controller/rest/ConfigArticleRestController.java

@@ -121,7 +121,7 @@ public class ConfigArticleRestController extends AbstractController {
 	 */
 	@RequestMapping("/uploadFile")
 	public R uploadFile(@RequestParam("file") MultipartFile file) {
-		String fileName = file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf("."));
+		String fileName = file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf(".") + 1);
 		String url = null;
 		try {
 			url = ftpUtils.defaultUpload(null, fileName, (FileInputStream) file.getInputStream());

+ 33 - 1
sailun-allsteel-admin-rest/src/main/java/io/platform/sys/web/controller/rest/AppVersionLogRestController.java

@@ -2,6 +2,7 @@
 package io.platform.sys.web.controller.rest;
 
 
+import io.platform.base.common.utils.HuaweiOBSUtil;
 import io.platform.sys.dto.AppVersionLogDto;
 import io.platform.sys.web.remote.AppVersionLogServiceRemote;
 import org.springframework.web.bind.annotation.*;
@@ -15,7 +16,9 @@ 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.multipart.MultipartFile;
 
+import java.io.*;
 import java.util.List;
 import java.util.Map;
 
@@ -26,7 +29,10 @@ public class AppVersionLogRestController extends AbstractController {
 
     @Autowired
 	private AppVersionLogServiceRemote appVersionLogServiceRemote;
-	
+
+	@Autowired
+	private HuaweiOBSUtil huaweiOBSUtil;
+
 	/**
 	 * 所有列表
 	 */
@@ -102,4 +108,30 @@ public class AppVersionLogRestController extends AbstractController {
         }
 	}
 
+
+	/**
+	 * 华为云OBS上传文件
+	 * @param file
+	 * @return
+	 * @throws IOException
+	 */
+	@RequestMapping("uploadFileToHuaweiOBS")
+	public R uploadFileToHuaweiOBS (@RequestParam("file") MultipartFile file)  {
+		String url = "";
+		try {
+			FileInputStream fileInputStream = (FileInputStream) file.getInputStream();
+			url = huaweiOBSUtil.uploadFileForOBS(file.getOriginalFilename(), fileInputStream);
+		} catch (IOException e) {
+			e.printStackTrace();
+		}
+		return R.ok().put("url",url);
+	}
+
+
+
+
+
+
+
+
 }

+ 4 - 1
sailun-allsteel-admin-rest/src/main/resources/application.yml

@@ -21,7 +21,10 @@ spring:
         max-file-size: 100MB
         max-request-size: 100MB
         enabled: true
-    # 指定静态资源的路径
+    servlet:
+        multipart:
+            max-file-size: 50MB
+            max-request-size: 1000MB
 
 system:
      app:

+ 9 - 0
sailun-allsteel-admin-rest/src/test/java/io/platform/TestOBS.java

@@ -44,6 +44,15 @@ public class TestOBS {
 
 
 
+    @Test
+    public void testPrivateFileOBS () {
+
+        huaweiOBSUtil.privateFileOBS("apk");
+
+    }
+
+
+
 
 
 }

+ 13 - 0
sailun-allsteel-app-rest/pom.xml

@@ -167,6 +167,19 @@
             <artifactId>javase</artifactId>
             <version>3.3.3</version>
         </dependency>
+        <!-- 分页助手 -->
+        <!-- https://mvnrepository.com/artifact/com.github.pagehelper/pagehelper -->
+        <dependency>
+            <groupId>com.github.pagehelper</groupId>
+            <artifactId>pagehelper</artifactId>
+            <version>5.1.10</version>
+        </dependency>
+        <!-- https://mvnrepository.com/artifact/org.mybatis/mybatis -->
+        <dependency>
+            <groupId>org.mybatis</groupId>
+            <artifactId>mybatis</artifactId>
+            <version>3.4.6</version>
+        </dependency>
     </dependencies>
 
 

+ 43 - 0
sailun-allsteel-app-rest/src/main/java/io/platform/app/web/controller/BaseReqController.java

@@ -0,0 +1,43 @@
+package io.platform.app.web.controller;
+
+import io.platform.app.web.remote.BaseReqRemote;
+import io.platform.base.common.utils.R;
+import io.platform.config.annotation.FuncLogAnno;
+import io.platform.homepage.dto.ConfigBrandDto;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+/**
+ * TODO
+ *
+ * base接口
+ * @author shanxin
+ * @version 1.0
+ * @date 2020/11/17 16:52
+ */
+@RestController
+@RequestMapping("/baseReq/")
+public class BaseReqController {
+
+    @Autowired
+    private BaseReqRemote baseReqRemote;
+
+
+    /**
+     * 查询品牌列表
+     * @return
+     */
+    @RequestMapping("/getBrandList")
+    @FuncLogAnno(functionName = "查询品牌列表")
+    public R getBrandList() {
+        List<ConfigBrandDto> bannerDtoList = this.baseReqRemote.getBrandList();
+        return R.ok().put("data",bannerDtoList);
+    }
+
+
+
+
+}

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

@@ -2,8 +2,12 @@ package io.platform.app.web.controller;
 
 
 import io.platform.app.web.remote.MyPageRemote;
+import io.platform.base.common.exception.RRException;
+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.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -12,6 +16,8 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.List;
+
 /**
  * TODO
  * 1.我的页面Controller
@@ -44,7 +50,35 @@ public class MyPageController {
         // 获取扫码记录
         //Long storeStock = this.myPageRemote.getStoreStock(scanRecordPageDTO);
         // 获取扫码记录
+        return R.ok();
+    }
+
+
+    /**
+     * 分页获取门店奖励列表
+     * @param storeScanRewordDTO
+     * @return
+     */
+    @PostMapping("/getPageScanRewordList")
+    @ApiOperation("分页获取扫码奖励")
+    public R getPageScanRewordList (@RequestBody StoreScanRewordDTO storeScanRewordDTO) {
+        if (null == storeScanRewordDTO.getStoreId() || null == storeScanRewordDTO.getUserId()) {
+            throw new RRException("门店信息不能为空");
+        }
+        if (null == storeScanRewordDTO.getCurrent() || null == storeScanRewordDTO.getSize()) {
+            throw new RRException("分页参数不能为空");
+        }
+        ExecuteResult<List> result = this.myPageRemote.getPageScanReword(storeScanRewordDTO);
+        return R.ok().put("data",result.getResult());
+    }
+
+
+
+
 
+    @PostMapping("/getStoreTaskStatistics")
+    @ApiOperation("门店任务量统计")
+    public R getStoreTaskStatistics () {
 
         return R.ok();
     }

+ 1 - 2
sailun-allsteel-app-rest/src/main/java/io/platform/app/web/controller/StoreScanController.java

@@ -83,9 +83,8 @@ public class StoreScanController {
     @ApiImplicitParams({
             @ApiImplicitParam(name = "storeId", value = "门店id",required = true),
             @ApiImplicitParam(name = "userId", value = "用户id",required = true),
-            @ApiImplicitParam(name = "tyreNum", value = "轮胎号",required = true),
             @ApiImplicitParam(name = "materialList", value = "物料集合",required = true),
-            @ApiImplicitParam(name = "longitude", value = "经度",required = true),
+                @ApiImplicitParam(name = "longitude", value = "经度",required = true),
             @ApiImplicitParam(name = "latitude", value = "纬度",required = true),
             @ApiImplicitParam(name = "scanAddress", value = "扫码地址",required = true),
     })

+ 31 - 0
sailun-allsteel-app-rest/src/main/java/io/platform/app/web/remote/BaseReqRemote.java

@@ -0,0 +1,31 @@
+package io.platform.app.web.remote;
+
+import com.alibaba.dubbo.config.annotation.Reference;
+import io.platform.homepage.dto.ConfigBannerDto;
+import io.platform.homepage.dto.ConfigBrandDto;
+import io.platform.homepage.service.client.api.ConfigBannerServiceClient;
+import io.platform.homepage.service.client.api.ConfigBrandServiceClient;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * TODO
+ *
+ * @author shanxin
+ * @version 1.0
+ * @date 2020/11/17 16:54
+ */
+@Service("baseReqRemote")
+public class BaseReqRemote {
+
+
+    @Reference(check = false)
+    private ConfigBrandServiceClient configBrandServiceClient;
+
+    public List<ConfigBrandDto> getBrandList() {
+        return this.configBrandServiceClient.getBrandList();
+    }
+
+
+}

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

@@ -1,7 +1,14 @@
 package io.platform.app.web.remote;
 
+import com.alibaba.dubbo.config.annotation.Reference;
+import io.platform.base.common.utils.ExecuteResult;
+import io.platform.base.dto.StoreScanRewordDTO;
+import io.platform.base.vo.StoreScanRewordVO;
+import io.platform.store.service.client.api.StoreRewardServiceClient;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 /**
  * TODO
  *
@@ -13,5 +20,16 @@ import org.springframework.stereotype.Service;
 public class MyPageRemote {
 
 
+    @Reference(check = false)
+    private StoreRewardServiceClient storeRewardServiceClient;
+
+    public ExecuteResult<List> getPageScanReword(StoreScanRewordDTO storeScanRewordDTO) {
+        return this.storeRewardServiceClient.getPageScanReword(storeScanRewordDTO);
+    }
+
+
+
+
+
 
 }

+ 1 - 1
sailun-allsteel-app-rest/src/main/java/io/platform/config/header/ExceptionHeader.java

@@ -16,7 +16,7 @@ public class ExceptionHeader {
     public Map<String, Object> handleHttpException(RRException e){
         Map<String, Object> map = new HashMap<>();
         map.put("code", e.getCode());
-        map.put("message", e.getMessage());
+        map.put("msg", e.getMessage());
         return map;
     }
 

+ 7 - 0
sailun-allsteel-bus-provider/saillun-allsteel-bus-api/src/main/java/io/platform/homepage/service/client/api/ConfigBannerServiceClient.java

@@ -49,4 +49,11 @@ public interface ConfigBannerServiceClient{
          * @return
          */
         List<ConfigBannerDto> getStoreBannerList(StoreBannerDTO storeBannerDTO);
+
+        /**
+         * 获取品牌列表
+         * @return
+         */
+        List<ConfigBannerDto> getBrandList();
+
 }

+ 7 - 0
sailun-allsteel-bus-provider/saillun-allsteel-bus-api/src/main/java/io/platform/homepage/service/client/api/ConfigBrandServiceClient.java

@@ -2,6 +2,7 @@
 package io.platform.homepage.service.client.api;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import io.platform.homepage.dto.ConfigBannerDto;
 import io.platform.homepage.dto.ConfigBrandDto;
 
 import java.util.List;
@@ -42,4 +43,10 @@ public interface ConfigBrandServiceClient{
          * 根据分页参数 获取 分页集合
          */
         Page<ConfigBrandDto>getPage(Page<ConfigBrandDto>page,ConfigBrandDto configBrandDto);
+
+        /**
+         * 获取品牌列表
+         * @return
+         */
+        List<ConfigBrandDto> getBrandList();
 }

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

@@ -2,6 +2,8 @@
 package io.platform.store.service.client.api;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import io.platform.base.dto.StoreScanRewordDTO;
+import io.platform.base.vo.StoreScanRewordVO;
 import io.platform.store.dto.StoreRewardDto;
 
 import java.util.List;
@@ -44,7 +46,10 @@ public interface StoreRewardServiceClient{
         Page<StoreRewardDto>getPage(Page<StoreRewardDto>page,StoreRewardDto storeRewardDto);
 
 
-
-
-
+        /**
+         * 获取门店奖励记录
+         * @param storeScanRewordDTO
+         * @return
+         */
+        ExecuteResult<List> getPageScanReword(StoreScanRewordDTO storeScanRewordDTO);
 }

+ 13 - 0
sailun-allsteel-bus-provider/sailun-allsteel-bus-service/src/main/java/io/platform/homepage/service/client/impl/ConfigBannerServiceClientImpl.java

@@ -22,7 +22,9 @@ import org.springframework.data.convert.EntityWriter;
 import org.springframework.stereotype.Component;
 
 import javax.annotation.Resource;
+import java.rmi.MarshalledObject;
 import java.util.Date;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -153,5 +155,16 @@ public class ConfigBannerServiceClientImpl extends BaseServiceClient<ConfigBanne
         return bannerList;
     }
 
+    /**
+     * 查询品牌列表
+     * @return
+     */
+    @Override
+    public List<ConfigBannerDto> getBrandList() {
+        Map<String,Object> queryMap = new HashMap<>();
+        List<ConfigBannerDto> bannerDtoList = this.queryList(queryMap);
+        return bannerDtoList;
+    }
+
 
 }

+ 9 - 0
sailun-allsteel-bus-provider/sailun-allsteel-bus-service/src/main/java/io/platform/homepage/service/client/impl/ConfigBrandServiceClientImpl.java

@@ -10,6 +10,7 @@ import io.platform.base.common.utils.ExecuteResult;
 
 import io.platform.homepage.biz.service.ConfigBrandService;
 import io.platform.homepage.biz.entity.ConfigBrand;
+import io.platform.homepage.dto.ConfigBannerDto;
 import io.platform.homepage.dto.ConfigBrandDto;
 import io.platform.homepage.service.client.api.ConfigBrandServiceClient;
 
@@ -20,6 +21,7 @@ import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Component;
 
 import javax.annotation.Resource;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -142,4 +144,11 @@ public class ConfigBrandServiceClientImpl extends BaseServiceClient<ConfigBrand,
         pageDto.setRecords(configBrandDtoList);
         return pageDto;
     }
+
+    @Override
+    public List<ConfigBrandDto> getBrandList() {
+        Map<String,Object> map = new HashMap<>();
+        List<ConfigBrandDto> configBrandDtos = this.queryList(map);
+        return configBrandDtos;
+    }
 }

+ 5 - 3
sailun-allsteel-bus-provider/sailun-allsteel-bus-service/src/main/java/io/platform/store/biz/mapper/StoreRewardMapper.java

@@ -1,12 +1,14 @@
 package io.platform.store.biz.mapper;
 
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+
 import io.platform.base.common.BaseMapper;
-import io.platform.store.dto.StoreRewardDto;
+import io.platform.base.dto.StoreScanRewordDTO;
+import io.platform.base.vo.StoreScanRewordVO;
 import org.apache.ibatis.annotations.Mapper;
 import io.platform.store.biz.entity.StoreReward;
 import org.apache.ibatis.annotations.Param;
 
+
 import java.util.List;
 
 
@@ -17,5 +19,5 @@ import java.util.List;
 public interface StoreRewardMapper extends BaseMapper<StoreReward>{
 
 
-
+    List<StoreScanRewordVO> selectStoreRewords(@Param("storeScanRewordDTO") StoreScanRewordDTO storeScanRewordDTO);
 }

+ 6 - 0
sailun-allsteel-bus-provider/sailun-allsteel-bus-service/src/main/java/io/platform/store/biz/service/StoreRewardService.java

@@ -4,6 +4,8 @@ package io.platform.store.biz.service;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 
+import io.platform.base.dto.StoreScanRewordDTO;
+import io.platform.base.vo.StoreScanRewordVO;
 import io.platform.store.biz.mapper.StoreRewardMapper;
 import io.platform.store.biz.entity.StoreReward;
 
@@ -21,4 +23,8 @@ public class StoreRewardService extends ServiceImpl<StoreRewardMapper,StoreRewar
     }
 
 
+    public List<StoreScanRewordVO> selectStoreRewords(StoreScanRewordDTO storeScanRewordDTO) {
+        return this.baseMapper.selectStoreRewords(storeScanRewordDTO);
+
+    }
 }

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

@@ -5,9 +5,12 @@ import com.alibaba.dubbo.config.annotation.Service;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 
+import com.github.pagehelper.PageHelper;
 import io.platform.base.common.BaseServiceClient;
 import io.platform.base.common.utils.ExecuteResult;
 
+import io.platform.base.dto.StoreScanRewordDTO;
+import io.platform.base.vo.StoreScanRewordVO;
 import io.platform.store.biz.entity.StoreReward;
 import io.platform.store.biz.service.StoreRewardService;
 import io.platform.store.dto.StoreRewardDto;
@@ -144,4 +147,27 @@ public class StoreRewardServiceClientImpl extends BaseServiceClient<StoreReward,
     }
 
 
+    /**
+     * 获取门店奖励记录
+     * @param storeScanRewordDTO
+     * @return
+     */
+    @Override
+    public ExecuteResult<List> getPageScanReword(StoreScanRewordDTO storeScanRewordDTO) {
+        ExecuteResult<List> result = new ExecuteResult<>();
+        PageHelper.startPage(storeScanRewordDTO.getCurrent(),storeScanRewordDTO.getSize());
+        List<StoreScanRewordVO> scanRewords = this.storeRewardService.selectStoreRewords(storeScanRewordDTO);
+        result.setResult(scanRewords);
+        return result;
+    }
+
+
+
+
+
+
+
+
+
+
 }

+ 27 - 0
sailun-allsteel-bus-provider/sailun-allsteel-bus-service/src/main/resources/mybatis/store/StoreRewardMapper.xml

@@ -4,5 +4,32 @@
 <mapper namespace="io.platform.store.biz.mapper.StoreRewardMapper">
 
 
+    <select id="selectStoreRewords" resultType="io.platform.base.vo.StoreScanRewordVO"
+            parameterType="io.platform.base.dto.StoreScanRewordDTO">
 
+        SELECT
+            BONUS money,
+            TIRE_MODEL tireModel,
+            REWARD_TYPE getWay,
+            TIRENUMBER tyreNum,
+            CREATE_TIME createTime
+        FROM
+            "APP_STORE_REWARD"
+        <where>
+            STORE_ID = #{storeScanRewordDTO.storeId}
+            <if test=" ''!= storeScanRewordDTO.brandCode and null != storeScanRewordDTO.brandCode">
+               and TIRE_BRAND = #{storeScanRewordDTO.brandCode}
+            </if>
+            <if test=" null != storeScanRewordDTO.searchKey and '' != storeScanRewordDTO.searchKey">
+                and KEYWORD LIKE #{storeScanRewordDTO.searchKey}
+            </if>
+            <if test="null != storeScanRewordDTO.startTime">
+                and CREATE_TIME &gt; #{storeScanRewordDTO.startTime}
+            </if>
+            <if test="null != storeScanRewordDTO.endTime">
+                and CREATE_TIME &lt; #{storeScanRewordDTO.endTime}
+            </if>
+        </where>
+        ORDER BY CREATE_TIME DESC
+    </select>
 </mapper>

+ 71 - 0
sailun-allsteel-common/src/main/java/io/platform/base/dto/StoreScanRewordDTO.java

@@ -0,0 +1,71 @@
+package io.platform.base.dto;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * TODO
+ *
+ * 1.门店扫码奖励记录
+ * @author shanxin
+ * @version 1.0
+ * @date 2020/11/17 14:11
+ */
+@Data
+public class StoreScanRewordDTO implements Serializable {
+
+    private static final long serialVersionUID = 5454155825314635342L;
+
+
+    /**
+     * 门店id
+     */
+    private Long storeId;
+
+    /**
+     * 用户id
+     */
+    private String userId;
+
+
+    /**
+     * 品牌code
+     */
+    private String brandCode;
+
+
+    /**
+     * 开始时间
+     *
+     */
+    private Date startTime;
+
+
+    /**
+     * 结束时间
+     */
+    private Date endTime;
+
+
+    /**
+     * 关键词
+     */
+    private String searchKey;
+
+
+    /**
+     * 当前页
+     */
+    private Integer current;
+
+    /**
+     * 页面大小
+     */
+    private Integer size;
+
+
+
+
+}

+ 0 - 1
sailun-allsteel-common/src/main/java/io/platform/base/vo/StoreScanMatnrMsgVO.java

@@ -1,6 +1,5 @@
 package io.platform.base.vo;
 
-import com.sun.xml.internal.ws.spi.db.DatabindingException;
 import lombok.Data;
 
 import java.io.Serializable;

+ 54 - 0
sailun-allsteel-common/src/main/java/io/platform/base/vo/StoreScanRewordVO.java

@@ -0,0 +1,54 @@
+package io.platform.base.vo;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * TODO
+ *
+ * 1.门店奖励信息VO
+ * @author shanxin
+ * @version 1.0
+ * @date 2020/11/17 14:21
+ */
+@Data
+public class StoreScanRewordVO implements Serializable {
+
+    private static final long serialVersionUID = 5454155825314635342L;
+
+
+    /**
+     * 奖励金额
+     */
+    private Long money;
+
+
+    /**
+     * 轮胎型号
+     */
+    private String tireModel;
+
+
+    /**
+     * 胎号
+     */
+    private String tyreNum;
+
+
+    /**
+     * 获得方式
+     */
+    private Integer getWay;
+
+
+    /**
+     * 获得时间
+     */
+    private Date createTime;
+
+
+
+}

+ 2 - 2
sailun-allsteel-sys-provider/sailun-allsteel-sys-service/src/main/java/io/platform/sys/service/client/impl/SysConfigServiceClientImpl.java

@@ -72,7 +72,7 @@ public class SysConfigServiceClientImpl extends BaseServiceClient<SysConfig, Sys
                 result.addErrorMessage("保存失败。");
             }
             // 保存成功! 存redis
-            redisUtils.set(sysConfigDto.getParamKey(),sysConfigDto.getParamValue());
+            redisUtils.set(sysConfigDto.getParamKey(),sysConfigDto);
         } catch (Exception e) {
             logger.error(" 保存错误:" + e.toString(), e);
             result.addErrorMessage("保存错误:" + e.toString());
@@ -92,7 +92,7 @@ public class SysConfigServiceClientImpl extends BaseServiceClient<SysConfig, Sys
                 result.addErrorMessage("更新失败。");
             }
             // 保存成功! 存redis
-            redisUtils.set(sysConfigDto.getParamKey(),sysConfigDto.getParamValue());
+            redisUtils.set(sysConfigDto.getParamKey(),sysConfigDto);
         } catch (Exception e) {
             logger.error(" 更新错误:" + e.toString(), e);
             result.addErrorMessage("更新错误:" + e.toString());