From 44d8a0c9c1fa4233285057438e0fd5de221e0dc8 Mon Sep 17 00:00:00 2001 From: mactj Date: Fri, 22 Jan 2021 18:55:34 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=95=86=E6=88=B7=E8=AF=81=E4=B9=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../apiclient_cert.p12 | Bin 0 -> 2710 bytes .../apiclient_cert.pem | 23 ++++++++ .../apiclient_key.pem | 28 +++++++++ .../证书使用说明.txt | 18 ++++++ .../winery/controller/AppOrderController.java | 9 +-- .../com/ruoyi/winery/domain/AppOrder.java | 4 -- mini-app/src/apis/mallApis.js | 12 ++-- .../src/components/mall/tab/mall-home.wpy | 1 - .../src/main/resources/application.yml | 9 ++- .../cert/apiclient_cert1605949156.p12 | Bin 0 -> 2710 bytes ruoyi-ui/src/mixin/common.js | 28 +++++++++ ruoyi-ui/src/views/goods/goods_main/index.vue | 17 +----- ruoyi-ui/src/views/winery/detail/index.vue | 55 +++++++++++------- ruoyi-ui/src/views/winery/order/index.vue | 22 ++++--- 14 files changed, 161 insertions(+), 65 deletions(-) create mode 100644 doc/证书相关/1605949156_20210122_cert/apiclient_cert.p12 create mode 100644 doc/证书相关/1605949156_20210122_cert/apiclient_cert.pem create mode 100644 doc/证书相关/1605949156_20210122_cert/apiclient_key.pem create mode 100644 doc/证书相关/1605949156_20210122_cert/证书使用说明.txt create mode 100644 ruoyi-admin/src/main/resources/cert/apiclient_cert1605949156.p12 diff --git a/doc/证书相关/1605949156_20210122_cert/apiclient_cert.p12 b/doc/证书相关/1605949156_20210122_cert/apiclient_cert.p12 new file mode 100644 index 0000000000000000000000000000000000000000..8856524a35af482616dcb82998917f073731a089 GIT binary patch literal 2710 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 lqw = Wrappers.lambdaQuery(appOrder); - if (appOrder.getDeptId() != null) { - lqw.eq(AppOrder::getDeptId, appOrder.getDeptId()); - } if (appOrder.getUserId() != null) { lqw.eq(AppOrder::getUserId, appOrder.getUserId()); } @@ -175,7 +172,7 @@ public class AppOrderController extends BaseController { public AjaxResult add(@RequestBody AppOrder appOrder, HttpServletRequest req) { Long userId = getLoginUser().getUser().getUserId(); String username = getUsername(); - Long deptId = getDeptId(); + String id = System.currentTimeMillis() + RandomUtil.randomNumbers(6); @@ -191,7 +188,6 @@ public class AppOrderController extends BaseController { appOrder.setPostAddress(address.getAddress()); appOrder.setId(id); - appOrder.setDeptId(getDeptId()); appOrder.setUserId(userId); // 计算总金额 @@ -201,7 +197,8 @@ public class AppOrderController extends BaseController { GoodsMain goods = goodsMainService.getById(detail.getGoodsId()); detail.setUserId(userId); detail.setOrderId(id); - detail.setDeptId(deptId); + // 使用产品对应酒庄id + detail.setDeptId(goods.getDeptId()); detail.setStatus(0); detailService.save(detail); totalFee += (goods.getGoodsPrice().multiply(new BigDecimal(100)).intValue() * detail.getGoodsCount()); diff --git a/hope-winery/src/main/java/com/ruoyi/winery/domain/AppOrder.java b/hope-winery/src/main/java/com/ruoyi/winery/domain/AppOrder.java index 92a10dde5..51de19276 100644 --- a/hope-winery/src/main/java/com/ruoyi/winery/domain/AppOrder.java +++ b/hope-winery/src/main/java/com/ruoyi/winery/domain/AppOrder.java @@ -39,10 +39,6 @@ private static final long serialVersionUID=1L; @TableId(value = "id", type = IdType.INPUT) private String id; - /** 部门ID */ - @Excel(name = "部门ID") - private Long deptId; - /** 用户ID */ @Excel(name = "用户ID") private Long userId; diff --git a/mini-app/src/apis/mallApis.js b/mini-app/src/apis/mallApis.js index ab8dcd0ca..b02097281 100644 --- a/mini-app/src/apis/mallApis.js +++ b/mini-app/src/apis/mallApis.js @@ -24,18 +24,18 @@ class MallApis { }) } - getActivityList() { - return request.get({ - url: baseUrl + 'winery/activity/open/list' - }) - } - getHotSwitch() { return request.get({ url: baseUrl + 'winery/activity/open/hotSwitch' }) } + getActivityList() { + return request.get({ + url: baseUrl + 'winery/activity/open/list' + }) + } + getNotice() { return request.get({ url: baseUrl + 'winery/activity/open/notice' diff --git a/mini-app/src/components/mall/tab/mall-home.wpy b/mini-app/src/components/mall/tab/mall-home.wpy index 5d86f7c6c..50625d28d 100644 --- a/mini-app/src/components/mall/tab/mall-home.wpy +++ b/mini-app/src/components/mall/tab/mall-home.wpy @@ -49,7 +49,6 @@ font-size: 12px; color: #999; display: flex; - } .grid-item { diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml index 63f3df9b1..da6722a9f 100644 --- a/ruoyi-admin/src/main/resources/application.yml +++ b/ruoyi-admin/src/main/resources/application.yml @@ -210,9 +210,12 @@ wxmini: # secret: 94ee42c0899a6ceccf353e1e729c50d4 # 宁夏通 secret: dc55bc1729090bdff9b63e1a5f0d03b2 # 紫色名片 - mchId: 1486984962 - mchKey: 82aZ9Tb6eu5W2HdXKQWZU2SztU8w8nJ8 - keyPath: "classpath:/cert/apiclient_cert1486984962.p12" # p12证书的位置，可以指定绝对路径，也可以指定类路径（以classpath:开头） +# mchId: 1486984962 + mchId: 1605949156 +# mchKey: 82aZ9Tb6eu5W2HdXKQWZU2SztU8w8nJ8 + mchKey: 2e7fe280d91ded48798365961db89951 +# keyPath: "classpath:/cert/apiclient_cert1486984962.p12" # p12证书的位置，可以指定绝对路径，也可以指定类路径（以classpath:开头） + keyPath: "classpath:/cert/apiclient_cert1605949156.p12" # p12证书的位置，可以指定绝对路径，也可以指定类路径（以classpath:开头） subAppId: #服务商模式下的子商户公众账号ID subMchId: #服务商模式下的子商户号 diff --git a/ruoyi-admin/src/main/resources/cert/apiclient_cert1605949156.p12 b/ruoyi-admin/src/main/resources/cert/apiclient_cert1605949156.p12 new file mode 100644 index 0000000000000000000000000000000000000000..8856524a35af482616dcb82998917f073731a089 GIT binary patch literal 2710 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 { @@ -11,4 +12,31 @@ Vue.filter('getImage200', val => { }) +// 定义一个混入对象 +export const CommonMixin = { + data() { + return { + + deptOptions: [] + } + }, + created: function () { + listDept().then(r => { + this.deptOptions = r.data.filter(x => x.parentId === 300) + }) + }, + methods: { + + // 商户类型字典翻译 + deptFormat(row, column) { + + if (this.deptOptions.length < 1) { + return '' + } + const dept = this.deptOptions.filter(x => x.deptId === row.deptId)[0] + return dept.deptName + } + + } +} diff --git a/ruoyi-ui/src/views/goods/goods_main/index.vue b/ruoyi-ui/src/views/goods/goods_main/index.vue index dcdf1fcf6..e8c802c4b 100644 --- a/ruoyi-ui/src/views/goods/goods_main/index.vue +++ b/ruoyi-ui/src/views/goods/goods_main/index.vue @@ -254,13 +254,14 @@ import { import UploadImage from '@/components/UploadImage/index' import UploadImageMultiple from '@/components/UploadImageMultiple/index' -import CommonMixin from "@/mixin/common"; + import Editor from '@/components/Editor/index'; import {listSpec} from "@/api/goods/goods_spec"; import {getDept, listDept} from "@/api/system/dept"; import {selectDictLabel} from "@/utils/ruoyi"; import * as settings from "@/settings"; import {imageBaseUrl} from "@/settings"; +import {CommonMixin} from "@/mixin/common"; export default { name: "GoodsMain", @@ -341,11 +342,7 @@ export default { this.goodsTypeOptions = response.data; }); - listDept().then(r => { - this.deptOptions = r.data.filter(x => x.parentId === 300) - - }) }, methods: { inputGoodsFaceImg(fileName) { @@ -364,16 +361,6 @@ export default { goodsTypeFormat(row, column) { return this.selectDictLabel(this.goodsTypeOptions, row.goodsType); }, - - // 商户类型字典翻译 - deptFormat(row, column) { - - if (this.deptOptions.length < 1) { - return '' - } - const dept = this.deptOptions.filter(x => x.deptId === row.deptId)[0] - return dept.deptName - }, /** 查询商品信息列表 */ getList() { this.loading = true; diff --git a/ruoyi-ui/src/views/winery/detail/index.vue b/ruoyi-ui/src/views/winery/detail/index.vue index f202e793b..67aac59be 100644 --- a/ruoyi-ui/src/views/winery/detail/index.vue +++ b/ruoyi-ui/src/views/winery/detail/index.vue @@ -1,15 +1,18 @@ @@ -225,10 +238,12 @@