From 149798bbe4e1a32f7d783aa632d355fea1e97c08 Mon Sep 17 00:00:00 2001 From: From-wh Date: Fri, 21 Apr 2023 11:27:01 +0800 Subject: [PATCH 1/6] feat: model name --- .../components/FoundationFor.vue | 69 +++++++------------ .../src/pages/system/codeGeneration/index.vue | 9 ++- 2 files changed, 32 insertions(+), 46 deletions(-) diff --git a/template/admin/src/pages/system/codeGeneration/components/FoundationFor.vue b/template/admin/src/pages/system/codeGeneration/components/FoundationFor.vue index c494bf82d..df755b1b3 100644 --- a/template/admin/src/pages/system/codeGeneration/components/FoundationFor.vue +++ b/template/admin/src/pages/system/codeGeneration/components/FoundationFor.vue @@ -3,10 +3,16 @@ crud生成说明 @@ -29,11 +35,15 @@
选项，选择的菜单成功后会自动写入到此菜单下
- +
生成菜单为可选项，不填写默认生成的菜单名称将为表名；生成后会把自动生成的权限默认加入该菜单下
+ + +
用于生成模块名称
+
@@ -65,11 +75,7 @@ > @@ -156,6 +138,7 @@ export default { foundationRules: { // pid: [{ required: true, message: '请输入菜单', trigger: 'blur' }], tableName: [{ required: true, message: '请输入表名', trigger: 'blur' }], + modelName: [{ required: true, message: '请输入模块名', trigger: 'blur' }], }, menusList: [], columnTypeList: [], @@ -258,13 +241,13 @@ export default { }, mounted() {}, methods: { - disabledInput(index){ + disabledInput(index) { let fieldInfo = this.tableField[index]; - let res = ['addTimestamps', 'addSoftDelete'].includes(this.tableField[index].field_type) + let res = ['addTimestamps', 'addSoftDelete'].includes(this.tableField[index].field_type); if (fieldInfo.primaryKey) { res = true; } - if (fieldInfo.field==='delete_time' && fieldInfo.field_type === 'timestamp') { + if (fieldInfo.field === 'delete_time' && fieldInfo.field_type === 'timestamp') { res = true; } return res; diff --git a/template/admin/src/pages/system/codeGeneration/index.vue b/template/admin/src/pages/system/codeGeneration/index.vue index c67a53451..6ff0e7ef7 100644 --- a/template/admin/src/pages/system/codeGeneration/index.vue +++ b/template/admin/src/pages/system/codeGeneration/index.vue @@ -59,6 +59,7 @@ export default { foundation: { pid: '', tableName: '', + modelName: '', isTable: 1, menuName: '', }, @@ -87,6 +88,7 @@ export default { if (this.currentTab == 0) { // if (!this.formItem.foundation.pid) return this.$Message.warning('请选择菜单'); if (!this.formItem.foundation.tableName) return this.$Message.warning('请输入表名'); + if (!this.formItem.foundation.modelName) return this.$Message.warning('请输入模块名'); if (!this.formItem.foundation.isTable) { if (!this.$refs.Foundation.tableField.length) return this.$Message.warning('请先添加表数据'); if (this.$refs.Foundation.tableField.length) @@ -109,8 +111,6 @@ export default { ...this.formItem.foundation, filePath: this.formItem.storage, tableField: this.$refs.Foundation.tableField, - // columnField: this.$refs.Field.dataList, - // fromField: this.$refs.FormItem.dataList, }; this.reqloading = true; codeCrud(data) @@ -168,7 +168,10 @@ export default { padding-left: 7px; } /deep/ .ivu-form-item { - margin-bottom: 15px; + margin-bottom: 17px; +} +/deep/ .ivu-form-item-error-tip { + padding-top: 2px; } /deep/ .tip { color: #bbb; From 7945d7cc0ca174fad6389899db6a74e4116e7b59 Mon Sep 17 00:00:00 2001 From: evoxwht <442384644@qq.com> Date: Fri, 21 Apr 2023 11:35:08 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E5=AE=A2=E6=9C=8D=E5=A4=B4=E5=83=8F?= =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- crmeb/app/api/controller/v2/user/StoreService.php | 5 ++++- crmeb/app/dao/service/StoreServiceLogDao.php | 2 +- crmeb/app/kefuapi/controller/Service.php | 5 ++++- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/crmeb/app/api/controller/v2/user/StoreService.php b/crmeb/app/api/controller/v2/user/StoreService.php index 9f5ce0ac7..e0d7ff852 100644 --- a/crmeb/app/api/controller/v2/user/StoreService.php +++ b/crmeb/app/api/controller/v2/user/StoreService.php @@ -40,8 +40,11 @@ class StoreService /** * 客服聊天记录 * @param Request $request - * @param $toUid + * @param StoreServiceServices $services * @return array + * @throws \think\db\exception\DataNotFoundException + * @throws \think\db\exception\DbException + * @throws \think\db\exception\ModelNotFoundException */ public function record(Request $request, StoreServiceServices $services) { diff --git a/crmeb/app/dao/service/StoreServiceLogDao.php b/crmeb/app/dao/service/StoreServiceLogDao.php index 010cd6919..6448ac5a1 100644 --- a/crmeb/app/dao/service/StoreServiceLogDao.php +++ b/crmeb/app/dao/service/StoreServiceLogDao.php @@ -83,7 +83,7 @@ class StoreServiceLogDao extends BaseDao $query->where('id', '<', $upperId)->limit($limit)->order('id DESC'); })->when(!$upperId, function ($query) use ($limit) { $query->limit($limit)->order('id DESC'); - })->with(['user', 'service'])->select()->toArray(); + })->with(['user'])->select()->toArray(); } /** diff --git a/crmeb/app/kefuapi/controller/Service.php b/crmeb/app/kefuapi/controller/Service.php index 643ec7e13..9975ff1ad 100644 --- a/crmeb/app/kefuapi/controller/Service.php +++ b/crmeb/app/kefuapi/controller/Service.php @@ -261,8 +261,11 @@ class Service extends AuthController /** * 聊天记录 - * @param $uid + * @param Request $request * @return mixed + * @throws \think\db\exception\DataNotFoundException + * @throws \think\db\exception\DbException + * @throws \think\db\exception\ModelNotFoundException */ public function getChatList(Request $request) { From 812955808fc2ec90cc2dea7fb503e4f362aaa141 Mon Sep 17 00:00:00 2001 From: evoxwht <442384644@qq.com> Date: Fri, 21 Apr 2023 11:35:25 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E6=B4=BB=E5=8A=A8=E8=AE=A2=E5=8D=95?= =?UTF-8?q?=E4=B8=8D=E8=B5=A0=E9=80=81=E7=A7=AF=E5=88=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- crmeb/app/services/order/StoreOrderCreateServices.php | 1 + 1 file changed, 1 insertion(+) diff --git a/crmeb/app/services/order/StoreOrderCreateServices.php b/crmeb/app/services/order/StoreOrderCreateServices.php index f10d15c2e..79a55980e 100644 --- a/crmeb/app/services/order/StoreOrderCreateServices.php +++ b/crmeb/app/services/order/StoreOrderCreateServices.php @@ -223,6 +223,7 @@ class StoreOrderCreateServices extends BaseServices $deduction = $seckillId || $bargainId || $combinationId; if ($deduction) { $couponId = 0; + $gainIntegral = 0; $useIntegral = false; } //$shipping_type = 1 快递发货 $shipping_type = 2 门店自提 From 53dc0ef188923fda6cd303d9c27baa9299752df1 Mon Sep 17 00:00:00 2001 From: evoxwht <442384644@qq.com> Date: Fri, 21 Apr 2023 11:35:36 +0800 Subject: [PATCH 4/6] =?UTF-8?q?=E6=8B=BC=E5=9B=A2=E9=80=80=E6=AC=BE?= =?UTF-8?q?=E7=8A=B6=E6=80=81=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- crmeb/app/services/order/StoreOrderRefundServices.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/crmeb/app/services/order/StoreOrderRefundServices.php b/crmeb/app/services/order/StoreOrderRefundServices.php index 64031e20d..ef432efff 100644 --- a/crmeb/app/services/order/StoreOrderRefundServices.php +++ b/crmeb/app/services/order/StoreOrderRefundServices.php @@ -145,7 +145,7 @@ class StoreOrderRefundServices extends BaseServices throw new AdminException(400489); } //退拼团 - if ($splitOrderInfo['pid'] == 0 && !$splitOrderInfo['pink_id']) { + if ($splitOrderInfo['pid'] == 0 && $splitOrderInfo['pink_id'] > 0) { /** @var StorePinkServices $pinkServices */ $pinkServices = app()->make(StorePinkServices::class); if (!$pinkServices->setRefundPink($splitOrderInfo)) { From bdf55848cbdcf5c39a7c9cdcfbdcecd37cd868dc Mon Sep 17 00:00:00 2001 From: evoxwht <442384644@qq.com> Date: Fri, 21 Apr 2023 11:35:49 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=E5=8F=91=E7=A5=A8=E6=98=BE=E7=A4=BA?= =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- template/admin/src/pages/order/invoice/index.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/template/admin/src/pages/order/invoice/index.vue b/template/admin/src/pages/order/invoice/index.vue index 09e947a0e..f620e48ba 100644 --- a/template/admin/src/pages/order/invoice/index.vue +++ b/template/admin/src/pages/order/invoice/index.vue @@ -94,7 +94,7 @@