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

[系统][更改]:更改分账接口

release_toaliyun_real
hupeng 7 лет назад
Родитель
Сommit
48dbc53224
3 измененных файлов: 20 добавлений и 12 удалений
  1. +7
    -11
      mallinkSchedule/src/main/java/com/iformall/schedule/SharingOrderResultSchedule.java
  2. +12
    -0
      mallinkService/src/main/java/com/iformall/domain/po/WxMerchant.java
  3. +1
    -1
      mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml

+ 7
- 11
mallinkSchedule/src/main/java/com/iformall/schedule/SharingOrderResultSchedule.java Просмотреть файл

@@ -1,11 +1,9 @@
package com.iformall.schedule; package com.iformall.schedule;


import com.github.pagehelper.PageInfo;
import com.iformall.domain.po.WxPayOrder; import com.iformall.domain.po.WxPayOrder;
import com.iformall.domain.po.WxProfitSharingOrder; import com.iformall.domain.po.WxProfitSharingOrder;
import com.iformall.enums.EnumProfitSharingStatus;
import com.iformall.enums.EnumProfitSharingOrderStatus;
import com.iformall.mapper.*; import com.iformall.mapper.*;
import com.iformall.service.WxPayOrderService;
import com.iformall.service.WxProfitSharingOrderService; import com.iformall.service.WxProfitSharingOrderService;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
@@ -34,27 +32,25 @@ public class SharingOrderResultSchedule {
public void sharingOrderResultSchedule() { public void sharingOrderResultSchedule() {


WxProfitSharingOrder wxProfitSharingOrder = new WxProfitSharingOrder(); WxProfitSharingOrder wxProfitSharingOrder = new WxProfitSharingOrder();
wxProfitSharingOrder.setSharingStatus(EnumProfitSharingStatus.PROFIT_SHARING_ACCEPTED.getCode());
wxProfitSharingOrder.setSharingStatus(EnumProfitSharingOrderStatus.PROFIT_SHARING_ACCEPTED.getCode());
List<WxProfitSharingOrder> list = wxProfitSharingOrderMapper.findList(wxProfitSharingOrder); List<WxProfitSharingOrder> list = wxProfitSharingOrderMapper.findList(wxProfitSharingOrder);
for(WxProfitSharingOrder sharingOrder : list) { for(WxProfitSharingOrder sharingOrder : list) {
try { try {
WxPayOrder wxPayOrder = wxPayOrderMapper.selectByPrimaryKey(sharingOrder.getOrderId());
wxProfitSharingOrderService.querySharingOrder(wxPayOrder);
wxProfitSharingOrderService.querySharingOrder(sharingOrder);
} catch (Exception e){ } catch (Exception e){
logger.error("状态更新失败:" + EnumProfitSharingStatus.PROFIT_SHARING_ACCEPTED.getMessage()
logger.error("状态更新失败:" + EnumProfitSharingOrderStatus.PROFIT_SHARING_ACCEPTED.getMessage()
+ " ID:" +sharingOrder.getId() + " ID:" +sharingOrder.getId()
+ " MSG:" + e.getMessage()); + " MSG:" + e.getMessage());
} }
} }


wxProfitSharingOrder.setSharingStatus(EnumProfitSharingStatus.PROFIT_SHARING_PROCESSING.getCode());
wxProfitSharingOrder.setSharingStatus(EnumProfitSharingOrderStatus.PROFIT_SHARING_PROCESSING.getCode());
list = wxProfitSharingOrderMapper.findList(wxProfitSharingOrder); list = wxProfitSharingOrderMapper.findList(wxProfitSharingOrder);
for(WxProfitSharingOrder sharingOrder : list) { for(WxProfitSharingOrder sharingOrder : list) {
try { try {
WxPayOrder wxPayOrder = wxPayOrderMapper.selectByPrimaryKey(sharingOrder.getOrderId());
wxProfitSharingOrderService.querySharingOrder(wxPayOrder);
wxProfitSharingOrderService.querySharingOrder(sharingOrder);
} catch (Exception e){ } catch (Exception e){
logger.error("状态更新失败:" + EnumProfitSharingStatus.PROFIT_SHARING_PROCESSING.getMessage()
logger.error("状态更新失败:" + EnumProfitSharingOrderStatus.PROFIT_SHARING_PROCESSING.getMessage()
+ " ID:" +sharingOrder.getId() + " ID:" +sharingOrder.getId()
+ " MSG:" + e.getMessage()); + " MSG:" + e.getMessage());
} }


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

@@ -81,6 +81,10 @@ public class WxMerchant implements Serializable {
@Transient @Transient
private String accountName; private String accountName;


/*账户参数**/
@Transient
private String accountParameter;

@Transient @Transient
private List<Map<String,Object>> shoplist; private List<Map<String,Object>> shoplist;


@@ -376,6 +380,14 @@ public class WxMerchant implements Serializable {
this.vipDiscountRate3 = vipDiscountRate3; this.vipDiscountRate3 = vipDiscountRate3;
} }


public String getAccountParameter() {
return accountParameter;
}

public void setAccountParameter(String accountParameter) {
this.accountParameter = accountParameter;
}

public static enum Field public static enum Field
{ {
Id_ASC("`id` ASC"),Id_DESC("`id` DESC") Id_ASC("`id` ASC"),Id_DESC("`id` DESC")


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

@@ -553,7 +553,7 @@
from wx_coupon_order co,wx_coupon c from wx_coupon_order co,wx_coupon c
where 1=1 where 1=1
and co.coupon_id = c.id and co.coupon_id = c.id
and c.type &lt; 5
and c.type != 5
<if test="cUserId != null"> <if test="cUserId != null">
and co.c_user_id = #{cUserId} and co.c_user_id = #{cUserId}
</if> </if>


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