diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillAllController.java b/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillAllController.java
index 14d875380..29a43f624 100644
--- a/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillAllController.java
+++ b/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillAllController.java
@@ -4,13 +4,10 @@ import com.iformall.annotation.SystemControllerLog;
import com.iformall.common.ResultData;
import com.iformall.controller.base.BaseController;
import com.iformall.domain.vo.WxBillAll;
-import com.iformall.enums.EnumFilterHasPay;
import com.iformall.service.WxBillAllService;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
-import org.apache.commons.collections.map.HashedMap;
-import org.apache.commons.collections.map.LinkedMap;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
@@ -18,7 +15,6 @@ import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.ModelAttribute;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
-
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.util.Map;
diff --git a/mallinkAdmin/src/main/resources/db/migration/V201905091758__L_UPDATE_COUPON_CHANNEL.sql b/mallinkAdmin/src/main/resources/db/migration/V201905091758__L_UPDATE_COUPON_CHANNEL.sql
new file mode 100644
index 000000000..2b62e3cf3
--- /dev/null
+++ b/mallinkAdmin/src/main/resources/db/migration/V201905091758__L_UPDATE_COUPON_CHANNEL.sql
@@ -0,0 +1,4 @@
+update wx_coupon_channel c set type = (select type from wx_coupon where id = c.coupon_id ),
+business = (select business from wx_coupon where id = c.coupon_id ),
+sub_business = (select sub_business from wx_coupon where id = c.coupon_id )
+where c.type is null or c.business is null or c.sub_business is null
\ No newline at end of file
diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxMerchantSubsidy.java b/mallinkService/src/main/java/com/iformall/domain/po/WxMerchantSubsidy.java
index e3f5cec1e..a40bb2377 100644
--- a/mallinkService/src/main/java/com/iformall/domain/po/WxMerchantSubsidy.java
+++ b/mallinkService/src/main/java/com/iformall/domain/po/WxMerchantSubsidy.java
@@ -1,6 +1,7 @@
package com.iformall.domain.po;
import cn.afterturn.easypoi.excel.annotation.Excel;
+import com.iformall.common.SortColumn;
import lombok.Data;
import javax.persistence.*;
import java.math.BigDecimal;
@@ -55,9 +56,11 @@ public class WxMerchantSubsidy extends BaseEntity {
/**订单金额*/
@io.swagger.annotations.ApiModelProperty(value="订单金额",name="orderPayment")
+ @SortColumn(column = "order_payment")
private Integer orderPayment;
/**接收金额(包含通道费)*/
@io.swagger.annotations.ApiModelProperty(value="接收金额(包含通道费)",name="receiverPayment")
+ @SortColumn(column = "receiver_payment")
private Integer receiverPayment;
/**订单金额*/
@@ -89,6 +92,7 @@ public class WxMerchantSubsidy extends BaseEntity {
private Date createDate;
/**更新时间*/
@io.swagger.annotations.ApiModelProperty(value="更新时间",name="updateDate")
+ @SortColumn(column = "update_date")
private Date updateDate;
@Transient
diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxTopicServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxTopicServiceImpl.java
index c04c61451..fd5d6f5ce 100644
--- a/mallinkService/src/main/java/com/iformall/service/impl/WxTopicServiceImpl.java
+++ b/mallinkService/src/main/java/com/iformall/service/impl/WxTopicServiceImpl.java
@@ -114,8 +114,6 @@ public class WxTopicServiceImpl implements WxTopicService {
String[] couponArray = couponId.split("-");
//保存coupon_channel
WxCoupon wxCoupon = wxCouponMapper.selectByPrimaryKey(Long.parseLong(couponArray[1]));
- if(wxCoupon == null)
- System.out.println("------------"+couponArray[1]);
WxCouponChannel wxCouponChannel = new WxCouponChannel();
wxCouponChannel.setId(idWorker.nextId());
wxCouponChannel.setBeginTime(record.getBeginTime());
@@ -125,6 +123,9 @@ public class WxTopicServiceImpl implements WxTopicService {
wxCouponChannel.setTenantId(record.getTenantId());
wxCouponChannel.setTitle(wxCoupon.getTitle());
wxCouponChannel.setTargetAd(EnumCouponChannelType.COUPON_CHANNEL_ID_TOPIC.getCode());
+ wxCouponChannel.setType(wxCoupon.getType());
+ wxCouponChannel.setBusiness(wxCoupon.getBusiness());
+ wxCouponChannel.setSubBusiness(wxCoupon.getSubBusiness());
wxCouponChannelMapper.insertSelective(wxCouponChannel);
}
}
diff --git a/mallinkService/src/main/resources/mapper/WxSubsidyMapper.xml b/mallinkService/src/main/resources/mapper/WxSubsidyMapper.xml
index dcd877eb8..72ae9d6a6 100644
--- a/mallinkService/src/main/resources/mapper/WxSubsidyMapper.xml
+++ b/mallinkService/src/main/resources/mapper/WxSubsidyMapper.xml
@@ -86,7 +86,7 @@
#{idItem}
-
+
order by ${sortColumns}