venue/smart_venue
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

增加退款金额显示

Browse Source
This commit is contained in:
limqhz
2024-01-07 22:02:21 +08:00
parent 5ecd8721c4
commit a0aab56499
4 changed files with 25 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
entity/src/main/java/com/sv/dto/api/MemberEnterOrderDTO.java
View File

@@ -125,6 +125,11 @@ public class MemberEnterOrderDTO implements Serializable {
*/
private BigDecimal price;
/**
* 退款金额
*/
private BigDecimal payMoney;
/**
* 课程图片
*/
@@ -523,4 +528,12 @@ public class MemberEnterOrderDTO implements Serializable {
public void setLatitude(String latitude) {
this.latitude = latitude;
}
public BigDecimal getPayMoney() {
return payMoney;
}
public void setPayMoney(BigDecimal payMoney) {
this.payMoney = payMoney;
}
}

4
entity/src/main/java/com/sv/entity/BarcodeOrderTime.java
View File

@@ -45,7 +45,7 @@ public class BarcodeOrderTime {
*/
private String orderAddSn;
public BarcodeOrderTime(Integer id, Integer memberId, Integer venueId, Date createdTime, Date modifiedTime, Date orderStart, Date orderEnd, Integer status ,Integer paying, Integer payMoney, String orderSn, String orderAddSn) {
public BarcodeOrderTime(Integer id, Integer memberId, Integer venueId, Date createdTime, Date modifiedTime, Date orderStart, Date orderEnd, Date lastEnter, Date lastOut, Integer status ,Integer paying, Integer payMoney, String orderSn, String orderAddSn) {
this.id = id;
this.memberId = memberId;
this.venueId = venueId;
@@ -53,6 +53,8 @@ public class BarcodeOrderTime {
this.modifiedTime = modifiedTime;
this.orderStart = orderStart;
this.orderEnd = orderEnd;
this.lastEnter = lastEnter;
this.lastOut = lastOut;
this.status = status;
this.paying = paying;
this.payMoney = payMoney;

8
service/src/main/java/com/sv/service/api/VenueEnterService.java
View File

@@ -311,12 +311,14 @@ public class VenueEnterService extends BaseServiceImpl {
endTime = new Date();
}
int diffMinute = DateUtilCard.diffMinute(memberEnterOrderDTO.getStartTime(), endTime);
Integer status = memberEnterOrderDTO.getStatus();
Integer paying = memberEnterOrderDTO.getPaying();
memberEnterOrderDTO.setStatus(EnterOrderStatusEnum.OVER.value);
if (BarCodeStatusEnum.INIT.getValue() == memberEnterOrderDTO.getStatus()) {
if (1 == memberEnterOrderDTO.getPaying()) {
if (BarCodeStatusEnum.INIT.getValue() == status) {
if (1 == paying) {
memberEnterOrderDTO.setStatus(EnterOrderStatusEnum.PAYING.value);
}
if (0 == memberEnterOrderDTO.getPaying()){
if (0 == paying){
memberEnterOrderDTO.setStatus(EnterOrderStatusEnum.USING.value);
}
}

7
service/src/main/resources/mybatis/mapper/sv/BarcodeOrderTimeMapper.xml
View File

@@ -20,7 +20,7 @@
</constructor>
</resultMap>
<sql id="Base_Column_List" >
id, member_id, venue_id, created_time, modified_time, order_start, order_end, last_out, last_enter, status, paying, pay_money, order_sn,order_add_sn
id, member_id, venue_id, created_time, modified_time, order_start, order_end, last_enter, last_out, status, paying, pay_money, order_sn,order_add_sn
</sql>
<select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
select
@@ -35,7 +35,7 @@
<insert id="insert" parameterType="com.sv.entity.BarcodeOrderTime" >
insert into sv_barcode_order_time (id, member_id, venue_id,
created_time, modified_time, order_start,
order_end, last_enter, last_out, status,paying ,pay_money,order_sn)
order_end, last_enter, last_out, status,paying ,pay_money,order_sn,order_add_sn)
values (#{id,jdbcType=INTEGER}, #{memberId,jdbcType=INTEGER}, #{venueId,jdbcType=INTEGER},
#{createdTime,jdbcType=TIMESTAMP}, #{modifiedTime,jdbcType=TIMESTAMP}, #{orderStart,jdbcType=TIMESTAMP},
#{orderEnd,jdbcType=TIMESTAMP}, #{lastEnter,jdbcType=TIMESTAMP}, #{lastOut,jdbcType=TIMESTAMP}, #{status,jdbcType=INTEGER},
@@ -191,7 +191,7 @@
status = #{status,jdbcType=INTEGER},
paying = #{paying,jdbcType=INTEGER},
pay_money = #{payMoney,jdbcType=INTEGER},
order_sn = #{orderSn,jdbcType=VARCHAR}
order_sn = #{orderSn,jdbcType=VARCHAR},
order_add_sn = #{orderAddSn,jdbcType=VARCHAR}
where id = #{id,jdbcType=VARCHAR}
</update>
@@ -271,6 +271,7 @@
where ot.member_id = #{memberId,jdbcType=INTEGER} and (ot.order_sn = t.order_sn or ot.order_sn = t.order_add_sn)
) as price,
t.paying,
t.pay_money as payMoney,
t.order_sn as orderSn,
t.`status`,
t.created_time as createTime,