Просмотр исходного кода

[券订单][修改][导出数据]

release_toaliyun_real
gongbiao 7 лет назад
Родитель
Сommit
aca09db7e2
2 измененных файлов: 11 добавлений и 11 удалений
  1. +6
    -6
      mallinkService/src/main/java/com/iformall/domain/vo/WxCouponOrderBVo.java
  2. +5
    -5
      mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml

+ 6
- 6
mallinkService/src/main/java/com/iformall/domain/vo/WxCouponOrderBVo.java Просмотреть файл

@@ -87,16 +87,16 @@ public class WxCouponOrderBVo extends WxCouponOrder{
@io.swagger.annotations.ApiModelProperty(value = "业态", name = "business")
private Integer business;

@io.swagger.annotations.ApiModelProperty(value = "补贴额", name = "subsidySum")
private Integer subsidySum;
@io.swagger.annotations.ApiModelProperty(value = "补贴额", name = "subsidyNum")
private Integer subsidyNum;

public String getSubsidySumStr() {
return new BigDecimal(subsidySum).divide(new BigDecimal(100)).setScale(2, RoundingMode.HALF_EVEN).toPlainString();
public String getSubsidyNumStr() {
return new BigDecimal(subsidyNum == null ? 0 : subsidyNum).divide(new BigDecimal(100)).setScale(2, RoundingMode.HALF_EVEN).toPlainString();
}

@Excel(name = "补贴额(元)", width = 50, orderNum = "7")
@io.swagger.annotations.ApiModelProperty(value = "补贴额", name = "subsidySum")
private String subsidySumStr;
@io.swagger.annotations.ApiModelProperty(value = "补贴额", name = "subsidyNumStr")
private String subsidyNumStr;

@io.swagger.annotations.ApiModelProperty(value = "补贴类型", name = "subsidyType")
private Integer subsidyType;


+ 5
- 5
mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml Просмотреть файл

@@ -370,7 +370,7 @@
<result column="price" jdbcType="INTEGER" property="price" />
<result column="auto_refund" jdbcType="INTEGER" property="autoRefund" />
<result column="business" jdbcType="INTEGER" property="business"/>
<result column="subsidy_sum" jdbcType="INTEGER" property="subsidySum"/>
<result column="subsidy_num" jdbcType="INTEGER" property="subsidyNum"/>
<result column="subsidy_type" jdbcType="INTEGER" property="subsidyType"/>
<result column="name" jdbcType="VARCHAR" property="bUserName" />
@@ -387,11 +387,11 @@

<sql id="allAdminCouponOrderListColumns">
co.id,co.tenant_id,co.coupon_id,co.coupon_type,co.expired_time,co.coupon_order_status,co.create_date,co.update_date,co.coupon_price,
c.title,c.sale_price,c.use_price,c.price,c.unit,c.auto_refund,c.business,c.subsidy_type,c.subsidy_sum,
c.title,c.sale_price,c.use_price,c.price,c.unit,c.auto_refund,c.business,c.subsidy_type,c.subsidy_num,
(case when com.mc=1 then
(select m.name from wx_merchant m, wx_coupon_merchant cm
where m.id = cm.merchant_id and cm.product_id=co.coupon_id and cm.status = 0) else '[多商户通用]' end) as merchant_name,
case when com.mc = 1 then (select m.id from wx_merchant m,
(case when com.mc = 1 then (select m.id from wx_merchant m,
wx_coupon_merchant cm where m.id = cm.merchant_id and cm.product_id = co.coupon_id
and cm.status = 0) else 0 end) as merchant_id
</sql>
@@ -401,7 +401,7 @@
c.type,c.title,c.sale_price,c.use_price,c.price,c.unit,c.auto_refund,c.business,c.subsidy_type,c.subsidy_sum,
bu.name, bu.phone as bphone,
cu.phone,
m.name as merchant_name
m.name as merchant_name,m.id as merchant_id
</sql>

<select id="findListOfAdmin" parameterType="com.iformall.domain.vo.WxCouponOrderBVo" resultMap="BVoResultMap">
@@ -475,7 +475,7 @@
left join wx_coupon_merchant cm on ms.merchant_id=cm.merchant_id
where ms.is_del=0 and s.building=#{building}
<if test=" null != tenantId ">
and ms.tenant_id=#{tenant_id}
and ms.tenant_id=#{tenantId}
</if>
<if test="null!=floor">
and s.floor=#{floor}


Загрузка…
Отмена
Сохранить