扫码入库代码调整

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

@@ -2,18 +2,53 @@
 package io.platform.store.web.controller.rest;
 
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import io.platform.base.common.utils.R;
+import io.platform.store.dto.StoreAgentBrandLvDto;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 import io.platform.base.common.controller.AbstractController;
 import io.platform.store.web.remote.StoreAgentBrandLvServiceRemote;
 
+import java.util.Map;
 
+
+/**
+ * 门店经销商签约任务rest
+ */
 @RestController
 @RequestMapping("/store/storeAgentBrandLv")
 public class StoreAgentBrandLvRestController extends AbstractController {
 
     @Autowired
 	private StoreAgentBrandLvServiceRemote storeAgentBrandLvServiceRemote;
+
+
+
+    /**
+     * 分页列表
+     */
+    @RequestMapping("/page")
+    @RequiresPermissions("store:storeAgentBrandLv:page")
+    public R page(Page page, StoreAgentBrandLvDto storeAgentBrandLvDto){
+        return R.ok().put("page", storeAgentBrandLvServiceRemote.getPage(page,storeAgentBrandLvDto));
+    }
+
+
+
+    /**
+     * 所有列表
+     */
+    @RequestMapping("/list")
+    @RequiresPermissions("store:storeAgentBrandLv:list")
+    public R list(@RequestParam Map<String, Object> params){
+        //查询列表数据
+        return R.ok().put("list", storeAgentBrandLvServiceRemote.getList(params));
+    }
+
+
 }

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

@@ -2,18 +2,35 @@
 package io.platform.store.web.remote;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.alibaba.dubbo.config.annotation.Reference;
-import io.platform.base.common.utils.ExecuteResult;
 import io.platform.store.dto.StoreAgentBrandLvDto;
+import io.platform.store.dto.StoreAgentBrandLvLogDto;
 import io.platform.store.service.client.api.StoreAgentBrandLvServiceClient;
 import org.springframework.stereotype.Service;
+
 import java.util.List;
 import java.util.Map;
 
 
-
 @Service("storeAgentBrandLvServiceRemote")
 public class StoreAgentBrandLvServiceRemote {
 
     @Reference(check = false)
     private StoreAgentBrandLvServiceClient storeAgentBrandLvServiceClient;
+
+    /**
+     * 根据参数进行 分页查询
+     * @return
+     */
+    public Page<StoreAgentBrandLvDto> getPage(Page<StoreAgentBrandLvDto> page, StoreAgentBrandLvDto storeAgentBrandLvDto){
+        return storeAgentBrandLvServiceClient.getPage(page,storeAgentBrandLvDto);
+    }
+
+    public List<StoreAgentBrandLvDto> getList(Map<String, Object> params){
+        return storeAgentBrandLvServiceClient.queryList(params);
+    }
+
+
+
+
+
 }

sailun-allsteel-bus-provider/saillun-allsteel-bus-api/src/main/java/io/platform/homepage/dto/ConfigBannerDto.java

@@ -5,83 +5,75 @@ import lombok.Data;
 
 @Data
 public class ConfigBannerDto  implements java.io.Serializable{
-private static final long serialVersionUID = 5454155825314635342L;
+    private static final long serialVersionUID = 5454155825314635342L;
 
 
-/**
- * mainId       db_column: MAIN_ID
- */
-private Long mainId;
-/**
- * banner名称描述       db_column: BANNER_NAME
- */
-private String bannerName;
-/**
- * 可见品牌       db_column: BRAND
- */
-private String brand;
-/**
- * 链接       db_column: PATH
- */
-private String path;
-/**
- * banner图片       db_column: IMG_PATH
- */
-private String imgPath;
-/**
- * 类型0静态图片，1活动，2新闻       db_column: TYPE
- */
-private Long type;
-/**
- * 排序       db_column: ORDER_INDEX
- */
-private Long orderIndex;
-/**
- * 备注       db_column: REMARK
- */
-private String remark;
-/**
- * 删除标记 0有效，1删除       db_column: FLAG_DEL
- */
-private Long flagDel;
-/**
- * 宽度       db_column: WIDTH
- */
-private Long width;
-/**
- * 高度       db_column: HEIGHT
- */
-private Long height;
-/**
- * 展示位置0门店       db_column: SHOW_POSITION
- */
-private Long showPosition;
-/**
- * 创建时间       db_column: CREATE_TIME
- */
-private java.util.Date createTime;
-/**
- * 修改时间       db_column: UPDATE_TIME
- */
-private java.util.Date updateTime;
-/**
- * 创建人       db_column: CREATE_BY
- */
-private String createBy;
     /**
-     * 区分APP:0门店APP1小程序2通商APP
+     * mainId       db_column: MAIN_ID
      */
-    private int appType;
+    private Long mainId;
     /**
-     * 标题
+     * banner名称描述       db_column: BANNER_NAME
      */
-    private String msgTitle;
+    private String bannerName;
+    /**
+     * 可见品牌       db_column: BRAND
+     */
+    private String brand;
+    /**
+     * 链接       db_column: PATH
+     */
+    private String path;
+    /**
+     * banner图片       db_column: IMG_PATH
+     */
+    private String imgPath;
+    /**
+     * 类型0静态图片，1活动，2新闻       db_column: TYPE
+     */
+    private Long type;
+    /**
+     * 排序       db_column: ORDER_INDEX
+     */
+    private Long orderIndex;
+    /**
+     * 备注       db_column: REMARK
+     */
+    private String remark;
+    /**
+     * 删除标记 0有效，1删除       db_column: FLAG_DEL
+     */
+    private Long flagDel;
+    /**
+     * 宽度       db_column: WIDTH
+     */
+    private Long width;
+    /**
+     * 高度       db_column: HEIGHT
+     */
+    private Long height;
+    /**
+     * 展示位置0门店       db_column: SHOW_POSITION
+     */
+    private Long showPosition;
     /**
-     * 0系统消息1门店消息2经销商消息3车主消息
+     * 创建时间       db_column: CREATE_TIME
      */
-    private int contentType;
+    private java.util.Date createTime;
     /**
-     * 区分滚动图和跑马灯:0滚动图1跑马灯
+     * 修改时间       db_column: UPDATE_TIME
      */
-    private int modelType;
+    private java.util.Date updateTime;
+    /**
+     * 创建人       db_column: CREATE_BY
+     */
+    private String createBy;
+
+    /*private Integer appType;
+
+    private String msgTitle;
+
+    private Integer contentType;
+
+    private Integer modelType;*/
 }

sailun-allsteel-bus-provider/sailun-allsteel-bus-service/src/main/java/io/platform/homepage/biz/entity/ConfigBanner.java

@@ -110,28 +110,20 @@ public class ConfigBanner extends Model<ConfigBanner>  implements Serializable{
     @TableField("CREATE_BY")
     private String createBy;
 
-    /**
-     * 区分APP:0门店APP1小程序2通商APP
-     */
+    /*
     @TableField("APP_TYPE")
-    private int appType;
+    private Integer appType;
+
 
-    /**
-     * 标题
-     */
     @TableField("MSG_TITLE")
     private String msgTitle;
 
-    /**
-     * 0系统消息1门店消息2经销商消息3车主消息
-     */
+
     @TableField("CONTENT_TYPE")
-    private int contentType;
+    private Integer contentType;
+
 
-    /**
-     * 区分滚动图和跑马灯:0滚动图1跑马灯
-     */
     @TableField("MODEL_TYPE")
-    private int modelType;
+    private Integer modelType;*/
 
 }

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

@@ -124,4 +124,13 @@ public class ScanLrregularRecord extends Model<ScanLrregularRecord>  implements
     @TableField("USER_ID")
     private String userId;
 
+
+    /***
+     * 错误方式 0非正规渠道入库
+     */
+    @TableField("ERROR_TYPE")
+    private Integer errorType;
+
+
+
 }

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

@@ -45,7 +45,8 @@ public class ScanLrregularRecordService extends ServiceImpl<ScanLrregularRecordM
                                        TyreMsgDTO tyreMsgDTO,
                                        String latitude,
                                        String longitude,
-                                       String scanAddress) {
+                                       String scanAddress,
+                                       Integer errorType) {
         RLock lock = redissonClient.getLock(tyreMsgDTO.getTireNumber());
         lock.lock(10, TimeUnit.SECONDS);
         boolean b;
@@ -67,6 +68,7 @@ public class ScanLrregularRecordService extends ServiceImpl<ScanLrregularRecordM
             scanLrregularRecord.setSoldPartyKunner(tyreMsgDTO.getSoldToPartyKunnr());
             scanLrregularRecord.setScanway(tyreMsgDTO.getScanWay());
             scanLrregularRecord.setScanAddress(scanAddress);
+            scanLrregularRecord.setErrorType(errorType);
             b = this.save(scanLrregularRecord);
         } finally {
             lock.lock();

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

@@ -189,6 +189,9 @@ public class ScanRecordService extends ServiceImpl<ScanRecordMapper,ScanRecord>{
         for (TyreMsgDTO tyreMsgDTO : storeBrandTyres) {
             RLock lock = redissonClient.getLock(tyreMsgDTO.getTireNumber());
             lock.lock(30, TimeUnit.SECONDS);
+            // 测试代码！！！！！！
+            tyreMsgDTO.setFlagRegular(0);
+            // 测试代码结束！！！！
             try {
                 StoreAgentBrandLv storeBrandLv = this.getStoreAgentBrandLv(storeScanDTO.getStoreId(),tyreMsgDTO.getBrand());
                 if (null == tyreMsgDTO.getFlagRegular()) {
@@ -205,9 +208,6 @@ public class ScanRecordService extends ServiceImpl<ScanRecordMapper,ScanRecord>{
                     // 通过redis缓存获取轮胎奖励，缓存key:门店id+轮胎号   缓存时间10分钟，如果缓存失效从数据库查询
                     Boolean satisfyActivity = false;
                     Activity activity = redisUtils.get(storeInfo.getMainId() + tyreMsgDTO.getTireNumber(), Activity.class);
-                    if (null == activity) {
-                        activity = this.getActivityByTyreMsg(storeInfo, tyreMsgDTO, storeBrandLv);
-                    }
                     if (null != activity) {
                         satisfyActivity = true;
                     }
@@ -219,14 +219,16 @@ public class ScanRecordService extends ServiceImpl<ScanRecordMapper,ScanRecord>{
                             putInCode,
                             satisfyActivity,
                             tyreMsgDTO,
-                            storeScanDTO.getScanAddress());
-                    // 入库并满足活动进行后续操作
+                            storeScanDTO.getScanAddress(),
+                            tyreMsgDTO.getScanWay(),
+                            "");
+                    // 加库存
                     if (saveScanRecord) {
                         // 加库存
                         this.storeStockService.recordStoreStock(storeScanDTO.getStoreId(),tyreMsgDTO,true);
                     }
-                    if (satisfyActivity) {
-                        // 算奖励（加钱 + 记录奖励日志 + 门店积分）、月度核算
+                    // 入库成功后 轮胎满足活动  算奖励（加钱 + 记录奖励日志 + 门店积分）
+                    if (saveScanRecord && satisfyActivity) {
                         this.storeScanGetSettlement(storeScanDTO.getStoreId(),
                                 activity,
                                 tyreMsgDTO,
@@ -243,7 +245,8 @@ public class ScanRecordService extends ServiceImpl<ScanRecordMapper,ScanRecord>{
                             tyreMsgDTO,
                             storeScanDTO.getLatitude(),
                             storeScanDTO.getLongitude(),
-                            storeScanDTO.getScanAddress());
+                            storeScanDTO.getScanAddress(),
+                            1);
                     nonRegularCount++;
                     nonRegularTyreNumbers.add(tyreMsgDTO.getTireNumber());
                 }
@@ -340,7 +343,7 @@ public class ScanRecordService extends ServiceImpl<ScanRecordMapper,ScanRecord>{
             }
         }
         // 存redis做缓存处理
-        redisUtils.set(storeInfo.getMainId() + tyreMsgDTO.getTireNumber(),activity,60*10);
+        redisUtils.set(storeInfo.getMainId() + tyreMsgDTO.getTireNumber(),activity);
         return activity;
     }
 
@@ -401,7 +404,9 @@ public class ScanRecordService extends ServiceImpl<ScanRecordMapper,ScanRecord>{
                                    String scanNum,
                                    Boolean satisfyActivity,
                                    TyreMsgDTO tyreMsgDTO,
-                                   String scanAddress) {
+                                   String scanAddress,
+                                   String scanWay,
+                                   String kunnr) {
         RLock lock = redissonClient.getLock(tyreMsgDTO.getTireNumber());
         lock.lock(20, TimeUnit.SECONDS);
         Boolean b = true;
@@ -411,7 +416,7 @@ public class ScanRecordService extends ServiceImpl<ScanRecordMapper,ScanRecord>{
             scanRecord.setStoreId(storeId);
             scanRecord.setMatnr(tyreMsgDTO.getMatnr());
             scanRecord.setTireNumber(tyreMsgDTO.getTireNumber());
-            scanRecord.setKunnr(tyreMsgDTO.getSoldToPartyKunnr());
+            scanRecord.setKunnr(kunnr);
             scanRecord.setBrand(tyreMsgDTO.getBrand());
             scanRecord.setSpec(tyreMsgDTO.getSpecs());
             scanRecord.setPatterns(tyreMsgDTO.getPattern());
@@ -422,6 +427,7 @@ public class ScanRecordService extends ServiceImpl<ScanRecordMapper,ScanRecord>{
             scanRecord.setCreateTime(new Date());
             scanRecord.setScanType(scanType);
             scanRecord.setFlagRegular(tyreMsgDTO.getFlagRegular());
+            scanRecord.setScanway(scanWay);
 
             Date shippedDate = DateUtil.parse(tyreMsgDTO.getShippedDate(),"yyyyMMdd");
             scanRecord.setShippedDate(shippedDate);
@@ -563,6 +569,7 @@ public class ScanRecordService extends ServiceImpl<ScanRecordMapper,ScanRecord>{
             RLock lock = redissonClient.getLock(tyreMsgDTO.getTireNumber());
             lock.lock(30, TimeUnit.SECONDS);
             try {
+                StoreAgentBrandLv storeBrandLv = this.getStoreAgentBrandLv(storeScanDTO.getStoreId(),tyreMsgDTO.getBrand());
                 if (null == tyreMsgDTO.getFlagRegular()) {
                     throw new RRException("轮胎正规信息不能为空");
                 } else if ("0".equals(tyreMsgDTO.getFlagRegular().toString())) {
@@ -582,7 +589,9 @@ public class ScanRecordService extends ServiceImpl<ScanRecordMapper,ScanRecord>{
                             putOutCode,
                             false,
                             tyreMsgDTO,
-                            storeScanDTO.getScanAddress());
+                            storeScanDTO.getScanAddress(),
+                            tyreMsgDTO.getScanWay(),
+                            "");
                     if (scanBoolean) {
                         // 出库后操作 -库存
                         this.storeScanGetSettlement(storeId, null, tyreMsgDTO, false);
@@ -596,7 +605,8 @@ public class ScanRecordService extends ServiceImpl<ScanRecordMapper,ScanRecord>{
                             tyreMsgDTO,
                             storeScanDTO.getLatitude(),
                             storeScanDTO.getLongitude(),
-                            storeScanDTO.getScanAddress());
+                            storeScanDTO.getScanAddress(),
+                            1);
                     nonRegularCount++;
                     nonRegularTyreNumbers.add(tyreMsgDTO.getTireNumber());
                 }

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

@@ -141,9 +141,9 @@ public class ScanRecordServiceClientImpl extends BaseServiceClient<ScanRecord,Sc
     public Page<ScanRecordDto> getPage(Page<ScanRecordDto> pageDto,ScanRecordDto scanRecordDto) {
         Page<ScanRecord> page = new Page<>(pageDto.getCurrent(),pageDto.getSize());
 
-        page.setAsc(pageDto.ascs());
+        /*page.setAsc(pageDto.ascs());
         page.setDesc(pageDto.descs());
-        page.condition().putAll(pageDto.condition());
+        page.condition().putAll(pageDto.condition());*/
 
         ScanRecord scanRecord = new ScanRecord();
         revert(scanRecordDto,scanRecord);

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

@@ -166,9 +166,9 @@ public class StoreAgentBrandLvServiceClientImpl extends BaseServiceClient<StoreA
     public Page<StoreAgentBrandLvDto> getPage(Page<StoreAgentBrandLvDto> pageDto,StoreAgentBrandLvDto storeAgentBrandLvDto) {
         Page<StoreAgentBrandLv> page = new Page<>(pageDto.getCurrent(),pageDto.getSize());
 
-        page.setAsc(pageDto.ascs());
+        /*page.setAsc(pageDto.ascs());
         page.setDesc(pageDto.descs());
-        page.condition().putAll(pageDto.condition());
+        page.condition().putAll(pageDto.condition());*/
 
         StoreAgentBrandLv storeAgentBrandLv = new StoreAgentBrandLv();
         revert(storeAgentBrandLvDto,storeAgentBrandLv);

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

@@ -134,9 +134,19 @@ public class StoreBasicInfoServiceClientImpl extends BaseServiceClient<StoreBasi
     public Page<StoreBasicInfoDto> getPage(Page<StoreBasicInfoDto> pageDto,StoreBasicInfoDto storeBasicInfoDto) {
         Page<StoreBasicInfo> page = new Page<>(pageDto.getCurrent(),pageDto.getSize());
 
-        page.setAsc(pageDto.ascs());
+        /*page.setAsc(pageDto.ascs());
         page.setDesc(pageDto.descs());
-        page.condition().putAll(pageDto.condition());
+        page.condition().putAll(pageDto.condition());*/
+        if ("".equals(storeBasicInfoDto.getStoreNum())) {
+            storeBasicInfoDto.setStoreNum(null);
+        }
+        if ("".equals(storeBasicInfoDto.getStoreName())) {
+            storeBasicInfoDto.setStoreName(null);
+        }
+        if ("".equals(storeBasicInfoDto.getStorePhone())) {
+            storeBasicInfoDto.setStorePhone(null);
+        }
+
 
         StoreBasicInfo storeBasicInfo = new StoreBasicInfo();
         revert(storeBasicInfoDto,storeBasicInfo);