提交代码

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";
                             }
                         }

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;
     }