Skip to content

G
gogirl-miniapp-backend
Commit 28cf103a by huluobin
Options

order pay

parent 232b5b58
Showing with 8 additions and 256 deletions
src/main/java/com/gogirl/DataSourceConfig.java deleted 100644 → 0
//package com.gogirl;
//
//import com.alibaba.druid.pool.DruidDataSource;
//import org.springframework.boot.context.properties.ConfigurationProperties;
//import org.springframework.context.annotation.Bean;
//import org.springframework.context.annotation.Configuration;
//import org.springframework.context.annotation.Primary;
//
//import javax.sql.DataSource;
//
///**
// * 数据源配置
// *
// * @author HelloWoodes
// */
//@Configuration
//public class DataSourceConfig {
//
// @Bean
// @ConfigurationProperties(prefix = "spring.datasource")
// public DruidDataSource druidDataSource() {
// return new DruidDataSource();
// }
//
// /**
// * 需要将 DataSourceProxy 设置为主数据源，否则事务无法回滚
// *
// * @param druidDataSource The DruidDataSource
// * @return The default datasource
// */
// @Primary
// @Bean("dataSource")
// public DataSource dataSource(DruidDataSource druidDataSource) {
// return druidDataSource;
// }
//}
src/main/java/com/gogirl/application/order/serve/impl/OrderManageServiceImpl.java
......@@ -715,6 +715,7 @@ public class OrderManageServiceImpl extends ServiceImpl<OrderManageMapper, Order
});
orderManage.setStatus(OrderManage.STATUS_FINISHED);
orderManage.setFinishTime(new Date());
//订单已完成
orderManageMapper.updateById(orderManage);
Coupon coupon = couponService.getOne(new LambdaQueryWrapper<Coupon>().eq(Coupon::getName, "评价礼券"));
......@@ -787,7 +788,6 @@ public class OrderManageServiceImpl extends ServiceImpl<OrderManageMapper, Order
payTypeStr = "免单" + "";
//状态更新为待评论
orderManage.setStatus(OrderManage.STATUS_UN_COMMENT);
orderManage.setFinishTime(new Date());
orderManage.setPaymentType(OrderManage.PAYMENT_FREE);
this.updateById(orderManage);
}
......@@ -814,7 +814,6 @@ public class OrderManageServiceImpl extends ServiceImpl<OrderManageMapper, Order
//状态更新为待评论
orderManage.setStatus(3);
orderManage.setFinishTime(new Date());
orderManage.setPaymentType(13);
this.updateById(orderManage);
......@@ -824,6 +823,7 @@ public class OrderManageServiceImpl extends ServiceImpl<OrderManageMapper, Order
throw new RRException("不支持的收款方式");
}
orderManage.setPayTime(new Date());
//发送订阅消息
subscribeService.sendPaySuccessMsg(customer.getOpenid1(), payTypeStr, new Date(), orderManage.getTotalPaymentAmount(), new BigDecimal(customerBalance.getBalance() / 100));
this.updateById(orderManage);
......@@ -852,7 +852,7 @@ public class OrderManageServiceImpl extends ServiceImpl<OrderManageMapper, Order
//支付方式
orderManage.setPaymentType(12);
orderManage.setFinishTime(new Date());
orderManage.setPayTime(new Date());
orderManage.setUpdateTime(new Date());
this.updateById((orderManage));
......@@ -905,7 +905,7 @@ public class OrderManageServiceImpl extends ServiceImpl<OrderManageMapper, Order
//支付方式
orderManage.setPaymentType(OrderManage.PAYMENT_WX);
orderManage.setFinishTime(new Date());
orderManage.setPayTime(new Date());
orderManage.setUpdateTime(new Date());
this.updateById(orderManage);
......
src/main/java/com/gogirl/application/order/serve/impl/PayServiceImpl.java
......@@ -78,7 +78,7 @@ public class PayServiceImpl implements PayService {
orderManageService.updateById(orderManage);
orderManage.setFinishTime(new Date());
orderManage.setPayTime(new Date());
orderManage.setPaymentType(OrderManage.PAYMENT_BALANCE);
orderManage.setStatus(OrderManage.STATUS_UN_COMMENT);
orderManageService.updateById(orderManage);
......@@ -104,7 +104,7 @@ public class PayServiceImpl implements PayService {
//支付方式
orderManage.setPaymentType(paymentType);
orderManage.setFinishTime(new Date());
orderManage.setPayTime(new Date());
orderManage.setUpdateTime(new Date());
orderManageService.updateById(orderManage);
......
src/main/java/com/gogirl/domain/order/serve/OrderManage.java
......@@ -259,6 +259,7 @@ public class OrderManage implements Serializable {
@TableField(exist = false)
private List<TimesCardUsedRecord> listTimesCardRecord;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@ApiModelProperty("支付时间")
private Date payTime;
......
src/main/resources/application.yml
spring:
profiles:
active: prod
active: pre
servlet:
#文件上传最大容量
multipart:
......
src/main/resources/file.conf deleted 100644 → 0
//transport {
// # tcp udt unix-domain-socket
// type = "TCP"
// #NIO NATIVE
// server = "NIO"
// #enable heartbeat
// heartbeat = true
// #thread factory for netty
// thread-factory {
// boss-thread-prefix = "NettyBoss"
// worker-thread-prefix = "NettyServerNIOWorker"
// server-executor-thread-prefix = "NettyServerBizHandler"
// share-boss-worker = false
// client-selector-thread-prefix = "NettyClientSelector"
// client-selector-thread-size = 1
// client-worker-thread-prefix = "NettyClientWorkerThread"
// # netty boss thread size,will not be used for UDT
// boss-thread-size = 1
// #auto default pin or 8
// worker-thread-size = 8
// }
// shutdown {
// # when destroy server, wait seconds
// wait = 3
// }
// serialization = "seata"
// compressor = "none"
//}
//service {
// #vgroup->rgroup
// vgroup_mapping.gogirl-tx-group = "default"
// #only support single node
// default.grouplist = "127.0.0.1:8991"
// #degrade current not support
// enableDegrade = false
// #disable
// disable = false
// #unit ms,s,m,h,d represents milliseconds, seconds, minutes, hours, days, default permanent
// max.commit.retry.timeout = "-1"
// max.rollback.retry.timeout = "-1"
//}
//
//client {
// async.commit.buffer.limit = 10000
// lock {
// retry.internal = 10
// retry.times = 30
// }
// report.retry.count = 5
// tm.commit.retry.count = 1
// tm.rollback.retry.count = 1
//}
//
//## transaction log store
//store {
// ## store mode: file、db
// mode = "db"
//
// ## file store
// file {
// dir = "sessionStore"
//
// # branch session size , if exceeded first try compress lockkey, still exceeded throws exceptions
// max-branch-session-size = 16384
// # globe session size , if exceeded throws exceptions
// max-global-session-size = 512
// # file buffer size , if exceeded allocate new buffer
// file-write-buffer-cache-size = 16384
// # when recover batch read size
// session.reload.read_size = 100
// # async, sync
// flush-disk-mode = async
// }
//
// ## database store
// db {
// ## the implement of javax.sql.DataSource, such as DruidDataSource(druid)/BasicDataSource(dbcp) etc.
// datasource = "druid"
// ## mysql/oracle/h2/oceanbase etc.
// db-type = "mysql"
// driver-class-name = "com.mysql.jdbc.Driver"
// url = "jdbc:mysql://gz-cdb-c0sq6eax.sql.tencentcdb.com:60779/seata?useUnicode=true&characterEncoding=utf-8&useSSL=false"
// user = "root"
// password = "#7kfnymAM$Y9-Ntf"
// min-conn = 1
// max-conn = 3
// global.table = "global_table"
// branch.table = "branch_table"
// lock-table = "lock_table"
// query-limit = 100
// }
//}
//lock {
// ## the lock store mode: local、remote
// mode = "remote"
//
// local {
// ## store locks in user's database
// }
//
// remote {
// ## store locks in the seata's server
// }
//}
//recovery {
// #schedule committing retry period in milliseconds
// committing-retry-period = 1000
// #schedule asyn committing retry period in milliseconds
// asyn-committing-retry-period = 1000
// #schedule rollbacking retry period in milliseconds
// rollbacking-retry-period = 1000
// #schedule timeout retry period in milliseconds
// timeout-retry-period = 1000
//}
//
//transaction {
// undo.data.validation = true
// undo.log.serialization = "jackson"
// undo.log.save.days = 7
// #schedule delete expired undo_log in milliseconds
// undo.log.delete.period = 86400000
// undo.log.table = "undo_log"
//}
//
//## metrics settings
//metrics {
// enabled = false
// registry-type = "compact"
// # multi exporters use comma divided
// exporter-list = "prometheus"
// exporter-prometheus-port = 9898
//}
//
//support {
// ## spring
// spring {
// # auto proxy the DataSource bean
// datasource.autoproxy = false
// }
//}
src/main/resources/registry.conf deleted 100644 → 0
//registry {
// # file 、nacos 、eureka、redis、zk、consul、etcd3、sofa
// type = "eureka"
//
// nacos {
// serverAddr = "localhost"
// namespace = ""
// cluster = "default"
// }
// eureka {
// serviceUrl = "http://localhost:1111/eureka"
// application = "default"
// weight = "1"
// }
// redis {
// serverAddr = "localhost:6379"
// db = "0"
// }
// zk {
// cluster = "default"
// serverAddr = "127.0.0.1:2181"
// session.timeout = 6000
// connect.timeout = 2000
// }
// consul {
// cluster = "default"
// serverAddr = "127.0.0.1:8500"
// }
// etcd3 {
// cluster = "default"
// serverAddr = "http://localhost:2379"
// }
// sofa {
// serverAddr = "127.0.0.1:9603"
// application = "default"
// region = "DEFAULT_ZONE"
// datacenter = "DefaultDataCenter"
// cluster = "default"
// group = "SEATA_GROUP"
// addressWaitTime = "3000"
// }
// file {
// name = "file.conf"
// }
//}
//
//config {
// # file、nacos 、apollo、zk、consul、etcd3
// type = "file"
//
// nacos {
// serverAddr = "localhost"
// namespace = ""
// }
// consul {
// serverAddr = "127.0.0.1:8500"
// }
// apollo {
// app.id = "seata-server"
// apollo.meta = "http://192.168.1.204:8801"
// }
// zk {
// serverAddr = "127.0.0.1:2181"
// session.timeout = 6000
// connect.timeout = 2000
// }
// etcd3 {
// serverAddr = "http://localhost:2379"
// }
// file {
// name = "file.conf"
// }
//}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment