Browse Source

[统计][修改][完善欠缴商户]

release_toaliyun_real
luozukai 7 years ago
parent
commit
b2cfb3ff2c
5 changed files with 12 additions and 7 deletions
  1. +0
    -4
      mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillAllController.java
  2. +4
    -0
      mallinkAdmin/src/main/resources/db/migration/V201905091758__L_UPDATE_COUPON_CHANNEL.sql
  3. +4
    -0
      mallinkService/src/main/java/com/iformall/domain/po/WxMerchantSubsidy.java
  4. +3
    -2
      mallinkService/src/main/java/com/iformall/service/impl/WxTopicServiceImpl.java
  5. +1
    -1
      mallinkService/src/main/resources/mapper/WxSubsidyMapper.xml

+ 0
- 4
mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillAllController.java View File

@@ -4,13 +4,10 @@ import com.iformall.annotation.SystemControllerLog;
import com.iformall.common.ResultData; import com.iformall.common.ResultData;
import com.iformall.controller.base.BaseController; import com.iformall.controller.base.BaseController;
import com.iformall.domain.vo.WxBillAll; import com.iformall.domain.vo.WxBillAll;
import com.iformall.enums.EnumFilterHasPay;
import com.iformall.service.WxBillAllService; import com.iformall.service.WxBillAllService;
import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation; 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.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired; 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.ModelAttribute;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;

import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import java.util.Map; import java.util.Map;


+ 4
- 0
mallinkAdmin/src/main/resources/db/migration/V201905091758__L_UPDATE_COUPON_CHANNEL.sql View File

@@ -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

+ 4
- 0
mallinkService/src/main/java/com/iformall/domain/po/WxMerchantSubsidy.java View File

@@ -1,6 +1,7 @@
package com.iformall.domain.po; package com.iformall.domain.po;


import cn.afterturn.easypoi.excel.annotation.Excel; import cn.afterturn.easypoi.excel.annotation.Excel;
import com.iformall.common.SortColumn;
import lombok.Data; import lombok.Data;
import javax.persistence.*; import javax.persistence.*;
import java.math.BigDecimal; import java.math.BigDecimal;
@@ -55,9 +56,11 @@ public class WxMerchantSubsidy extends BaseEntity {


/**订单金额*/ /**订单金额*/
@io.swagger.annotations.ApiModelProperty(value="订单金额",name="orderPayment") @io.swagger.annotations.ApiModelProperty(value="订单金额",name="orderPayment")
@SortColumn(column = "order_payment")
private Integer orderPayment; private Integer orderPayment;
/**接收金额(包含通道费)*/ /**接收金额(包含通道费)*/
@io.swagger.annotations.ApiModelProperty(value="接收金额(包含通道费)",name="receiverPayment") @io.swagger.annotations.ApiModelProperty(value="接收金额(包含通道费)",name="receiverPayment")
@SortColumn(column = "receiver_payment")
private Integer receiverPayment; private Integer receiverPayment;


/**订单金额*/ /**订单金额*/
@@ -89,6 +92,7 @@ public class WxMerchantSubsidy extends BaseEntity {
private Date createDate; private Date createDate;
/**更新时间*/ /**更新时间*/
@io.swagger.annotations.ApiModelProperty(value="更新时间",name="updateDate") @io.swagger.annotations.ApiModelProperty(value="更新时间",name="updateDate")
@SortColumn(column = "update_date")
private Date updateDate; private Date updateDate;


@Transient @Transient


+ 3
- 2
mallinkService/src/main/java/com/iformall/service/impl/WxTopicServiceImpl.java View File

@@ -114,8 +114,6 @@ public class WxTopicServiceImpl implements WxTopicService {
String[] couponArray = couponId.split("-"); String[] couponArray = couponId.split("-");
//保存coupon_channel //保存coupon_channel
WxCoupon wxCoupon = wxCouponMapper.selectByPrimaryKey(Long.parseLong(couponArray[1])); WxCoupon wxCoupon = wxCouponMapper.selectByPrimaryKey(Long.parseLong(couponArray[1]));
if(wxCoupon == null)
System.out.println("------------"+couponArray[1]);
WxCouponChannel wxCouponChannel = new WxCouponChannel(); WxCouponChannel wxCouponChannel = new WxCouponChannel();
wxCouponChannel.setId(idWorker.nextId()); wxCouponChannel.setId(idWorker.nextId());
wxCouponChannel.setBeginTime(record.getBeginTime()); wxCouponChannel.setBeginTime(record.getBeginTime());
@@ -125,6 +123,9 @@ public class WxTopicServiceImpl implements WxTopicService {
wxCouponChannel.setTenantId(record.getTenantId()); wxCouponChannel.setTenantId(record.getTenantId());
wxCouponChannel.setTitle(wxCoupon.getTitle()); wxCouponChannel.setTitle(wxCoupon.getTitle());
wxCouponChannel.setTargetAd(EnumCouponChannelType.COUPON_CHANNEL_ID_TOPIC.getCode()); wxCouponChannel.setTargetAd(EnumCouponChannelType.COUPON_CHANNEL_ID_TOPIC.getCode());
wxCouponChannel.setType(wxCoupon.getType());
wxCouponChannel.setBusiness(wxCoupon.getBusiness());
wxCouponChannel.setSubBusiness(wxCoupon.getSubBusiness());
wxCouponChannelMapper.insertSelective(wxCouponChannel); wxCouponChannelMapper.insertSelective(wxCouponChannel);
} }
} }


+ 1
- 1
mallinkService/src/main/resources/mapper/WxSubsidyMapper.xml View File

@@ -86,7 +86,7 @@
<foreach collection="ids" index="index" item="idItem" open="(" separator="," close=")"> <foreach collection="ids" index="index" item="idItem" open="(" separator="," close=")">
#{idItem} #{idItem}
</foreach> </foreach>
</if>
</if>
<if test=" null != sortColumns"> order by ${sortColumns} </if> <if test=" null != sortColumns"> order by ${sortColumns} </if>
</sql> </sql>


Loading…
Cancel
Save