diff --git a/hai-cweb/src/main/java/com/cweb/controller/pay/OrderController.java b/hai-cweb/src/main/java/com/cweb/controller/pay/OrderController.java index 1c50edf1..437debc3 100644 --- a/hai-cweb/src/main/java/com/cweb/controller/pay/OrderController.java +++ b/hai-cweb/src/main/java/com/cweb/controller/pay/OrderController.java @@ -229,8 +229,6 @@ public class OrderController { if (merTripartitePlatform != null) { weChatPayReqInfo.setSub_mch_id(merTripartitePlatform.getPlatformMerNumber()); if (merTripartitePlatform.getProfitSharingRatio().compareTo(new BigDecimal("0")) == 1) { - profitSharing = "N"; - } else { profitSharing = merTripartitePlatform.getProfitSharingStatus().equals(true)?"Y":"N"; } } diff --git a/hai-service/src/main/java/com/hai/entity/HighOrder.java b/hai-service/src/main/java/com/hai/entity/HighOrder.java index c407dd58..3dd4b8d0 100644 --- a/hai-service/src/main/java/com/hai/entity/HighOrder.java +++ b/hai-service/src/main/java/com/hai/entity/HighOrder.java @@ -208,11 +208,11 @@ public class HighOrder implements Serializable { this.highDiscount = highDiscount; } - public Boolean getTyAgent() { + public Boolean getIsTyAgent() { return isTyAgent; } - public void setTyAgent(Boolean tyAgent) { + public void setIsTyAgent(Boolean tyAgent) { isTyAgent = tyAgent; }