4月22问题修改

jnpf-java-boot/jnpf-admin/src/main/java/jnpf/util/GatewayWhite.java

@@ -145,6 +145,7 @@ public class GatewayWhite {
         whiteUrl.add("/api/datareport/import");
         whiteUrl.add("/api/system/DataInterface/*/Actions/Response");
         whiteUrl.add("/api/system/DataInterface/Actions/GetAuth");
+        whiteUrl.add("/api/system/DataInterface/Actions/GetYunguanAuth/**");
         //swagger3
         whiteUrl.add("/doc.html");
         whiteUrl.add("/webjars/**");

jnpf-java-boot/jnpf-admin/src/main/resources/application-dev.yml

@@ -113,6 +113,10 @@ springdoc:
 #    password: 123456
 
 config:
+  kkFileUrl: http://127.0.0.1:30090/FileServer/ #kkfile文件预览服务地址
+  ApiDomain: http://127.0.0.1:30000 #后端域名(文档预览中使用)
+  FrontDomain: http://127.0.0.1:3000 #前端域名(文档预览中使用)
+  AppDomain: http://127.0.0.1:8080 #app/h5端域名配置(文档预览中使用)
   # ===================== 是否开启测试环境 =====================
   TestVersion: false
   # ===================== ApacheShardingSphere 配置开关 =====================

jnpf-java-boot/jnpf-admin/src/main/resources/application-pro.yml

@@ -17,7 +17,7 @@ spring:
   exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure #排除自动配置，手动配置druid
   datasource:
     db-type: MySQL #数据库类型(可选值 MySQL、SQLServer、Oracle、DM8、KingbaseES、PostgreSQL，请严格按可选值填写)
-    host: 127.0.0.1
+    host: 221.214.32.166
     port: 3309
     username: root
     password: qawsed,.123
@@ -69,7 +69,7 @@ spring:
   # ===================== Redis配置 =====================
   # redis单机模式
   redis:
-    database: 0 #缓存库编号
+    database: 1 #缓存库编号
     host: 127.0.0.1
     port: 6379
     password: qweasd,.123  # 密码为空时，请将本行注释
@@ -113,6 +113,10 @@ springdoc:
 #    password: 123456
 
 config:
+  kkFileUrl: http://127.0.0.1:30090/FileServer/ #kkfile文件预览服务地址
+  ApiDomain: http://127.0.0.1:40000 #后端域名(文档预览中使用)
+  FrontDomain: http://127.0.0.1:9000 #前端域名(文档预览中使用)
+  AppDomain: http://127.0.0.1:8080 #app/h5端域名配置(文档预览中使用)
   # ===================== 是否开启测试环境 =====================
   TestVersion: false
   # ===================== ApacheShardingSphere 配置开关 =====================

jnpf-java-boot/jnpf-admin/src/main/resources/application.yml

@@ -43,10 +43,6 @@ config:
   AllowUploadFileType: jpg,gif,png,bmp,jpeg,doc,docx,ppt,pptx,xls,xlsx,pdf,txt,rar,zip,csv,mp3 #允许上传文件类型
   AllowPreviewFileType: doc,docx,xls,xlsx,ppt,pptx,pdf,jpg,gif,png,bmp,jpeg #允许预览文件类型
   PreviewType: kkfile #文件预览方式 （1.yozo 2.kkfile）默认使用kkfile
-  kkFileUrl: http://127.0.0.1:30090/FileServer/ #kkfile文件预览服务地址
-  ApiDomain: http://127.0.0.1:30000 #后端域名(文档预览中使用)
-  FrontDomain: http://127.0.0.1:3000 #前端域名(文档预览中使用)
-  AppDomain: http://127.0.0.1:8080 #app/h5端域名配置(文档预览中使用)
 
   CodeAreasName: example #代码生成器模块命名
 

jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/SubjectbasicEntity.java

@@ -70,6 +70,8 @@ public class SubjectbasicEntity  {
     private Date operationEnd;
     @TableField(value = "REGISTER_FUNDS" , updateStrategy = FieldStrategy.IGNORED)
     private String registerFunds;
+    @TableField(value = "REGISTER_FUNDS_UNIT" , updateStrategy = FieldStrategy.IGNORED)
+    private String registerFundsUnit;
     @TableField(value = "OPERATION_SCOPE" , updateStrategy = FieldStrategy.IGNORED)
     private String operationScope;
     @TableField(value = "PAID_CAPITAL_PROOF" , updateStrategy = FieldStrategy.IGNORED)
@@ -106,6 +108,8 @@ public class SubjectbasicEntity  {
     private Date allowUnloadingEnd;
     @TableField("UNLOADING_DURATION")
     private String unloadingDuration;
+    @TableField("accounting_period_start")
+    private String accountingPeriodStart;
     @TableField("UNLOADING_EFFICIENCY")
     private String unloadingEfficiency;
     @TableField("ALLOW_LOADING_START")

jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/subjectbasic/SubjectbasicForm.java

@@ -95,6 +95,8 @@ public class SubjectbasicForm  {
     /** 注册资金 **/
     @JsonProperty("registerFunds")
     private String registerFunds;
+    @JsonProperty("registerFundsUnit")
+    private String registerFundsUnit;
     /** 经营范围 **/
     @JsonProperty("operationScope")
     private String operationScope;
@@ -232,4 +234,6 @@ public class SubjectbasicForm  {
     /** 税负率 **/
     @JsonProperty("taxBearingRate")
     private String taxBearingRate;
+    @JsonProperty("accountingPeriodStart")
+    private String accountingPeriodStart;
 }

jnpf-java-boot/jnpf-system/jnpf-system-controller/src/main/java/jnpf/base/controller/DataInterfaceController.java

@@ -532,6 +532,23 @@ public class DataInterfaceController extends SuperController<DataInterfaceServic
         return ActionResult.success(MsgCode.SU005.get(),authorization);
     }
 
+    @Operation(summary = "外部接口获取authorization")
+    @Parameters({
+            @Parameter(name = "appId", description = "应用id", required = true),
+            @Parameter(name = "intefaceId", description = "接口id"),
+            @Parameter(name = "map", description = "参数、参数值对象")
+    })
+    @PostMapping("/Actions/GetYunguanAuth/{appId}/{intefaceId}")
+    @NoDataSourceBind
+    public ActionResult GetYunguanAuth(@PathVariable("appId") String appId,@PathVariable("intefaceId") String intefaceId, @RequestBody(required = false) Map<String,String> map) {
+        InterfaceOauthEntity infoByAppId = interfaceOauthService.getInfoByAppId(appId);
+        if(infoByAppId==null){
+            return ActionResult.fail("appId参数错误");
+        }
+        Map<String, String> authorization = InterfaceUtil.getAuthorization(intefaceId,appId,infoByAppId.getAppSecret(), map);
+        return ActionResult.success(MsgCode.SU005.get(),authorization);
+    }
+
     /**
      * 数据接口导出功能
      *

jnpf-java-boot/jnpf-web/src/utils/apiUrl.js

@@ -3,4 +3,6 @@ module.exports = {
   APIURl: 'http://127.0.0.1:30000'
   // 测试环境接口配置
   // APIURl: 'http://222.71.165.188:30000'
+  // 生产环境接口配置
+  // APIURl: 'http://127.0.0.1:40000'
 }

jnpf-java-boot/jnpf-web/src/views/extend/customer/subjectbasic/form.vue

@@ -77,9 +77,9 @@
             </jnpf-form-tip-item>
           </el-col>
           <el-col :span="8" v-if="judgeShow('fundBalance')">
-            <jnpf-form-tip-item label="资金余额" v-if="judgeShow('fundBalance')" prop="fundBalance">
+            <jnpf-form-tip-item label="资金余额" v-if="judgeShow('companyFax')" prop="companyFax">
-              <JnpfInputNumber v-model="dataForm.fundBalance" @change="changeData('fundBalance',-1)" placeholder="资金余额"
+              <JnpfInputNumber v-model="dataForm.fundBalance" @change="changeData('companyFax',-1)" placeholder="资金余额"
-                :disabled="judgeWrite('fundBalance')" :precision="6" addonAfter="元" :step="1">
+                :disabled="judgeWrite('companyFax')" :precision="6" addonAfter="元" :step="1">
               </JnpfInputNumber>
             </jnpf-form-tip-item>
           </el-col>
@@ -206,6 +206,13 @@
               </JnpfInput>
             </jnpf-form-tip-item>
           </el-col>
+          <el-col :span="8" v-if="judgeShow('customerStarRating')">
+            <jnpf-form-tip-item label="注册资金单位" v-if="judgeShow('customerStarRating')" prop="registerFundsUnit">
+              <JnpfSelect v-model="dataForm.registerFundsUnit" placeholder="请选择"  clearable :style='{ "width": "100%" }' :options="registerFundsUnitOptions"
+                :disabled="judgeWrite('customerStarRating')" :props="registerFundsUnitProps">
+              </JnpfSelect>
+            </jnpf-form-tip-item>
+          </el-col>
           <el-col :span="24" v-if="judgeShow('operationScope')">
             <jnpf-form-tip-item label="经营范围" v-if="judgeShow('operationScope')" prop="operationScope">
               <JnpfTextarea v-model="dataForm.operationScope" @change="changeData('operationScope', -1)"
@@ -490,7 +497,7 @@
           <el-col :span="8" v-if="judgeShow('paymentMethod')">
             <jnpf-form-tip-item label="付款方式" v-if="judgeShow('paymentMethod')" prop="paymentMethod">
               <JnpfSelect v-model="dataForm.paymentMethod" @change="changeData('paymentMethod', -1)" placeholder="请选择"
-                :disabled="judgeWrite('paymentMethod')" clearable :style='{ "width": "100%" }'
+                :disabled="judgeWrite('paymentMethod')" clearable :style='{ "width": "100%" }' :multiple="true"
                 :options="paymentMethodOptions" :props="paymentMethodProps">
               </JnpfSelect>
             </jnpf-form-tip-item>
@@ -621,6 +628,13 @@
               </JnpfInputNumber>
             </jnpf-form-tip-item>
           </el-col>
+          <el-col :span="8" v-if="judgeShow('customerStarRating')">
+            <jnpf-form-tip-item label="账期计算开始" v-if="judgeShow('customerStarRating')" prop="accountingPeriodStart">
+              <JnpfSelect v-model="dataForm.accountingPeriodStart" placeholder="请选择"  clearable :style='{ "width": "100%" }' :options="accountingPeriodStartOptions"
+                 :disabled="judgeWrite('customerStarRating')" :props="accountingPeriodStartProps">
+              </JnpfSelect>
+            </jnpf-form-tip-item>
+          </el-col>
           <el-col :span="24">
             <div style="padding:15px 0px">
               <span style="color: #409EFF;">▋</span>
@@ -1499,6 +1513,7 @@
           operationStart: undefined,
           operationEnd: undefined,
           registerFunds: undefined,
+          registerFundsUnit: "1",
           operationScope: undefined,
           assetProof: [],
           assetMortgageProof: [],
@@ -1507,7 +1522,7 @@
           collaborationStart: undefined,
           demandVolumeDown: undefined,
           demandVolumeUpper: undefined,
-          paymentMethod: "1",
+          paymentMethod : [],
           accountName: undefined,
           bankAccount: undefined,
           depositBank: undefined,
@@ -1521,6 +1536,7 @@
           advanceRatio: undefined,
           accountPeriod: undefined,
           underpaymentMethod: "0",
+          accountingPeriodStart: "1",
           applyForUnderpaymentRatio: undefined,
           marginMethod: "0",
           applyForMarginRatio: undefined,
@@ -1909,6 +1925,34 @@
           "label": "fullName",
           "value": "id"
         },
+        accountingPeriodStartProps: {
+          "label": "fullName",
+          "value": "id"
+        },
+        accountingPeriodStartOptions: [{
+          "fullName": "以第一次出入库",
+          "id": "1"
+        }, {
+          "fullName": "以开票时间",
+          "id": "2"
+        }, {
+          "fullName": "以对账结算时间",
+          "id": "3"
+        }, {
+          "fullName": "以第一笔垫付",
+          "id": "4"
+        }],
+        registerFundsUnitProps: {
+          "label": "fullName",
+          "value": "id"
+        },
+        registerFundsUnitOptions: [{
+          "fullName": "人民币",
+          "id": "1"
+        }, {
+          "fullName": "美元",
+          "id": "2"
+        }],
         depositBankOptions: [],
         depositBankProps: {
           "label": "fullName",
@@ -2088,6 +2132,7 @@
           operationStart: [],
           operationEnd: [],
           registerFunds: [],
+          registerFundsUnit: [],
           operationScope: [],
           assetProof: [],
           assetMortgageProof: [],
@@ -2110,6 +2155,7 @@
           advanceRatio: [],
           accountPeriod: [],
           underpaymentMethod: [],
+          accountingPeriodStart: [],
           applyForUnderpaymentRatio: [],
           marginMethod: [],
           applyForMarginRatio: [],

jnpf-java-boot/jnpf-web/src/views/extend/service/subjectbasic/form.vue

@@ -76,6 +76,13 @@
               </JnpfSelect>
             </jnpf-form-tip-item>
           </el-col>
+          <el-col :span="8" v-if="judgeShow('companyFax')">
+            <jnpf-form-tip-item label="资金余额" v-if="judgeShow('companyFax')" prop="companyFax">
+              <JnpfInputNumber v-model="dataForm.fundBalance" @change="changeData('companyFax',-1)" placeholder="资金余额"
+                :disabled="judgeWrite('companyFax')" :precision="6" addonAfter="元" :step="1">
+              </JnpfInputNumber>
+            </jnpf-form-tip-item>
+          </el-col>
           <el-col :span="24">
               <div style="padding:15px 0px">
                   <span style="color: #409EFF;">▋</span>
@@ -198,6 +205,13 @@
               </JnpfInput>
             </jnpf-form-tip-item>
           </el-col>
+          <el-col :span="8" v-if="judgeShow('customerStarRating')">
+            <jnpf-form-tip-item label="注册资金单位" v-if="judgeShow('customerStarRating')" prop="registerFundsUnit">
+              <JnpfSelect v-model="dataForm.registerFundsUnit" placeholder="请选择"  clearable :style='{ "width": "100%" }' :options="registerFundsUnitOptions"
+                :disabled="judgeWrite('customerStarRating')" :props="registerFundsUnitProps">
+              </JnpfSelect>
+            </jnpf-form-tip-item>
+          </el-col>
           <el-col :span="24" v-if="judgeShow('operationScope')">
             <jnpf-form-tip-item label="经营范围" v-if="judgeShow('operationScope')" prop="operationScope">
               <JnpfTextarea v-model="dataForm.operationScope" @change="changeData('operationScope',-1)"
@@ -469,7 +483,7 @@
           <el-col :span="8" v-if="judgeShow('paymentMethod')">
             <jnpf-form-tip-item label="付款方式" v-if="judgeShow('paymentMethod')" prop="paymentMethod">
               <JnpfSelect v-model="dataForm.paymentMethod" @change="changeData('paymentMethod',-1)" placeholder="请选择"
-                :disabled="judgeWrite('paymentMethod')" clearable :style='{"width":"100%"}'
+                :disabled="judgeWrite('paymentMethod')" clearable :style='{"width":"100%"}' :multiple="true"
                 :options="paymentMethodOptions" :props="paymentMethodProps">
               </JnpfSelect>
             </jnpf-form-tip-item>
@@ -591,6 +605,13 @@
               </JnpfInputNumber>
             </jnpf-form-tip-item>
           </el-col>
+          <el-col :span="8" v-if="judgeShow('customerStarRating')">
+            <jnpf-form-tip-item label="账期计算开始" v-if="judgeShow('customerStarRating')" prop="accountingPeriodStart">
+              <JnpfSelect v-model="dataForm.accountingPeriodStart" placeholder="请选择"  clearable :style='{ "width": "100%" }' :options="accountingPeriodStartOptions"
+                 :disabled="judgeWrite('customerStarRating')" :props="accountingPeriodStartProps">
+              </JnpfSelect>
+            </jnpf-form-tip-item>
+          </el-col>
           <el-col :span="24">
               <div style="padding:15px 0px">
                   <span style="color: #409EFF;">▋</span>
@@ -1432,6 +1453,7 @@
           industryClassify: "614ecab4-845f-4cbc-9ff7-a9968aca6eeb",
           belongPeople: undefined,
           customerStarRating: "517682574965867525",
+          fundBalance : 0,
           country: "中国",
           city: ["354094489370697","354094489370698","354094489403463"],
           address: undefined,
@@ -1445,6 +1467,8 @@
           operationStart: undefined,
           operationEnd: undefined,
           registerFunds: undefined,
+          registerFundsUnit: "1",
+          accountingPeriodStart: "1",
           operationScope: undefined,
           assetProof: [],
           assetMortgageProof: [],
@@ -1453,7 +1477,7 @@
           collaborationStart: undefined,
           demandVolumeDown: undefined,
           demandVolumeUpper: undefined,
-          paymentMethod: "1",
+          paymentMethod : [],
           accountName: undefined,
           bankAccount: undefined,
           depositBank: undefined,
@@ -1836,6 +1860,34 @@
           "label": "fullName",
           "value": "id"
         },
+        accountingPeriodStartProps: {
+          "label": "fullName",
+          "value": "id"
+        },
+        accountingPeriodStartOptions: [{
+          "fullName": "以第一次出入库",
+          "id": "1"
+        }, {
+          "fullName": "以开票时间",
+          "id": "2"
+        }, {
+          "fullName": "以对账结算时间",
+          "id": "3"
+        }, {
+          "fullName": "以第一笔垫付",
+          "id": "4"
+        }],
+        registerFundsUnitProps: {
+          "label": "fullName",
+          "value": "id"
+        },
+        registerFundsUnitOptions: [{
+          "fullName": "人民币",
+          "id": "1"
+        }, {
+          "fullName": "美元",
+          "id": "2"
+        }],
         depositBankOptions: [],
         depositBankProps: {
           "label": "fullName",
@@ -2001,6 +2053,7 @@
           industryClassify: [],
           belongPeople: [],
           customerStarRating: [],
+          fundBalance:[],
           country: [],
           city: [],
           address: [],
@@ -2014,6 +2067,8 @@
           operationStart: [],
           operationEnd: [],
           registerFunds: [],
+          registerFundsUnit: [],
+          accountingPeriodStart: [],
           operationScope: [],
           assetProof: [],
           assetMortgageProof: [],

jnpf-java-boot/jnpf-web/src/views/extend/supplier/subjectbasic/form.vue

@@ -76,6 +76,13 @@
               </JnpfSelect>
             </jnpf-form-tip-item>
           </el-col>
+          <el-col :span="8" v-if="judgeShow('companyFax')">
+            <jnpf-form-tip-item label="资金余额" v-if="judgeShow('companyFax')" prop="companyFax">
+              <JnpfInputNumber v-model="dataForm.fundBalance" @change="changeData('companyFax',-1)" placeholder="资金余额"
+                :disabled="judgeWrite('companyFax')" :precision="6" addonAfter="元" :step="1">
+              </JnpfInputNumber>
+            </jnpf-form-tip-item>
+          </el-col>
           <el-col :span="24">
               <div style="padding:15px 0px">
                   <span style="color: #409EFF;">▋</span>
@@ -198,6 +205,13 @@
               </JnpfInput>
             </jnpf-form-tip-item>
           </el-col>
+          <el-col :span="8" v-if="judgeShow('customerStarRating')">
+            <jnpf-form-tip-item label="注册资金单位" v-if="judgeShow('customerStarRating')" prop="registerFundsUnit">
+              <JnpfSelect v-model="dataForm.registerFundsUnit" placeholder="请选择"  clearable :style='{ "width": "100%" }' :options="registerFundsUnitOptions"
+                :disabled="judgeWrite('customerStarRating')" :props="registerFundsUnitProps">
+              </JnpfSelect>
+            </jnpf-form-tip-item>
+          </el-col>
           <el-col :span="24" v-if="judgeShow('operationScope') && dataForm.calssify != 3">
             <jnpf-form-tip-item label="经营范围" v-if="judgeShow('operationScope')" prop="operationScope">
               <JnpfTextarea v-model="dataForm.operationScope" @change="changeData('operationScope',-1)"
@@ -469,7 +483,7 @@
           <el-col :span="8" v-if="judgeShow('paymentMethod')">
             <jnpf-form-tip-item label="付款方式" v-if="judgeShow('paymentMethod')" prop="paymentMethod">
               <JnpfSelect v-model="dataForm.paymentMethod" @change="changeData('paymentMethod',-1)" placeholder="请选择"
-                :disabled="judgeWrite('paymentMethod')" clearable :style='{"width":"100%"}'
+                :disabled="judgeWrite('paymentMethod')" clearable :style='{"width":"100%"}' :multiple="true"
                 :options="paymentMethodOptions" :props="paymentMethodProps">
               </JnpfSelect>
             </jnpf-form-tip-item>
@@ -591,6 +605,13 @@
               </JnpfInputNumber>
             </jnpf-form-tip-item>
           </el-col>
+          <el-col :span="8" v-if="judgeShow('customerStarRating')">
+            <jnpf-form-tip-item label="账期计算开始" v-if="judgeShow('customerStarRating')" prop="accountingPeriodStart">
+              <JnpfSelect v-model="dataForm.accountingPeriodStart" placeholder="请选择"  clearable :style='{ "width": "100%" }' :options="accountingPeriodStartOptions"
+                 :disabled="judgeWrite('customerStarRating')" :props="accountingPeriodStartProps">
+              </JnpfSelect>
+            </jnpf-form-tip-item>
+          </el-col>
           <el-col :span="24">
               <div style="padding:15px 0px">
                   <span style="color: #409EFF;">▋</span>
@@ -1432,6 +1453,7 @@
           industryClassify: "614ecab4-845f-4cbc-9ff7-a9968aca6eeb",
           belongPeople: undefined,
           customerStarRating: "517682574965867525",
+          fundBalance : 0,
           country: "中国",
           city: ["354094489370697","354094489370698","354094489403463"],
           address: undefined,
@@ -1445,6 +1467,8 @@
           operationStart: undefined,
           operationEnd: undefined,
           registerFunds: undefined,
+          registerFundsUnit: "1",
+          accountingPeriodStart: "1",
           operationScope: undefined,
           assetProof: [],
           assetMortgageProof: [],
@@ -1453,7 +1477,7 @@
           collaborationStart: undefined,
           demandVolumeDown: undefined,
           demandVolumeUpper: undefined,
-          paymentMethod: "1",
+          paymentMethod : [],
           accountName: undefined,
           bankAccount: undefined,
           depositBank: undefined,
@@ -1836,6 +1860,34 @@
           "label": "fullName",
           "value": "id"
         },
+        accountingPeriodStartProps: {
+          "label": "fullName",
+          "value": "id"
+        },
+        accountingPeriodStartOptions: [{
+          "fullName": "以第一次出入库",
+          "id": "1"
+        }, {
+          "fullName": "以开票时间",
+          "id": "2"
+        }, {
+          "fullName": "以对账结算时间",
+          "id": "3"
+        }, {
+          "fullName": "以第一笔垫付",
+          "id": "4"
+        }],
+        registerFundsUnitProps: {
+          "label": "fullName",
+          "value": "id"
+        },
+        registerFundsUnitOptions: [{
+          "fullName": "人民币",
+          "id": "1"
+        }, {
+          "fullName": "美元",
+          "id": "2"
+        }],
         depositBankOptions: [],
         depositBankProps: {
           "label": "fullName",
@@ -2001,6 +2053,7 @@
           industryClassify: [],
           belongPeople: [],
           customerStarRating: [],
+          fundBalance:[],
           country: [],
           city: [],
           address: [],
@@ -2014,6 +2067,8 @@
           operationStart: [],
           operationEnd: [],
           registerFunds: [],
+          registerFundsUnit: [],
+          accountingPeriodStart: [],
           operationScope: [],
           assetProof: [],
           assetMortgageProof: [],