From 7212249a6d45f8ac5854fde3ec7d6c7230a80473 Mon Sep 17 00:00:00 2001 From: xhxu Date: Tue, 25 Oct 2022 14:56:11 +0800 Subject: [PATCH] //join --- .../iformall/domain/po/WxActivityJoin.java | 36 ++++++++++++++----- .../iformall/mapper/WxCouponOrderMapper.java | 2 +- .../impl/WxCouponOrderServiceImpl.java | 5 ++- 3 files changed, 33 insertions(+), 10 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxActivityJoin.java b/mallinkService/src/main/java/com/iformall/domain/po/WxActivityJoin.java index 4fdd980c7..6753343de 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxActivityJoin.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxActivityJoin.java @@ -1,12 +1,15 @@ package com.iformall.domain.po; import cn.afterturn.easypoi.excel.annotation.Excel; +import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.iformall.domain.po.base.TenantEntity; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.ToString; +import org.apache.commons.lang3.StringUtils; import java.util.Date; @@ -26,11 +29,11 @@ public class WxActivityJoin extends TenantEntity { @io.swagger.annotations.ApiModelProperty(value = "活动ID", name = "activityId") private Long activityId; - @Excel(name = "姓名", width = 10, orderNum = "1") + @Excel(name = "姓名", width = 15, orderNum = "1") @io.swagger.annotations.ApiModelProperty(value = "姓名", name = "name") private String name; - @Excel(name = "电话号码", width = 10, orderNum = "2") + @Excel(name = "电话号码", width = 20, orderNum = "2") @io.swagger.annotations.ApiModelProperty(value = "手机", name = "phone") private String phone; @@ -46,15 +49,15 @@ public class WxActivityJoin extends TenantEntity { @io.swagger.annotations.ApiModelProperty(value = "性别0保密1男2女", name = "sex") private Integer sex; - @Excel(name = "生日", format = "yyyy-MM-dd", width = 10, orderNum = "6") + @Excel(name = "生日", format = "yyyy-MM-dd", width = 20, orderNum = "6") @io.swagger.annotations.ApiModelProperty(value = "生日", name = "birthday") private Date birthday; - @Excel(name = "微信昵称", width = 10, orderNum = "7") + @Excel(name = "微信昵称", width = 15, orderNum = "7") @io.swagger.annotations.ApiModelProperty(value = "昵称", name = "nickName") private String nickName; - @Excel(name = "报名时间", format = "yyyy-MM-dd HH:mm:ss", width = 10, orderNum = "8") + @Excel(name = "报名时间", format = "yyyy-MM-dd HH:mm:ss", width = 30, orderNum = "8") @io.swagger.annotations.ApiModelProperty(value = "创建时间", name = "createTime") private Date createTime; @@ -62,19 +65,36 @@ public class WxActivityJoin extends TenantEntity { @io.swagger.annotations.ApiModelProperty(value = "签到状态1签到0未签到", name = "signIn") private Integer signIn; - @Excel(name = "报名状态", replace = {"未确认_0", "已确认_1", "报名失败_2", "活动过期_3"}, width = 10, orderNum = "10") + @Excel(name = "报名状态", replace = {"未确认_0", "已确认_1", "报名失败_2", "活动过期_3"}, width = 11, orderNum = "10") @io.swagger.annotations.ApiModelProperty(value = "状态0未确认-报名中1确认-报名成功2取消-报名失败3过期", name = "status") private Integer status; - @Excel(name = "调查问券", width = 10, orderNum = "11") + @Excel(name = "调查问券", width = 50, orderNum = "12") @io.swagger.annotations.ApiModelProperty(value = "调查问券", name = "answer") private String answer; - @io.swagger.annotations.ApiModelProperty(value = "地址", name = "address") private String address; + @TableField(exist = false) + @Excel(name = "地址", width = 20, orderNum = "8") + @io.swagger.annotations.ApiModelProperty(value = "地址", name = "addressStr") + private String addressStr; + + public String getAddressStr(){ + if(StringUtils.isNotBlank(this.address)){ + try{ + JSONObject addressObject = JSON.parseObject(this.address); + if(addressObject != null && !addressObject.isEmpty()){ + String string = addressObject.getString("address"); + this.addressStr = string; + } + }catch(Exception e){} + } + return this.addressStr; + } + @io.swagger.annotations.ApiModelProperty(value = "更新时间", name = "updateTime") private Date updateTime; diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxCouponOrderMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxCouponOrderMapper.java index 33745f0ce..c613127dc 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxCouponOrderMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxCouponOrderMapper.java @@ -39,7 +39,7 @@ public interface WxCouponOrderMapper extends CommonMapper { int findProductCount(WxCouponOrder wxCouponOrder); List> getCouponCount(WxCouponOrder wxCouponOrder); //统一额度统计接口 - int queryPriceTotal(WxCouponOrder wxCouponOrder); + Integer queryPriceTotal(WxCouponOrder wxCouponOrder); List findCarListOfCUser(WxCouponOrder wxCouponOrder); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java index fd9d43ade..3c05afb9d 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java @@ -2183,7 +2183,10 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { int price = 0; for (TenantEntity te:tenantEntitys) { wxCouponOrder.updateTenantInfo(te); - price += wxCouponOrderMapper.queryPriceTotal(wxCouponOrder); + Integer mallPrice = wxCouponOrderMapper.queryPriceTotal(wxCouponOrder); + if(mallPrice != null){ + price += mallPrice; + } } wxCouponOrder.updateTenantInfo(tenantEntity); return price;