Merge branch 'api-dev' into pre

* api-dev:
  修改代码

hai-service/src/main/java/com/hai/service/impl/HighOrderServiceImpl.java

@@ -1868,8 +1868,8 @@ public class HighOrderServiceImpl implements HighOrderService {
             }
 
             // 下单
-//            jsonObject = QianZhuConfig.starbucksOrders(user.getId().toString(), object.getString("storeCode"), List.toString().replace(" ", ""), object.getString("customerMobile"));
+            jsonObject = QianZhuConfig.starbucksOrders(user.getId().toString(), object.getString("storeCode"), List.toString().replace(" ", ""), object.getString("customerMobile"));
-            jsonObject = QianZhuConfig.starbucksOrders(user.getId().toString(), "50562", List.toString().replace(" ", ""), object.getString("customerMobile"));
+//            jsonObject = QianZhuConfig.starbucksOrders(user.getId().toString(), "50562", List.toString().replace(" ", ""), object.getString("customerMobile"));
 
             // 判断下单是否成功
             if (!Objects.equals(jsonObject.getString("code"), "200")) {