Przeglądaj źródła

处理买家财务对账的bug

yujia 7 lat temu
rodzic
commit
f6916b8b99

+ 1 - 0
src/main/java/com/uas/platform/b2c/trade/order/model/Order.java

@@ -2629,6 +2629,7 @@ public class Order extends Document implements Serializable {
 				", launchOrExApplyId='" + launchOrExApplyId + '\'' +
 				", launchOrExApplyId='" + launchOrExApplyId + '\'' +
 				", jsonPuExInfo='" +  puExInfoJson + '\'' +
 				", jsonPuExInfo='" +  puExInfoJson + '\'' +
 				", exception='" + exception + '\'' +
 				", exception='" + exception + '\'' +
+				", remitteeType='" + remitteeType + '\'' +
 				'}';
 				'}';
 	}
 	}
 
 

+ 9 - 0
src/main/java/com/uas/platform/b2c/trade/order/model/OrderSimpleInfo.java

@@ -377,6 +377,15 @@ public class OrderSimpleInfo extends Document implements Serializable {
 				+ ", status=" + status + ", price=" + price + ", type=" + type + "]";
 				+ ", status=" + status + ", price=" + price + ", type=" + type + "]";
 	}
 	}
 
 
+	public String getRemitteeType() {
+		return remitteeType;
+	}
+
+	public OrderSimpleInfo setRemitteeType(String remitteeType) {
+		this.remitteeType = remitteeType;
+		return this;
+	}
+
 	/**
 	/**
 	 * 格式化付款时间
 	 * 格式化付款时间
 	 * @return
 	 * @return

+ 1 - 1
src/main/java/com/uas/platform/b2c/trade/order/service/impl/OrderServiceImpl.java

@@ -3389,7 +3389,7 @@ public class OrderServiceImpl implements OrderService {
             info.expression(PredicateUtils.eq("paytype", method, false));
             info.expression(PredicateUtils.eq("paytype", method, false));
         }
         }
         if (!StringUtils.isEmpty(remitteeType)) {
         if (!StringUtils.isEmpty(remitteeType)) {
-            info.expression(PredicateUtils.eq("remitteeType", remitteeType, false));
+            info.filter("remitteeType", remitteeType);
         }
         }
     }
     }