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

Merge branch 'release_real_200809' of https://git.malls.iformall.com/server/formallProject into release_real_200809

release_toaliyun_real
xiaohanzi 5 лет назад
Родитель
Сommit
8995f19764
5 измененных файлов: 13 добавлений и 11 удалений
  1. +0
    -3
      mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponController.java
  2. +4
    -7
      mallinkBApi/src/main/java/com/iformall/controller/WxCouponController.java
  3. +3
    -0
      mallinkService/src/main/java/com/iformall/domain/vo/WxCouponOrderBVo.java
  4. +1
    -0
      mallinkService/src/main/java/com/iformall/service/impl/WxCouponServiceImpl.java
  5. +5
    -1
      mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml

+ 0
- 3
mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponController.java Просмотреть файл

@@ -129,9 +129,6 @@ public class WxCouponController extends BaseController {
if (wxCoupon.getId() == null) {
return new ResultData(ResultData.ERROR, "缺少id");
}
if(null == wxCoupon.getSourceType()){
wxCoupon.setSourceType(EnumCouponSourceType.COUPONSource_Admin.getCode());
}
wxCoupon.updateTenantInfo(getTenantInfo());
if(EnumDelFlag.YES.getCode().equals(wxCoupon.getIsDel())){
WxCouponChannel query = new WxCouponChannel();


+ 4
- 7
mallinkBApi/src/main/java/com/iformall/controller/WxCouponController.java Просмотреть файл

@@ -96,7 +96,7 @@ public class WxCouponController extends BaseController {
wxCoupon.updateTenantInfo(tenantEntity);

if(null == wxCoupon.getSourceType()){
wxCoupon.setSourceType(EnumCouponSourceType.COUPONSource_Admin.getCode());
wxCoupon.setSourceType(EnumCouponSourceType.COUPONSource_Bapi.getCode());
}

ResultData resultData = wxCouponService.saveOrUpdate(wxCoupon);
@@ -121,9 +121,6 @@ public class WxCouponController extends BaseController {
if (wxCoupon.getId() == null) {
return new ResultData(ResultData.ERROR, "缺少id");
}
if(null == wxCoupon.getSourceType()){
wxCoupon.setSourceType(EnumCouponSourceType.COUPONSource_Admin.getCode());
}
wxCoupon.updateTenantInfo(getTenantInfo());
if(EnumDelFlag.YES.getCode().equals(wxCoupon.getIsDel())){
WxCouponChannel query = new WxCouponChannel();
@@ -302,7 +299,7 @@ public class WxCouponController extends BaseController {
if (wxCoupon.getEnddate() == null) {
wxCoupon.setEnddate(DateUtils.stringToDate(DateUtils.getSystemTime("yyyy-MM-dd") + " 23:59:59"));
}
wxCoupon.setSourceType(EnumCouponSourceType.COUPONSource_Admin.getCode());
wxCoupon.setSourceType(EnumCouponSourceType.COUPONSource_Bapi.getCode());
PageInfo<WxCouponStatisVo> pageInfo = wxCouponService.findCountData(wxCoupon, pageNum, pageSize);
for (WxCouponStatisVo coupon : pageInfo.getList()) {
if (coupon.getSaleAmount() == null) {
@@ -334,7 +331,7 @@ public class WxCouponController extends BaseController {
wxCoupon.setEnddate(DateUtils.stringToDate(DateUtils.getSystemTime("yyyy-MM-dd") + " 23:59:59"));
}

wxCoupon.setSourceType(EnumCouponSourceType.COUPONSource_Admin.getCode());
wxCoupon.setSourceType(EnumCouponSourceType.COUPONSource_Bapi.getCode());

PageInfo<WxCouponStatisVo> pageInfo = wxCouponService.findCouponData(wxCoupon, pageNum, pageSize);
for (WxCouponStatisVo coupon : pageInfo.getList()) {
@@ -356,7 +353,7 @@ public class WxCouponController extends BaseController {
public ResultData findPressCountList(@ModelAttribute WxCoupon wxCoupon, Integer pageNum, Integer pageSize) {
Map<String,Object> result = new HashedMap();
wxCoupon.updateTenantInfo(getTenantInfo());
wxCoupon.setSourceType(EnumCouponSourceType.COUPONSource_Admin.getCode());
wxCoupon.setSourceType(EnumCouponSourceType.COUPONSource_Bapi.getCode());
PageInfo<WxCouponStatisVo> pages = wxCouponService.findPressData(wxCoupon,pageNum,pageSize);
return new ResultData(pages);
}


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

@@ -106,6 +106,9 @@ public class WxCouponOrderBVo extends WxCouponOrder {
@io.swagger.annotations.ApiModelProperty(value = "补贴类型", name = "subsidyType")
private Integer subsidyType;

@io.swagger.annotations.ApiModelProperty(value="1:A端发卷,2:B端发卷",name="sourceType")
private Integer sourceType;

public String getbUserName() {
return bUserName;
}


+ 1
- 0
mallinkService/src/main/java/com/iformall/service/impl/WxCouponServiceImpl.java Просмотреть файл

@@ -741,4 +741,5 @@ public class WxCouponServiceImpl implements WxCouponService {
throw new MallinkException(ErrorCode.REMAIN_BACK_FAIL);
}
}

}

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

@@ -720,6 +720,7 @@
<result column="business" jdbcType="INTEGER" property="business"/>
<result column="subsidy_num" jdbcType="INTEGER" property="subsidyNum"/>
<result column="subsidy_type" jdbcType="INTEGER" property="subsidyType"/>
<result column="source_type" jdbcType="INTEGER" property="sourceType"/>

<result column="name" jdbcType="VARCHAR" property="bUserName" />
<result column="bphone" jdbcType="VARCHAR" property="bUserPhone" />
@@ -749,7 +750,7 @@

co.id,co.tenant_id,co.parent_tenant_id,co.coupon_id,co.coupon_type,co.expired_time,co.coupon_order_status,
co.create_date,co.update_date,co.coupon_price, co.verify_type, co.pay_vendor,c.title,c.sale_price,c.use_price,c.price,
c.unit,c.auto_refund,c.business,c.subsidy_type,ms.subsidy subsidy_num,
c.unit,c.auto_refund,c.business,c.subsidy_type,c.source_type,ms.subsidy subsidy_num,
(CASE WHEN couc.mc = 1 THEN m1.name ELSE '[多商户通用]' END) AS merchant_name,
(CASE WHEN couc.mc = 1 THEN m1.id ELSE 0 END) AS merchant_id,
cu.phone,m2.name AS verify_merchant_name,cal.channel_type
@@ -854,6 +855,9 @@
<if test=" null != business ">
and c.business = #{business}
</if>
<if test=" null != sourceType ">
and c.`source_type` = #{sourceType}
</if>
<if test=" null != verifyMerchantName and ''!= verifyMerchantName ">
and bu.verify_merchant_name = #{verifyMerchantName}
</if>


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