Merge branch 'test6.9.9' of http://git.yoho.cn/ufo/ufo-platform into test6.9.9

@@ -22,6 +22,16 @@ public class IdentifyRecords {
 
     private Integer storageId;
 
+    private Long lastOrderCode;
+
+    public Long getLastOrderCode() {
+        return lastOrderCode;
+    }
+
+    public void setLastOrderCode(Long lastOrderCode) {
+        this.lastOrderCode = lastOrderCode;
+    }
+
     public Integer getStorageId() {
         return storageId;
     }

@@ -11,19 +11,20 @@
         <result column="auth_time" property="authTime" jdbcType="INTEGER" />
         <result column="auth_uid" property="authUid" jdbcType="VARCHAR" />
         <result column="storage_id" property="storageId" jdbcType="INTEGER" />
+        <result column="last_order_code" property="lastOrderCode" jdbcType="BIGINT" />
     </resultMap>
 
     <sql id="Base_Column_List">
-        id,tag_id,nfc_uid,owner,allow_transfer,order_code,auth_time,auth_uid,storage_id
+        id,tag_id,nfc_uid,owner,allow_transfer,order_code,auth_time,auth_uid,storage_id, last_order_code
     </sql>
 
     <insert id="insertUpdateRecord" parameterType="com.yoho.ufo.dal.model.IdentifyRecords">
         insert into
-        identify_records(tag_id,nfc_uid,owner,allow_transfer,order_code,auth_time,auth_uid, storage_id)
+        identify_records(tag_id,nfc_uid,owner,allow_transfer,order_code,auth_time,auth_uid, storage_id, last_order_code)
         values
        (#{tagId,jdbcType=VARCHAR },#{nfcUid,jdbcType=VARCHAR },#{owner,jdbcType=INTEGER },#{allowTransfer,jdbcType=INTEGER },#{orderCode,jdbcType=BIGINT },
-          #{authTime,jdbcType=INTEGER },#{authUid,jdbcType=VARCHAR }, #{storageId,jdbcType=INTEGER }) ON DUPLICATE KEY UPDATE owner = #{owner,jdbcType=INTEGER },
-          order_code = #{orderCode,jdbcType=BIGINT }, storage_id = #{storageId,jdbcType=INTEGER }, auth_uid = #{authUid,jdbcType=VARCHAR}
+          #{authTime,jdbcType=INTEGER },#{authUid,jdbcType=VARCHAR }, #{storageId,jdbcType=INTEGER }, #{orderCode,jdbcType=BIGINT }) ON DUPLICATE KEY UPDATE owner = #{owner,jdbcType=INTEGER },
+          order_code = #{orderCode,jdbcType=BIGINT }, storage_id = #{storageId,jdbcType=INTEGER }, auth_uid = #{authUid,jdbcType=VARCHAR}, last_order_code = #{orderCode,jdbcType=BIGINT }
     </insert>
     
     <select id="selectByBatchOrderCode" resultMap="BaseResultMap">