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

[卡券][修改]:券订单增加券来源

release_toaliyun_real
hupeng 6 лет назад
Родитель
Сommit
d1b73c4c9b
3 измененных файлов: 7 добавлений и 2 удалений
  1. +1
    -1
      mallinkAdmin/src/main/java/com/iformall/controller/device/KwMeterController.java
  2. +4
    -0
      mallinkService/src/main/java/com/iformall/domain/vo/WxCouponOrderBVo.java
  3. +2
    -1
      mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml

+ 1
- 1
mallinkAdmin/src/main/java/com/iformall/controller/device/KwMeterController.java Просмотреть файл

@@ -81,7 +81,7 @@ public class KwMeterController extends BaseController {
return new ResultData(ErrorCode.SYS_PARAMETER_ERROR);
if (kwMeter.getBoxId() == null)
return new ResultData(ErrorCode.SYS_PARAMETER_ERROR);
if (kwMeter.getAddress() == null)
if (kwMeter.getId() == null)
return new ResultData(ErrorCode.SYS_PARAMETER_ERROR);

KwBox kwBox = kwBoxService.getById(kwMeter.getBoxId());


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

@@ -148,6 +148,10 @@ public class WxCouponOrderBVo extends WxCouponOrder{
@io.swagger.annotations.ApiModelProperty(value="商户列表",name="merchantVoList")
private List<WxMerchantVo> merchantVoList;

/**发券渠道信息*/
@io.swagger.annotations.ApiModelProperty(value="商户列表",name="channelType")
private Integer channelType;

@Transient
private Date startDate;



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

@@ -575,7 +575,7 @@
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,
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,cu.phone,bu.verify_merchant_name
and cm.status = 0) else 0 end) as merchant_id,cu.phone,bu.verify_merchant_name,cal.channel_type
</sql>

<sql id="allAdminCouponOrderDetailColumns">
@@ -601,6 +601,7 @@
from wx_merchant_b_user bu inner join wx_merchant m on bu.merchant_id=m.id
where bu.tenant_id = #{tenantId}
) bu on bu.bu_id = co.b_user_id
left join wx_coupon_action_log cal on co.id = cal.coupon_order_id and co.coupon_id = cal.coupon_id
where 1=1
<choose>
<when test=" null != couponType">


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