Browse Source

fix coupon order

release_toaliyun_real
xiaohanzi 5 years ago
parent
commit
3d330c18e8
3 changed files with 22 additions and 2 deletions
  1. +6
    -1
      mallinkService/src/main/java/com/iformall/domain/vo/WxCouponOrderBVo.java
  2. +13
    -0
      mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java
  3. +3
    -1
      mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml

+ 6
- 1
mallinkService/src/main/java/com/iformall/domain/vo/WxCouponOrderBVo.java View File

@@ -134,10 +134,15 @@ public class WxCouponOrderBVo extends WxCouponOrder {
private String bUserName;
@io.swagger.annotations.ApiModelProperty(value="b端用户手机号",name="bUserPhone")
private String bUserPhone;
@Excel(name = "券商户", width = 50, orderNum = "3")
@Excel(name = "券所属商户", width = 50, orderNum = "3")
@io.swagger.annotations.ApiModelProperty(value="使用券商户名",name="merchantName")
private String merchantName;

@Excel(name = "发券商户(商户注券)", width = 50, orderNum = "3")
@io.swagger.annotations.ApiModelProperty(value="发券商户(商户注券)",name="sendMerchantName")
@TableField(exist = false)
private String sendMerchantName;
// public String getMerchantName() {
// if(this.getCmCount() != null && this.getCmCount() > 1){
// this.merchantName = "[多商户通用]";


+ 13
- 0
mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java View File

@@ -332,11 +332,24 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService {
@Override
public void exportData(WxCouponOrderBVo wxCouponOrder, HttpServletRequest request, HttpServletResponse response) {
String filename = "券订单";
WxMerchant merchantQ = new WxMerchant();
merchantQ.updateTenantInfo(wxCouponOrder);
List<WxMerchant> merchantList = wxMerchantMapper.findIdNameList(merchantQ);
Map<Long,String> merchantNameMap = new HashMap<Long,String>();
if (null != merchantList) {
merchantList.parallelStream().forEach(m -> {
merchantNameMap.put(m.getId(), m.getName());
});
}
List<WxCouponOrderBVo> list = wxCouponOrderMapper.findListOfAdmin(wxCouponOrder);
list.parallelStream().forEach(c -> {
if (c.getCouponOrderStatus().equals(EnumCouponOrderStatus.COUPON_ORDER_USE_WAIT.getCode())) {
c.setUpdateDate(null);
}
if (null != c.getSendMerchantId()) {
c.setSendMerchantName(merchantNameMap.get(c.getSendMerchantId()));
}
// if (!c.getMerchantId().equals(0L)) {
// List<WxMerchantVo> merchantVoList = c.getMerchantVoList();
// if (!CollectionUtils.isEmpty(merchantVoList)) {


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

@@ -764,6 +764,8 @@
<result column="merchant_name" jdbcType="VARCHAR" property="merchantName" />

<result column="verify_merchant_name" jdbcType="VARCHAR" property="verifyMerchantName"/>
<result column="send_merchant_id" jdbcType="INTEGER" property="sendMerchantId" />
</resultMap>

<sql id="allAdminCouponOrderListColumns">
@@ -786,7 +788,7 @@

co.id,co.tenant_id,co.parent_tenant_id,co.coupon_id,co.coupon_type,co.expired_time,co.coupon_order_status,co.order_id,
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,c.source_type,ms.subsidy subsidy_num,
co.send_merchant_id,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


Loading…
Cancel
Save