Merge branch 'test6.10.1' into test6.10.2_favorite

@@ -254,7 +254,7 @@
     sog.uid,
     sog.id skup, so.order_code orderCode, sog.storage_id storageId, sog.product_name productName,
     sog.size_name sizeName,
-    sog.product_id productId, sog.status, sog.goods_price price
+    sog.product_id productId, sog.status, sog.goods_price price, so.earnest_money earnestMoney
     from seller_order_goods sog, seller_order so
     where sog.id=so.skup
     and so.uid= #{uid,jdbcType=INTEGER}

@@ -2,7 +2,6 @@ package com.yohoufo.order.service.pay.weixin;
 
 import com.yohoufo.order.config.WeixinPayConstants;
 import com.yohoufo.order.service.pay.weixin.config.AbstractWeixinPayConfig;
-import com.yohoufo.order.service.pay.weixin.config.YoufuMniniPayConfig;
 import com.yohoufo.order.service.pay.weixin.config.YoufuWeixinPayConfig;
 import com.yohoufo.order.service.pay.weixin.ssl.AbstractHttpSslClient;
 import com.yohoufo.order.service.pay.weixin.ssl.YoufuWxHttpSslClient;

@@ -2,8 +2,7 @@ package com.yohoufo.order.service.pay.weixin;
 
 import com.yohoufo.order.config.WeixinPayConstants;
 import com.yohoufo.order.service.pay.weixin.config.AbstractWeixinPayConfig;
-import com.yohoufo.order.service.pay.weixin.config.YoufuMniniPayConfig;
-import com.yohoufo.order.service.pay.weixin.config.YoufuWeixinPayConfig;
+import com.yohoufo.order.service.pay.weixin.config.YoufuMiniPayConfig;
 import com.yohoufo.order.service.pay.weixin.ssl.AbstractHttpSslClient;
 import com.yohoufo.order.service.pay.weixin.ssl.YoufuWxHttpSslClient;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -17,7 +16,7 @@ public class YoufuMiniappWeixinPayService extends AbstractWeixinPayService {
 
 
     @Autowired
-    YoufuMniniPayConfig youfuMniniPayConfig;
+    YoufuMiniPayConfig youfuMniniPayConfig;
 
     @Autowired
     YoufuWxHttpSslClient youfuWxHttpSslClient;

@@ -4,7 +4,7 @@ import com.yohoufo.order.config.WeixinPayConstants;
 import org.springframework.stereotype.Component;
 
 @Component
-public class YoufuMniniPayConfig extends AbstractWeixinPayConfig {
+public class YoufuMiniPayConfig extends AbstractWeixinPayConfig {
 
     @Override
     public String appId() {

@@ -15,6 +15,7 @@ import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
 import org.springframework.stereotype.Service;
 import java.util.Objects;
@@ -30,7 +31,11 @@ public class FastDeliveryProxyService {
 
     public static final String YH_SECRET = "yh_2019oEngMex8";
 
-    int Default_Time = 1000;
+    @Value("${fast.delivery.timetout:1000}")
+    int Default_Time;
+
+    @Autowired
+    FastDeliveryTemplate fastDeliveryTemplate;
 
 
     public static final String LOCK_SKUP_SERVICE_NAME = "fast.delivery.lockSkup";
@@ -181,8 +186,7 @@ public class FastDeliveryProxyService {
     }
 
 
-    @Autowired
-    FastDeliveryTemplate fastDeliveryTemplate;
+
 
     /**
      * 锁库存

-# 预存保证金
+# \u9884\u5B58\u4FDD\u8BC1\u91D1
 deposit.prestore=${depositPrestore}
-# 保证金充值列表
+# \u4FDD\u8BC1\u91D1\u5145\u503C\u5217\u8868
 deposit.recharge.list=${depositRechargeList}
 deposit.earnest.money.limit=${depositEarnestMoneyLimit}
 
@@ -18,8 +18,8 @@ service.call.defaultMaxPerRoute=300
 #search server ip and port(if hava)
 ip.port.search.server=${ip.port.search.server}
 
-#\u914d\u7f6e\u5b89\u5168\u7684\u9650\u5236\u6b21?
-#\u914d\u7f6e\u5b89\u5168\u7684\u9650\u5236\u6b21\u6570
+#\u914D\u7F6E\u5B89\u5168\u7684\u9650\u5236\u6B21?
+#\u914D\u7F6E\u5B89\u5168\u7684\u9650\u5236\u6B21\u6570
 login.ip.limit.times=20
 login.loginfailed.limit.time=10
 login.skip.modify.weakPwd=${login.skip.modify.weakPwd}
@@ -29,10 +29,10 @@ zkAddress=${zkAddress}
 # web context
 web.context=ufo-gateway
 
-#\u5bc6\u7801AES\u52a0\u5bc6\u5bc6\u94a5
+#\u5BC6\u7801AES\u52A0\u5BC6\u5BC6\u94A5
 password.aes.key=${password.aes.key}
 uic.service.url=${uic.service.url}
-#��Ϣ����-����url
+#\uFFFD\uFFFD\u03E2\uFFFD\uFFFD\uFFFD\uFFFD-\uFFFD\uFFFD\uFFFD\uFFFDurl
 inbox.baseurl=${inbox.baseurl}
 
 #signature encrypt key salt
@@ -96,16 +96,16 @@ rabbit_host=${rabbit_ufo}
 rabbit_user=${rabbit_ufo_user}
 rabbit_password=${rabbit_ufo_password}
 
-#二次发货提醒 24*60 minutes  1440
+#\u4E8C\u6B21\u53D1\u8D27\u63D0\u9192 24*60 minutes  1440
 mq.seller.deliverNotice.second=${mq.seller.deliverNotice.second}
 mq.seller.deliverNotice.totalTime=${mq.seller.deliverNotice.totalTime}
 mq.seller.deliverNotice.lastTime=${mq.seller.deliverNotice.lastTime}
-#发货失败提醒 36*60 minutes  2160
+#\u53D1\u8D27\u5931\u8D25\u63D0\u9192 36*60 minutes  2160
 mq.seller.deliverNotice.third=${mq.seller.deliverNotice.third}
 
-#old 二次发货提醒 108*60 minutes
+#old \u4E8C\u6B21\u53D1\u8D27\u63D0\u9192 108*60 minutes
 mq.seller.deliverNotice.old.second=6480
-#old发货失败提醒 120*60
+#old\u53D1\u8D27\u5931\u8D25\u63D0\u9192 120*60
 mq.seller.deliverNotice.old.third=7200
 
 mq.seller.deliver.limitTime.delay=${mq.seller.deliver.limitTime.delay}
@@ -121,9 +121,12 @@ ufo.nfc.syncBlockChain.url=${ufo.nfc.syncBlockChain.url}
 
 ufo.product.addSizeSortId=40
 
-#用户实名认证的次数
+#\u7528\u6237\u5B9E\u540D\u8BA4\u8BC1\u7684\u6B21\u6570
 ufo.certification.timesLimit=3
 
+
+fast.delivery.timetout=${fast.delivery.timetout}
+
 unionpay.env=00
 unionpay.notifyurl=${unionpay.notifyurl}