From 18a960bd40e4413ff5cd01287b8ea502f81f2790 Mon Sep 17 00:00:00 2001 From: "pref_mail@163.com" <123456> Date: Thu, 30 Jun 2022 22:57:48 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8F=91=E5=B8=83=E7=BA=BF=E4=B8=8A=E6=A3=80?= =?UTF-8?q?=E6=9F=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/application-prod.yml | 2 +- .../bmb/busClubInfo/busClubInfo.html | 96 +++++++++---------- .../bmb/busOrderInfo/busOrderInfo.html | 70 +++++++------- .../bmb/order/mapper/BusOrderInfoMapper.java | 10 ++ .../order/service/IBusOrderInfoService.java | 6 ++ .../service/impl/BusOrderInfoServiceImpl.java | 4 + .../mls/bmb/order/vomain/OrderDetailVO.java | 4 + .../mapper/activity/BusClubActivityMapper.xml | 5 +- .../mapper/order/BusOrderInfoMapper.xml | 11 ++- 9 files changed, 120 insertions(+), 88 deletions(-) diff --git a/mls-admin/src/main/resources/application-prod.yml b/mls-admin/src/main/resources/application-prod.yml index 1cde0bd..7110502 100644 --- a/mls-admin/src/main/resources/application-prod.yml +++ b/mls-admin/src/main/resources/application-prod.yml @@ -22,7 +22,7 @@ spring: druid: # 主库数据源 master: - url: jdbc:mysql://127.0.0.1:3306/bml?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&serverTimezone=GMT%2B8 + url: jdbc:mysql://47.108.88.80:3306/bml?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&serverTimezone=GMT%2B8 username: bml password: 2Ax75WmhbJWx2AhH # 从库数据源 diff --git a/mls-admin/src/main/resources/templates/bmb/busClubInfo/busClubInfo.html b/mls-admin/src/main/resources/templates/bmb/busClubInfo/busClubInfo.html index 077af17..be75d9f 100644 --- a/mls-admin/src/main/resources/templates/bmb/busClubInfo/busClubInfo.html +++ b/mls-admin/src/main/resources/templates/bmb/busClubInfo/busClubInfo.html @@ -189,10 +189,10 @@ return $.table.selectDictLabel(bus_is_verify, value); } }, - { - field : 'verifyResult', - title : '认证结果' - }, + // { + // field : 'verifyResult', + // title : '认证结果' + // }, /*{ field : 'verifyImage', title : '认证图片' @@ -227,25 +227,25 @@ return $.table.imageView("https://file.tuleduo.cn/files"+value); } }, - { - field : 'clubAdmin', - title : '俱乐部会长id', - formatter: function(value, row, index) { - return $.table.tooltip(value,20); - } - }, - { - field : 'payType', - title : '收款类型' - }, - { - field : 'payAccount', - title : '收款账户' - }, - { - field : 'joinWay', - title : '俱乐部加入方式' - }, + // { + // field : 'clubAdmin', + // title : '俱乐部会长id', + // formatter: function(value, row, index) { + // return $.table.tooltip(value,20); + // } + // }, + // { + // field : 'payType', + // title : '收款类型' + // }, + // { + // field : 'payAccount', + // title : '收款账户' + // }, + // { + // field : 'joinWay', + // title : '俱乐部加入方式' + // }, { field : 'checkStatus', title : '审核状态', @@ -253,35 +253,35 @@ return $.table.selectDictLabel(bus_check_status, value); } }, - { - field : 'recordStatus', - title : '记录状态', - formatter: function (value, item, index) { - return $.table.selectDictLabel(bus_record_status, value); - } - }, - { - field : 'revision', - title : '乐观锁' - }, - { - field : 'createdBy', - title : '创建人', - formatter: function(value, row, index) { - return $.table.tooltip(value,20); - } - }, + // { + // field : 'recordStatus', + // title : '记录状态', + // formatter: function (value, item, index) { + // return $.table.selectDictLabel(bus_record_status, value); + // } + // }, + // { + // field : 'revision', + // title : '乐观锁' + // }, + // { + // field : 'createdBy', + // title : '创建人', + // formatter: function(value, row, index) { + // return $.table.tooltip(value,20); + // } + // }, { field : 'createdTime', title : '创建时间' }, - { - field : 'updatedBy', - title : '更新人', - formatter: function(value, row, index) { - return $.table.tooltip(value,20); - } - }, + // { + // field : 'updatedBy', + // title : '更新人', + // formatter: function(value, row, index) { + // return $.table.tooltip(value,20); + // } + // }, { field : 'updatedTime', title : '更新时间' diff --git a/mls-admin/src/main/resources/templates/bmb/busOrderInfo/busOrderInfo.html b/mls-admin/src/main/resources/templates/bmb/busOrderInfo/busOrderInfo.html index d9fe2be..4ec6807 100644 --- a/mls-admin/src/main/resources/templates/bmb/busOrderInfo/busOrderInfo.html +++ b/mls-admin/src/main/resources/templates/bmb/busOrderInfo/busOrderInfo.html @@ -96,10 +96,10 @@ return $.table.selectDictLabel(bus_pay_way, value); } }, - { - field : 'thirdPaySerial', - title : '三方系统支付流水号' - }, + // { + // field : 'thirdPaySerial', + // title : '三方系统支付流水号' + // }, { field : 'userId', title : '用户id' @@ -120,18 +120,18 @@ field : 'realCost', title : '实际支付金额' }, - { - field : 'couponId', - title : '使用优惠券id' - }, - { - field : 'account', - title : '付款账户' - }, - { - field : 'refund', - title : '退款金额' - }, + // { + // field : 'couponId', + // title : '使用优惠券id' + // }, + // { + // field : 'account', + // title : '付款账户' + // }, + // { + // field : 'refund', + // title : '退款金额' + // }, { field : 'orderStatus', title : '订单状态', @@ -139,17 +139,17 @@ return $.table.selectDictLabel(bus_order_status, value); } }, - { - field : 'recordStatus', - title : '记录状态', - formatter: function (value, item, index) { - return $.table.selectDictLabel(bus_record_status, value); - } - }, - { - field : 'revision', - title : '乐观锁' - }, + // { + // field : 'recordStatus', + // title : '记录状态', + // formatter: function (value, item, index) { + // return $.table.selectDictLabel(bus_record_status, value); + // } + // }, + // { + // field : 'revision', + // title : '乐观锁' + // }, { field : 'createdBy', title : '创建人' @@ -158,14 +158,14 @@ field : 'createdTime', title : '创建时间' }, - { - field : 'updatedBy', - title : '更新人' - }, - { - field : 'updatedTime', - title : '更新时间' - }, + // { + // field : 'updatedBy', + // title : '更新人' + // }, + // { + // field : 'updatedTime', + // title : '更新时间' + // }, { field : 'notes', title : '备注' diff --git a/mls-bmb/src/main/java/com/mls/bmb/order/mapper/BusOrderInfoMapper.java b/mls-bmb/src/main/java/com/mls/bmb/order/mapper/BusOrderInfoMapper.java index 8dd43d8..9f95dea 100644 --- a/mls-bmb/src/main/java/com/mls/bmb/order/mapper/BusOrderInfoMapper.java +++ b/mls-bmb/src/main/java/com/mls/bmb/order/mapper/BusOrderInfoMapper.java @@ -1,6 +1,8 @@ package com.mls.bmb.order.mapper; import com.mls.bmb.order.domain.BusOrderInfo; +import com.mls.bmb.order.vomain.OrderDetailVO; + import java.util.List; /** @@ -79,4 +81,12 @@ public interface BusOrderInfoMapper * @return 结果 */ public int deleteBusOrderInfoByIds(String[] orderIds); + + + /** + * 后台订单查询 + * @param busOrderInfo + * @return + */ + List selectBusOrderInfoListNew(BusOrderInfo busOrderInfo); } diff --git a/mls-bmb/src/main/java/com/mls/bmb/order/service/IBusOrderInfoService.java b/mls-bmb/src/main/java/com/mls/bmb/order/service/IBusOrderInfoService.java index 415769d..b66ec25 100644 --- a/mls-bmb/src/main/java/com/mls/bmb/order/service/IBusOrderInfoService.java +++ b/mls-bmb/src/main/java/com/mls/bmb/order/service/IBusOrderInfoService.java @@ -4,6 +4,7 @@ import com.mls.bmb.activity.domain.BusActivityRegister; import com.mls.bmb.activity.vomain.ActivityRegisterAddVO; import com.mls.bmb.order.domain.BusOrderInfo; import com.mls.bmb.order.vomain.OrderDetailAddVO; +import com.mls.bmb.order.vomain.OrderDetailVO; import com.mls.bmb.order.vomain.OrderInfoAddVO; import com.mls.bmb.order.vomain.OrderVO; import org.springframework.transaction.annotation.Transactional; @@ -57,6 +58,11 @@ public interface IBusOrderInfoService */ public List selectBusOrderInfoList(BusOrderInfo busOrderInfo); + + + public List selectBusOrderInfoListNew(BusOrderInfo busOrderInfo); + + /* * 新增订单信息 * diff --git a/mls-bmb/src/main/java/com/mls/bmb/order/service/impl/BusOrderInfoServiceImpl.java b/mls-bmb/src/main/java/com/mls/bmb/order/service/impl/BusOrderInfoServiceImpl.java index d8c59dc..32b921f 100644 --- a/mls-bmb/src/main/java/com/mls/bmb/order/service/impl/BusOrderInfoServiceImpl.java +++ b/mls-bmb/src/main/java/com/mls/bmb/order/service/impl/BusOrderInfoServiceImpl.java @@ -160,6 +160,10 @@ public class BusOrderInfoServiceImpl implements IBusOrderInfoService return busOrderInfoMapper.selectBusOrderInfoList(busOrderInfo); } + @Override + public List selectBusOrderInfoListNew(BusOrderInfo busOrderInfo) { + return busOrderInfoMapper.selectBusOrderInfoListNew(busOrderInfo); + } @Override @Transactional diff --git a/mls-bmb/src/main/java/com/mls/bmb/order/vomain/OrderDetailVO.java b/mls-bmb/src/main/java/com/mls/bmb/order/vomain/OrderDetailVO.java index a9424d3..4a33b0f 100644 --- a/mls-bmb/src/main/java/com/mls/bmb/order/vomain/OrderDetailVO.java +++ b/mls-bmb/src/main/java/com/mls/bmb/order/vomain/OrderDetailVO.java @@ -19,6 +19,10 @@ public class OrderDetailVO extends BaseVO { @ApiModelProperty(value = "订单流水号") private String orderSerial; + + @ApiModelProperty(value = "支付方式") + private String payWay; + /** 用户id */ @ApiModelProperty(value = "用户id") private String userId; diff --git a/mls-bmb/src/main/resources/mapper/activity/BusClubActivityMapper.xml b/mls-bmb/src/main/resources/mapper/activity/BusClubActivityMapper.xml index ca3642f..4382d32 100644 --- a/mls-bmb/src/main/resources/mapper/activity/BusClubActivityMapper.xml +++ b/mls-bmb/src/main/resources/mapper/activity/BusClubActivityMapper.xml @@ -81,7 +81,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - select activity_id, activity_name, activity_logo, cover_first_image, cover_small_image, cover_big_image, club_id, activity_content, activity_addr, lon_and_lat, addr_lon, addr_lat, start_register_time, end_register_time, start_time, end_time, is_free, is_help_register, is_limit_select, is_check, refund_type, refund_time, refund_start_time, refund_end_time, is_update_register, is_show_register, is_show_sponsor, show_register_type, register_btn_name, cost_id, activity_price, official_price, team_price, is_limit, activity_read, activity_share, insurance_type, insurance_price, is_sms_notify, sms_notify_time, sms_explain, sms_content, is_applet_notify, applet_notify_time, is_join, poster, is_register, is_open_team, is_recommend, check_status, publish_status, register_status, sign_status, record_status, created_tel, REVISION, CREATED_BY, CREATED_TIME, UPDATED_BY, UPDATED_TIME, notes from bus_club_activity where stats='1' + select activity_id, activity_name, activity_logo, cover_first_image, cover_small_image, cover_big_image, club_id, activity_content, activity_addr, lon_and_lat, addr_lon, addr_lat, start_register_time, end_register_time, start_time, end_time, is_free, is_help_register, is_limit_select, is_check, refund_type, refund_time, refund_start_time, refund_end_time, is_update_register, is_show_register, is_show_sponsor, show_register_type, register_btn_name, cost_id, activity_price, official_price, team_price, is_limit, activity_read, activity_share, insurance_type, insurance_price, is_sms_notify, sms_notify_time, sms_explain, sms_content, is_applet_notify, applet_notify_time, is_join, poster, is_register, is_open_team, is_recommend, check_status, publish_status, register_status, sign_status, record_status, created_tel, REVISION, CREATED_BY, CREATED_TIME, UPDATED_BY, UPDATED_TIME, notes from bus_club_activity - + + + + + + insert into bus_order_info order_id,