fix: 下单异常提示，核销退回异常修复

src/main/java/com/qs/serve/modules/bms/service/impl/BmsRegion2ServiceImpl.java

@@ -206,7 +206,11 @@ public class BmsRegion2ServiceImpl extends ServiceImpl<BmsRegion2Mapper,BmsRegio
         lqw.eq(BmsRegion2::getName,value)
                 .or()
                 .eq(BmsRegion2::getCode,value);
-        return this.getOne(lqw,true);
+        List<BmsRegion2> region2List = this.list(lqw);
+        if(region2List.size()>0){
+            return region2List.get(0);
+        }
+        return null;
     }
 
     public BmsRegion2 toSetLevel(BmsRegion2 param) {

src/main/java/com/qs/serve/modules/oms/entity/bo/OmsOrderModifyParam.java

@@ -70,6 +70,8 @@ public class OmsOrderModifyParam {
 
         private BigDecimal volume;
 
+        private String remark;
+
     }
 
 }

src/main/java/com/qs/serve/modules/oms/entity/bo/OmsOrderSkuBo.java

@@ -51,6 +51,9 @@ public class OmsOrderSkuBo {
         private BigDecimal weight;
 
         private BigDecimal volume;
+
+        private String remark;
+
     }
 
 }

src/main/java/com/qs/serve/modules/oms/service/impl/OmsOrderServiceImpl.java

@@ -182,6 +182,7 @@ public class OmsOrderServiceImpl extends ServiceImpl<OmsOrderMapper,OmsOrder> im
                     }
                     shoppingCart.setVolume(spuParam.getVolume());
                     shoppingCart.setWeight(spuParam.getWeight());
+                    shoppingCart.setRemark(spuParam.getRemark());
                 }
             }
             shoppingCart.setQuantity(qty);
@@ -296,6 +297,7 @@ public class OmsOrderServiceImpl extends ServiceImpl<OmsOrderMapper,OmsOrder> im
             orderItem.setSpuTitle(goodsSpu.getName());
             orderItem.setWeight(modifyItem.getWeight());
             orderItem.setVolume(modifyItem.getVolume());
+            orderItem.setRemark(modifyItem.getRemark());
             if(goodsSku!=null){
                 orderItem.setSkuId(goodsSku.getId());
                 orderItem.setSkuTitle(goodsSku.getSkuName());
@@ -461,6 +463,7 @@ public class OmsOrderServiceImpl extends ServiceImpl<OmsOrderMapper,OmsOrder> im
             orderItem.setOrderSn(order.getOrderSn());
             orderItem.setWeight(shoppingCart.getWeight());
             orderItem.setVolume(shoppingCart.getVolume());
+            orderItem.setRemark(shoppingCart.getRemark());
             if(confirmOrder.getLatitudeFrom()!=null&&confirmOrder.getLatitudeFrom().equals("SPU")){
                 // spu维度
                 GoodsSku goodsSku = goodsSkuService.getById(shoppingCart.getSkuId());
@@ -637,6 +640,9 @@ public class OmsOrderServiceImpl extends ServiceImpl<OmsOrderMapper,OmsOrder> im
         BmsSupplier supplier = bmsSupplierMapper.selectById(omsOrder.getSupplierId());
         String lastRegionId = supplier.getRegionLast();
         BmsRegion bmsRegion = bmsRegionMapper.selectById(lastRegionId);
+        if(bmsRegion==null){
+            Assert.throwEx("客户档案["+supplier.getCode()+"]缺失销售区域数据，请联系管理员");
+        }
         //保存到临时表-主表
         LocalDateTime nowTime = LocalDateTime.now();
         OmsXltOrder xltOrder = new OmsXltOrder();
@@ -701,7 +707,7 @@ public class OmsOrderServiceImpl extends ServiceImpl<OmsOrderMapper,OmsOrder> im
             xltOrderItem.setXieRuShiJian(nowTime);
             xltOrderItem.setChuLiShiJian(null);
             xltOrderItem.setRowCreateDate(nowTime);
-            xltOrderItem.setBeiZhu(null);
+            xltOrderItem.setBeiZhu(orderItem.getRemark());
             xltOrderItem.setZhuangTai(0);
             xltOrderItemList.add(xltOrderItem);
         }

src/main/java/com/qs/serve/modules/sys/entity/SysUser.java

@@ -142,7 +142,7 @@ public class SysUser implements Serializable {
 
     /** 在职状态【0->离职；1->在职；】 */
     @TableField(exist = false)
-    private Integer servingQueryState;
+    private String servingQueryState;
 
     /** 查询参数:部门ID多选 */
     @TableField(exist = false)

src/main/java/com/qs/serve/modules/tbs/entity/TbsActivity.java

@@ -220,6 +220,11 @@ public class TbsActivity implements Serializable {
      */
     private Integer vtbMatchTypeFlag;
 
+    /**
+     * 当前核销单(支持总单)
+     */
+    private String currVerificationId;
+
     @TableField(exist = false)
     private List<?> attachList;
 

src/main/java/com/qs/serve/modules/tbs/service/impl/TbsCostApplyPart1ServiceImpl.java

@@ -136,6 +136,7 @@ public class TbsCostApplyPart1ServiceImpl implements TbsCostApplyPart1Service {
         costApply.setUpdateTime(null);
         costApply.setUpdateBy(null);
         costApply.setCancelFlag(null);
+        costApply.setSubmitTime(null);
         costApply.setChangeSourceId(orgCost.getId());
         costApply.setChangeExtendId(null);
         costApply.setChargeState(TbsCostApplyState.State_0_unPublish.getCode());
@@ -251,6 +252,7 @@ public class TbsCostApplyPart1ServiceImpl implements TbsCostApplyPart1Service {
             orgActivity.setCancelFlag(null);
             orgActivity.setReopenFlag(null);
             orgActivity.setFinishedFlag(null);
+            orgActivity.setPreEndDateBack(null);
             orgActivity.setFinishedTime(null);
             orgActivity.setCostPassFlag(null);
             orgActivity.setReleaseFlag(null);

src/main/java/com/qs/serve/modules/vtb/controller/VtbVerificationController.java

@@ -419,7 +419,16 @@ public class VtbVerificationController {
     @PreAuthorize("hasRole('tbs:costApply:commit')")
     public R<?> commitAffair(@RequestBody @Valid TbsAffairCommitBo affairCommit){
         seeYonService.testConnection();
-        return verificationApplication.commitAffair(affairCommit);
+        R r = verificationApplication.commitAffair(affairCommit);
+        if(affairCommit.getState().equals(2)){
+            try {
+                Thread.sleep(500);
+            } catch (InterruptedException e) {
+                e.printStackTrace();
+            }
+            vtbVerificationOperationService.runCompensate(affairCommit.getCostApplyId()+"");
+        }
+        return r;
     }
 
     /**

src/main/java/com/qs/serve/modules/vtb/service/VtbVerificationApplication.java

@@ -472,10 +472,16 @@ public class VtbVerificationApplication {
             activityPayConditionService.updateById(payCondition);
         }
         //还原活动为待核销状态
+
+        TbsActivity tbsActivity = tbsActivityService.getById(verification.getActivityId());
+
         TbsActivity activity = new TbsActivity();
         activity.setId(verification.getActivityId());
         activity.setActivityState(TbsActivityState.STATE_0_Todo);
-        activity.setPreEndDateBack(LocalDate.now().plusDays(3));
+        LocalDate dongDate = LocalDate.now().plusDays(3);
+        if(tbsActivity.getPreCheckDate().isBefore(dongDate)){
+            activity.setPreEndDateBack(dongDate);
+        }
         tbsActivityService.updateById(activity);
     }
 

src/main/java/com/qs/serve/modules/vtb/service/impl/VtbVerificationOperationServiceImpl.java

@@ -109,6 +109,16 @@ public class VtbVerificationOperationServiceImpl implements SeeYonOperationServi
             activity.setActivityState(TbsActivityState.STATE_0_Todo);
             tbsActivityService.updateById(activity);
         }
+        TbsActivity tbsActivity = tbsActivityService.getById(verification.getActivityId());
+        if(tbsActivity.getCurrVerificationId()!=null && tbsActivity.getCurrVerificationId().equals(verification.getId().toString())&&
+        //if(
+                tbsActivity.getActivityState().equals(TbsActivityState.STATE_1_Checking)){
+            //还原活动为待核销状态
+            TbsActivity activity = new TbsActivity();
+            activity.setId(verification.getActivityId());
+            activity.setActivityState(TbsActivityState.STATE_0_Todo);
+            tbsActivityService.updateById(activity);
+        }
         return null;
     }
 

src/main/java/com/qs/serve/modules/vtb/service/impl/VtbVerificationServiceImpl.java

@@ -848,6 +848,7 @@ public class VtbVerificationServiceImpl extends ServiceImpl<VtbVerificationMappe
         TbsActivity activityParam = new TbsActivity();
         activityParam.setId(activity.getId());
         activityParam.setActivityState(TbsActivityState.STATE_1_Checking);
+        activityParam.setCurrVerificationId(verification.getId()+"");
         activityService.updateById(activityParam);
 
         //更新原来的核销为关闭

src/main/resources/application-dev.yml

@@ -3,7 +3,28 @@ project:
   web_url: 'http://192.168.0.9:6031'
   host_url: 'http://192.168.0.9:7400'
   pc-web-local: 'D:\Software\Nginx1.8\html\jslcrm3\'
-  task: true
+  apis:
+    #支付接口
+    #cost-to-pay: 'http://59.37.164.96:2506/action/cms/api/add'
+    #支付接口(新)
+    #cost-to-pay: 'http://59.37.164.96:2505/api/cms/api/add'
+    cost-to-pay: 'http://0.0.0.0:2505/api/cms/api/add'
+    # 同步核销的支付状态
+    #check-pay-status: 'http://59.37.164.96:2506/action/cms/cost/match'
+    check-pay-status: 'http://0.0.0.0:2506/action/cms/cost/match'
+    # 核销生成报价单接口
+    diaodu-plan-order: ''
+    # 嘉士利接口，spu转换sku
+    #spu-to-sku: 'http://59.37.164.96:2505/api/cms/order/matchInvCode'
+    spu-to-sku: 'http://0.0.0.0:2505/api/cms/order/matchInvCode'
+    # 政策同步
+    #policy-sync-cate: 'http://192.168.10.18:9003/api/cms/saleCost/costPolicy/syncCate'
+    policy-sync-cate: 'http://0.0.0.0:9003/api/cms/saleCost/costPolicy/syncCate'
+    # 政策同步旧的
+    #policy-sync-inv: 'http://192.168.10.18:9003/api/cms/saleCost/costPolicy/syncInv'
+    policy-sync-inv: 'http://0.0.0.0:9003/api/cms/saleCost/costPolicy/syncInv'
+
+  task: false
   dev: true
   seeyon:
     enable: true
@@ -24,6 +45,11 @@ tencent:
     sdkAppId: 1400174031
     signName: 柒胜软件
     templateId: 689207
+#天翼云配置
+tianyi:
+  sms:
+    appid: 'WIgWyCFn4DnHLtjKBIXBVyZbGevFg3J4'
+    appKey: 'bjfsZlF01OZPUzyiCLSFOrOOnfsZhYZJ'
 aliyun:
   oss:
     bucket: qsjslservice
@@ -36,19 +62,51 @@ server:
   port: 7400
   servlet:
     context-path: /
+
+
+
 #SpringBoot相关
 spring:
   datasource:
-    #driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
+    # 旧的
-    #url: jdbc:sqlserver://192.168.0.8:1433;DatabaseName=JSL_QMS
+    driver-class-name: com.mysql.cj.jdbc.Driver
-    #username: sa
+    url: jdbc:mysql://192.168.0.9:3306/jsl_mall_qs_dev?useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true
-    #password: 123456Aa
+    username: kpjsl
+    password: '123456'
+    # 新的
+    dynamic:
+      primary: crm_db #设置默认的数据源或者数据源组,默认值即为master
+      strict: false #严格匹配数据源,默认false. true未匹配到指定数据源时抛异常,false使用默认数据源
+      datasource:
+        crm_db:
           driver-class-name: com.mysql.cj.jdbc.Driver
           url: jdbc:mysql://192.168.0.9:3306/jsl_mall_qs_dev?useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true
           username: kpjsl
           password: 123456
+        qisheng:
+          url: jdbc:sqlserver://192.168.10.11:1433;DatabaseName=JSL_COST_QS_TEST
+          username: sa
+          password: JSL2282125
+          driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
+#SpringBoot相关
+    hikari:
+      #连接池名
+      pool-name: DateHikariCP
+      #最小空闲连接数
+      minimum-idle: 10
+      # 空闲连接存活最大时间，默认600000（10分钟）
+      idle-timeout: 180000
+      # 连接池最大连接数，默认是10
+      maximum-pool-size: 30
+      # 此属性控制从池返回的连接的默认自动提交行为,默认值：true
+      auto-commit: true
+      # 此属性控制池中连接的最长生命周期，值0表示无限生命周期，默认1800000即30分钟
+      max-lifetime: 1800000
+      # 数据库连接超时时间,默认30秒，即30000
+      connection-timeout: 30000
+      connection-test-query: SELECT 1
   redis:
-    database: 4
+    database: 1
     host: 127.0.0.1
     port: 6379
     password:

src/main/resources/application.yml

@@ -43,7 +43,7 @@ mybatis-plus:
   type-aliases-package: com.qs.serve.modules.*.entity.*
   configuration:
     map-underscore-to-camel-case: true
-    #log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
+    #log-impl: org.apache.ibatis.logging.nologging.NoLoggingImpl
   global-config:
     banner: false
     db-config:
@@ -58,6 +58,7 @@ logging:
     com.qs.serve: debug
     #com.qs.serve.modules.his: info
     com.qs.serve.modules.sys: info
+    com.qs.serve.modules.tag: info
     org.xnio.nio: info
     org.springframework: info
     com.baomidou: info

src/main/resources/mapper/sys/SysUserMapper.xml

@@ -79,8 +79,7 @@
             <if test="query.superFlag != null"> and sys_user.super_flag = #{query.superFlag}</if>
             <if test="query.loginEnable != null"> and sys_user.login_enable = #{query.loginEnable}</if>
             <if test="query.servingState != null"> and sys_user.serving_state = #{query.servingState}</if>
-            <if test="query.servingQueryState != null and query.servingQueryState = 0"> and sys_user.serving_state = 0 </if>
+            <if test="query.servingQueryState != null and query.servingQueryState = '1' "> and sys_user.serving_state in (1,2)</if>
-            <if test="query.servingQueryState != null and query.servingQueryState = 1"> and sys_user.serving_state in (1,2)</if>
             <if test="query.salesFlag != null"> and sys_user.sales_flag = #{query.salesFlag}</if>
             <if test="query.identityNo != null and query.identityNo != ''"> and sys_user.identity_no = #{query.identityNo}</if>
             <if test="query.remark != null and query.remark != ''"> and sys_user.remark = #{query.remark}</if>