Merge branch 'dev' of http://192.168.2.2:8099/jsowell/jsowell-charger-web into dev

jsowell-pile/src/main/java/com/jsowell/pile/dto/AlipayLoginDTO.java

@@ -13,4 +13,9 @@ public class AlipayLoginDTO {
      * 小程序appId
      */
     private String appId;
+
+    /**
+     * 请求来源, 参见{@link com.jsowell.common.enums.adapay.AdapayPayChannelEnum}
+     */
+    private String requestSource;
 }

jsowell-pile/src/main/java/com/jsowell/pile/dto/MemberRegisterAndLoginDTO.java

@@ -26,12 +26,17 @@ public class MemberRegisterAndLoginDTO {
 	private String appId;
 
 	/**
-	 * 运营商id
+	 * 一级运营商id
 	 */
-	private String merchantId;
+	private String firstLevelMerchantId;
 
 	/**
 	 * 微信用户openId
 	 */
 	private String openId;
+
+	/**
+	 * 请求来源, 参见{@link com.jsowell.common.enums.adapay.AdapayPayChannelEnum}
+	 */
+	private String requestSource;
 }

jsowell-pile/src/main/java/com/jsowell/pile/dto/WechatLoginDTO.java

@@ -21,4 +21,9 @@ public class WechatLoginDTO {
 	 * 用来获取openId的Code
 	 */
 	private String openIdCode;
+
+	/**
+	 * 请求来源, 参见{@link com.jsowell.common.enums.adapay.AdapayPayChannelEnum}
+	 */
+	private String requestSource;
 }

jsowell-pile/src/main/java/com/jsowell/pile/dto/agentDev/AgentWechatLoginDTO.java

@@ -25,5 +25,8 @@ public class AgentWechatLoginDTO {
      */
     private String openIdCode;
 
-
+    /**
+     * 请求来源, 参见{@link com.jsowell.common.enums.adapay.AdapayPayChannelEnum}
+     */
+    private String requestSource;
 }

jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java

@@ -1990,7 +1990,6 @@ public class OrderBasicInfoServiceImpl implements OrderBasicInfoService {
         // return orderBasicInfoMapper.getIndexOrderInfo(dto);
         List<IndexOrderInfoVO> voList = orderBasicInfoMapper.getIndexOrderInfoV2(dto);
 
-
         Map<String, List<IndexOrderInfoVO>> map = voList.stream().collect(Collectors.groupingBy(IndexOrderInfoVO::getDate));
 
         List<IndexOrderInfoVO> resultList = Lists.newArrayList();