diff --git a/pluss-api-page/src/main/resources/application-dev.yml b/pluss-api-page/src/main/resources/application-dev.yml
index 9ca9e82..023100a 100644
--- a/pluss-api-page/src/main/resources/application-dev.yml
+++ b/pluss-api-page/src/main/resources/application-dev.yml
@@ -6,7 +6,7 @@ spring:
       driver-class-name: com.mysql.jdbc.Driver
 parameter:
   ### 这个根据自己的情况配置
-  domain:
+  domain: http://60.205.224.68
 
 swagger:
   ### 生产环境不允许访问swagger
diff --git a/pluss-api-page/src/main/resources/application-test.yml b/pluss-api-page/src/main/resources/application-test.yml
index 84016bb..84b5a60 100644
--- a/pluss-api-page/src/main/resources/application-test.yml
+++ b/pluss-api-page/src/main/resources/application-test.yml
@@ -7,7 +7,7 @@ spring:
     driver-class-name: com.mysql.jdbc.Driver
 
 parameter:
-  domain:
+  domain: http://60.205.224.68
 
 swagger:
   ### 生产环境不允许访问swagger
diff --git a/pluss-common-bundle/src/main/resources/config/application-common.yml b/pluss-common-bundle/src/main/resources/config/application-common.yml
index 30eb008..55ac404 100644
--- a/pluss-common-bundle/src/main/resources/config/application-common.yml
+++ b/pluss-common-bundle/src/main/resources/config/application-common.yml
@@ -90,7 +90,7 @@ spring:
     port: 5672
 
 parameter:
-  # 124.114.74.203本机ip
+  # 124.114.74.203本机ip http://60.205.224.68:8084
   domain: http://60.205.224.68
   ALI_APP_AUTH_TOKEN: ${parameter.domain}/wap/aliPay/index
   ALI_APP_ID: 支付宝原生接入的APPID
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/dto/MerChantOrderDTO.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/dto/MerChantOrderDTO.java
index 8538c4e..f495e71 100644
--- a/pluss-model-bundle/src/main/java/cn/pluss/platform/dto/MerChantOrderDTO.java
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/dto/MerChantOrderDTO.java
@@ -9,7 +9,7 @@ import lombok.Data;
 @Data
 public class MerChantOrderDTO {
     /**
-     * 0 扫码 1现金 2：会员卡
+     * 0 扫码 1现金 2：会员卡        1、反扫收款；2、收款码；3、会员充值；4、POS；5、反扫会员充值；6、扫码王、QR68机具收款 7：H5 8：升级收费 9小程序 10表示小程序线上店订单 11:缴费通 99 插件
      */
     private String type;
 	//订单编号
diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/vo/MerchantOrderVO.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/vo/MerchantOrderVO.java
index 1ee9a51..de02a8c 100644
--- a/pluss-model-bundle/src/main/java/cn/pluss/platform/vo/MerchantOrderVO.java
+++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/vo/MerchantOrderVO.java
@@ -16,11 +16,15 @@ import java.util.Date;
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
+//@TableName("(\n" +
+//        "            SELECT t1.*, t2.updateTime refundTime, IFNULL(wo.total_fee - wo.final_fee, IFNULL(wpo.total_fee - wpo.final_fee, 0)) coupon FROM tb_pluss_merchant_order t1\n" +
+//        "                LEFT JOIN tb_pluss_merchant_order t2 ON t1.orderNumber = t2.orderNumber AND t1.status = 1 AND t2.status = 2\n" +
+//        "               LEFT JOIN `syblife`.ims_tiny_wmall_order wo ON t1.orderNumber = wo.transaction_id AND t1.orderType = 10\n" +
+//        "               LEFT JOIN `syblife`.ims_tiny_wmall_paybill_order wpo ON t1.orderNumber = wpo.transaction_id AND t1.orderType != 10" +
+//        "        ) t")
 @TableName("(\n" +
-        "            SELECT t1.*, t2.updateTime refundTime, IFNULL(wo.total_fee - wo.final_fee, IFNULL(wpo.total_fee - wpo.final_fee, 0)) coupon FROM tb_pluss_merchant_order t1\n" +
+        "            SELECT t1.*, t2.updateTime refundTime FROM tb_pluss_merchant_order t1\n" +
         "                LEFT JOIN tb_pluss_merchant_order t2 ON t1.orderNumber = t2.orderNumber AND t1.status = 1 AND t2.status = 2\n" +
-        "               LEFT JOIN `syblife`.ims_tiny_wmall_order wo ON t1.orderNumber = wo.transaction_id AND t1.orderType = 10\n" +
-        "               LEFT JOIN `syblife`.ims_tiny_wmall_paybill_order wpo ON t1.orderNumber = wpo.transaction_id AND t1.orderType != 10" +
         "        ) t")
 @Accessors(chain = true)
 public class MerchantOrderVO extends MerchantOrder {
@@ -54,7 +58,7 @@ public class MerchantOrderVO extends MerchantOrder {
     /**
      * 优惠金额
      */
-    private BigDecimal coupon;
+//    private BigDecimal coupon;
 
     public static void setD0Fee(MerchantOrderVO item) {
 
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/sxf/pay/impl/SxfPayServiceImpl.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/sxf/pay/impl/SxfPayServiceImpl.java
index cfeb8a0..cee7251 100644
--- a/pluss-service-bundle/src/main/java/cn/pluss/platform/sxf/pay/impl/SxfPayServiceImpl.java
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/sxf/pay/impl/SxfPayServiceImpl.java
@@ -2,6 +2,7 @@ package cn.pluss.platform.sxf.pay.impl;
 
 import cn.pluss.platform.api.ResultCode;
 import cn.pluss.platform.channel.MerchantAuditService;
+import cn.pluss.platform.config.ParameterConfig;
 import cn.pluss.platform.constants.Constant;
 import cn.pluss.platform.dto.MemberScanPayDTO;
 import cn.pluss.platform.dto.MerChantOrderDTO;
@@ -195,7 +196,8 @@ public class SxfPayServiceImpl implements SxfPayService {
         reqData.put("tradeSource","01");
         //商家ip
         reqData.put("trmIp","127.0.0.1");
-        reqData.put("notifyUrl",ParametersUtil.domain+"/wap/notify/sxfCallBack");
+        // TODO ParametersUtil.domain获取不到ip,先写死
+        reqData.put("notifyUrl", ParametersUtil.domain+"/wap/notify/sxfCallBack");
         Map<String,Object> resultMap = null;
         try {
             Long startTime = System.currentTimeMillis();