diff --git a/mallinkSchedule/src/main/java/com/iformall/schedule/SharingOrderResultSchedule.java b/mallinkSchedule/src/main/java/com/iformall/schedule/SharingOrderResultSchedule.java index 1dccd434d..d77de167b 100644 --- a/mallinkSchedule/src/main/java/com/iformall/schedule/SharingOrderResultSchedule.java +++ b/mallinkSchedule/src/main/java/com/iformall/schedule/SharingOrderResultSchedule.java @@ -1,11 +1,9 @@ package com.iformall.schedule; -import com.github.pagehelper.PageInfo; import com.iformall.domain.po.WxPayOrder; import com.iformall.domain.po.WxProfitSharingOrder; -import com.iformall.enums.EnumProfitSharingStatus; +import com.iformall.enums.EnumProfitSharingOrderStatus; import com.iformall.mapper.*; -import com.iformall.service.WxPayOrderService; import com.iformall.service.WxProfitSharingOrderService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -34,27 +32,25 @@ public class SharingOrderResultSchedule { public void sharingOrderResultSchedule() { WxProfitSharingOrder wxProfitSharingOrder = new WxProfitSharingOrder(); - wxProfitSharingOrder.setSharingStatus(EnumProfitSharingStatus.PROFIT_SHARING_ACCEPTED.getCode()); + wxProfitSharingOrder.setSharingStatus(EnumProfitSharingOrderStatus.PROFIT_SHARING_ACCEPTED.getCode()); List list = wxProfitSharingOrderMapper.findList(wxProfitSharingOrder); for(WxProfitSharingOrder sharingOrder : list) { try { - WxPayOrder wxPayOrder = wxPayOrderMapper.selectByPrimaryKey(sharingOrder.getOrderId()); - wxProfitSharingOrderService.querySharingOrder(wxPayOrder); + wxProfitSharingOrderService.querySharingOrder(sharingOrder); } catch (Exception e){ - logger.error("状态更新失败:" + EnumProfitSharingStatus.PROFIT_SHARING_ACCEPTED.getMessage() + logger.error("状态更新失败:" + EnumProfitSharingOrderStatus.PROFIT_SHARING_ACCEPTED.getMessage() + " ID:" +sharingOrder.getId() + " MSG:" + e.getMessage()); } } - wxProfitSharingOrder.setSharingStatus(EnumProfitSharingStatus.PROFIT_SHARING_PROCESSING.getCode()); + wxProfitSharingOrder.setSharingStatus(EnumProfitSharingOrderStatus.PROFIT_SHARING_PROCESSING.getCode()); list = wxProfitSharingOrderMapper.findList(wxProfitSharingOrder); for(WxProfitSharingOrder sharingOrder : list) { try { - WxPayOrder wxPayOrder = wxPayOrderMapper.selectByPrimaryKey(sharingOrder.getOrderId()); - wxProfitSharingOrderService.querySharingOrder(wxPayOrder); + wxProfitSharingOrderService.querySharingOrder(sharingOrder); } catch (Exception e){ - logger.error("状态更新失败:" + EnumProfitSharingStatus.PROFIT_SHARING_PROCESSING.getMessage() + logger.error("状态更新失败:" + EnumProfitSharingOrderStatus.PROFIT_SHARING_PROCESSING.getMessage() + " ID:" +sharingOrder.getId() + " MSG:" + e.getMessage()); } diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxMerchant.java b/mallinkService/src/main/java/com/iformall/domain/po/WxMerchant.java index 77f605e48..98c4557fb 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxMerchant.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxMerchant.java @@ -81,6 +81,10 @@ public class WxMerchant implements Serializable { @Transient private String accountName; + /*账户参数**/ + @Transient + private String accountParameter; + @Transient private List> shoplist; @@ -376,6 +380,14 @@ public class WxMerchant implements Serializable { this.vipDiscountRate3 = vipDiscountRate3; } + public String getAccountParameter() { + return accountParameter; + } + + public void setAccountParameter(String accountParameter) { + this.accountParameter = accountParameter; + } + public static enum Field { Id_ASC("`id` ASC"),Id_DESC("`id` DESC") diff --git a/mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml b/mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml index 3c6163a3d..91ebf1e70 100644 --- a/mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml @@ -553,7 +553,7 @@ from wx_coupon_order co,wx_coupon c where 1=1 and co.coupon_id = c.id - and c.type < 5 + and c.type != 5 and co.c_user_id = #{cUserId}