Merge remote-tracking branch 'origin/dev_goblin' into dev_goblin

liquidnet-bus-config/liquidnet-config/liquidnet-service-goblin.yml

@@ -105,6 +105,7 @@ global-auth:
     - ${liquidnet.info.context}/zhengzai/app/market/list
     - ${liquidnet.info.context}/zhengzai/app/spu/list
     - ${liquidnet.info.context}/zhengzai/app/store/list
+    - ${liquidnet.info.context}/order/pay/syncOrder
   oncheck-url-pattern:
     -
 # -----------------------------------------------------------

liquidnet-bus-service/liquidnet-service-goblin/liquidnet-service-goblin-impl/src/main/java/com/liquidnet/service/goblin/service/impl/GoblinFrontServiceImpl.java

@@ -938,7 +938,7 @@ public class GoblinFrontServiceImpl implements GoblinFrontService {
     }
 
     public int getShopCartCount(String userId,String type){
-        log.info("获取商品数量{}",userId);
+        log.debug("获取商品数量{}",userId);
         int  count=0;
         GoblinShoppingCartVoo goblinShoppingCartVoo= (GoblinShoppingCartVoo) redisUtil.get(GoblinRedisConst.FRONT_SHOPCART.concat(userId).concat(type.toString()));
         if(null!=goblinShoppingCartVoo){
@@ -1123,7 +1123,7 @@ public class GoblinFrontServiceImpl implements GoblinFrontService {
             });
         }
         String sqlDatas = SqlMapping.gets(sqls, sqlData);
-        log.info(sqlDatas);
+        log.debug(sqlDatas);
         queueUtils.sendMsgByRedis(MQConst.GoblinQueue.GOBLIN_SHOP_CART.getKey(), sqlDatas);
     }
 

liquidnet-bus-service/liquidnet-service-goblin/liquidnet-service-goblin-impl/src/main/java/com/liquidnet/service/goblin/service/impl/GoblinOrderServiceImpl.java

@@ -330,8 +330,8 @@ public class GoblinOrderServiceImpl implements IGoblinOrderService {
             // 调用支付
             LinkedMultiValueMap<String, String> httpData = CollectionUtil.linkedMultiValueMapStringString();
             httpData.add("type", "PRODUCT");
-//            httpData.add("price", preParam.getPriceActual().toString());
-            httpData.add("price","0.01");
+            httpData.add("price", preParam.getPriceActual().toString());
+//            httpData.add("price","0.01");
             httpData.add("name", preParam.getStoreName());
             httpData.add("detail", preParam.getSkuName());
             httpData.add("orderCode", preParam.getOrderMasterCode());