| applet/src/main/resources/application.yml | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| manage/src/main/java/com/jilongda/manage/controller/TOrderAccountingController.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| manage/src/main/java/com/jilongda/manage/utils/LoginInfoUtil.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| manage/src/main/java/com/jilongda/manage/vo/TOrderAccountVO.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| manage/src/main/resources/application.yml | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| optometrist/src/main/resources/application.yml | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
applet/src/main/resources/application.yml
@@ -13,7 +13,7 @@ max-request-size: 500MB resolve-lazily: true #设置为懒加载，不然依然会捕获不到异常 profiles: active: dev active: prod main: allow-bean-definition-overriding: true # rabbitmq: @@ -103,8 +103,8 @@ # 数据源 datasource: username: root #测试环境 password: root url: jdbc:mysql://192.168.110.64:3306/eyes?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai password: 123456 url: jdbc:mysql://127.0.0.1:3306/eyes?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai type: com.zaxxer.hikari.HikariDataSource driver-class-name: com.mysql.cj.jdbc.Driver hikari: @@ -153,8 +153,8 @@ # 数据源 datasource: username: root password: Xiwang2024! url: jdbc:mysql://120.26.112.122:3306/jilongda?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai password: 123456 url: jdbc:mysql://127.0.0.1:3306/eyes?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai type: com.zaxxer.hikari.HikariDataSource driver-class-name: com.mysql.cj.jdbc.Driver hikari: manage/src/main/java/com/jilongda/manage/controller/TOrderAccountingController.java
@@ -2,6 +2,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.jilongda.common.basic.ApiResult; import com.jilongda.common.basic.PageInfo; import com.jilongda.manage.authority.model.SecUser; @@ -122,6 +123,9 @@ res.setPayType(one1.getName()); res.setProfitMoney(byId.getProfitMoney()); res.setProfitRating(byId.getProfitRating()); List<TOrderItems> orderItems = orderItemsService.list(Wrappers.lambdaQuery(TOrderItems.class) .eq(TOrderItems::getOrderId, id)); res.setOrderItems(orderItems); return ApiResult.success(res); } @Autowired @@ -132,7 +136,7 @@ List<TOrderGoods> list = dto.getList(); orderGoodsService.updateBatchById(list); TOrder byId = orderService.getById(dto.getId()); byId.setConfirmPayType(dto.getPayTypeName()); byId.setPayTypeName(dto.getPayTypeName()); byId.setPayMoney(dto.getPayMoney()); byId.setCommissionMoney(dto.getCommission()); byId.setIsAccounting(1); manage/src/main/java/com/jilongda/manage/utils/LoginInfoUtil.java
@@ -18,7 +18,7 @@ public Long getUserId(){ String username = JwtTokenUtils.getUsername(); SecUser userName = secUserService.getOne(new QueryWrapper<SecUser>().eq("phone", username).eq("isDelete",0)); SecUser userName = secUserService.getOne(new QueryWrapper<SecUser>().eq("account", username).eq("isDelete",0)); return userName.getId(); } manage/src/main/java/com/jilongda/manage/vo/TOrderAccountVO.java
@@ -48,7 +48,7 @@ @ApiModelProperty(value = "支付方式") private String payType; @ApiModelProperty(value = "确认核算后的支付方式和支付金额") private List<TOrderItems> confirmPayType; private List<TOrderItems> orderItems; @ApiModelProperty(value = "实收金额") private BigDecimal realPayMoney; @ApiModelProperty(value = "手续费扣除") manage/src/main/resources/application.yml
@@ -13,7 +13,7 @@ max-request-size: 500MB resolve-lazily: true #设置为懒加载，不然依然会捕获不到异常 profiles: active: dev active: prod main: allow-bean-definition-overriding: true #sagger文档属性配置 @@ -139,9 +139,9 @@ on-profile: prod # 数据源 datasource: url: jdbc:mysql://192.168.110.64:3306/eyes?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai username: root password: Xiwang2024! password: 123456 url: jdbc:mysql://127.0.0.1:3306/eyes?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai type: com.zaxxer.hikari.HikariDataSource driver-class-name: com.mysql.cj.jdbc.Driver hikari: optometrist/src/main/resources/application.yml
New file @@ -0,0 +1,185 @@ server: port: 9094 tomcat: max-swallow-size: 500MB # servlet: # context-path: /api spring: thymeleaf: cache: false servlet: multipart: max-file-size: 500MB max-request-size: 500MB resolve-lazily: true #设置为懒加载，不然依然会捕获不到异常 profiles: active: prod main: allow-bean-definition-overriding: true #sagger文档属性配置 mvc: static-path-pattern: /** pathmatch: matching-strategy: ant_path_matcher web: resources: static-locations: file:/ ,classpath:/static/ web: swagger: enabled: true service-url: / title: 验光师端-接口文档 description: 请求方式(application/json; charset=utf-8) contact: email: chenkun@lingser.com name: 小帅 req-fixed-parameters: - { paramKey: 'token', description: '登录返回的token',required: false } # mybatis mybatis-plus: # 此处在多数据源中生效 config-location: classpath:/mybatis-config.xml global-config: banner: false db-config: logic-not-delete-value: 0 logic-delete-value: 1 # 指定Mapper文件位置 mapper-locations: classpath*:mapping/*.xml logging: file: # path 及 name只能二选一，自定义名称选name，path的默认文件名spring.log # path: /logs name: logs/app.log logback: rollingpolicy: max-history: 3 level: com: sales: manage: debug debug: true #OSS及短信配置 oss: config: templateCodeTest: "SMS_154950909" signNameTest: "阿里云短信测试" accessKeyId: LTAI5tL1dE1DzT4ZYdDQZ8k7 accessKeySecret: 4SZBtTyLhOoYRcfMS4SVAtGz8ZnxRP endpoint: oss-cn-shanghai.aliyuncs.com bucketName: sales-bucket cdn: signName: "眼度" templateCode: SMS_180051431 shareTemplateCode: SMS_180051431 gaode: map: key: 254fcc7a516f4f8154f7bf8d6988a198 #254fcc7a516f4f8154f7bf8d6988a198 db0695fad8211da0a6c3cd42b6213342 fcdb6f6285e3774579fb7bb8000c89a2 file: uri: https://nncdn.pharmacylinked.com #测试环境 --- spring: config: activate: on-profile: dev # 数据源 datasource: username: root #测试环境 password: 123456 url: jdbc:mysql://127.0.0.1:3306/eyes?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai type: com.zaxxer.hikari.HikariDataSource driver-class-name: com.mysql.cj.jdbc.Driver hikari: minimum-idle: 10 # 连接池大小 = （核心数*2 + 有效磁盘数） maximum-pool-size: 5 auto-commit: true idle-timeout: 30000 pool-name: DatebookHikariCP-Applet max-lifetime: 1800000 connection-timeout: 30000 connection-test-query: SELECT 1 redis: #测试环境 host: 127.0.0.1 port: 6379 timeout: 5000 database: 10 password: 123456 download: path: /root/sales alipay: appid: "" appPrivateKey: "" alipayPublicKey: "" alipay_public_key: "" wx: appid: "" mchId: "" key: callbackPath: "" hw: sms: url: "" appKey: "" appSecret: "" sender: "" templateId: "" signature: "" #正式环境 --- spring: config: activate: on-profile: prod # 数据源 datasource: username: root password: 123456 url: jdbc:mysql://127.0.0.1:3306/eyes?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai type: com.zaxxer.hikari.HikariDataSource driver-class-name: com.mysql.cj.jdbc.Driver hikari: minimum-idle: 10 # 连接池大小 = （核心数*2 + 有效磁盘数） maximum-pool-size: 5 auto-commit: true idle-timeout: 30000 pool-name: DatebookHikariCP-Applet max-lifetime: 1800000 connection-timeout: 30000 connection-test-query: SELECT 1 redis: #测试环境 host: 127.0.0.1 port: 6379 timeout: 8000 database: 1 password: xsbf@2022 download: path: /root/sales alipay: appid: "" appPrivateKey: "" alipayPublicKey: "" alipay_public_key: "" wx: appid: "" mchId: "" key: callbackPath: "" hw: sms: url: "" appKey: "" appSecret: "" sender: "" templateId: "" signature: ""
