Merge branch 'dev_bid' into test6.9.13

Conflicts:
	dal/src/main/java/com/yohoufo/dal/order/model/BuyerOrder.java

@@ -230,6 +230,11 @@ public class BuyerOrder {
     }
 
     public int getPayStartTime() {
-        return payStartTime <= 0 ? getCreateTime() : payStartTime;
+        if (payStartTime <= 0 && createTime != null) {
+            //兼容老数据
+            return createTime;
+        } else {
+            return payStartTime;
+        }
     }
 }
\ No newline at end of file

@@ -144,6 +144,7 @@ public abstract class AbstractBuyerOrderStateChanger<T extends RequestedStatusCh
             logger.warn("[{}] updatedBuyerOrder original status must be not null", updatedBuyerOrder.getOrderCode());
             throw new UfoServiceException(500, "操作失败");
         }
+        logger.info("[{}] will be update in db by {}", buyerOrder.getOrderCode(), updatedBuyerOrder);
         int rows = buyerOrderMapper.updateByOrderCode(updatedBuyerOrder);
         boolean success = rows > 0;
         if (success) {