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

jsowell-pile/src/main/java/com/jsowell/pile/domain/PileMerchantInfo.java

@@ -32,6 +32,11 @@ public class PileMerchantInfo extends BaseEntity {
 	 */
 	private String merchantLevel;
 
+	/**
+	 * 延时分账模式（0-不延时；1-延时分账）
+	 */
+	private String delayMode;
+
 	/**
 	 * 父级运营商id
 	 */

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

@@ -2847,6 +2847,7 @@ public class OrderBasicInfoServiceImpl implements IOrderBasicInfoService {
      * 余额支付订单分账工具
      */
     public void splitTheBillForOrderTemp(AdapayMemberAccount adapayMemberAccount, OrderBasicInfo orderBasicInfo, String wechatAppId) throws BaseAdaPayException {
+        logger.info("");
         // 查询会员余额支付记录
         List<MemberAdapayRecord> recordList = memberAdapayRecordService.selectAdapayRecordList(orderBasicInfo.getMemberId(), ScenarioEnum.BALANCE.getValue());
         if (CollectionUtils.isEmpty(recordList)) {