Merge branch 'master' into test6.9.10

@@ -23,6 +23,10 @@ public class SignForPackage implements Serializable {
     
     private Integer isNormal;
     
+    private Integer operateUid;
+    
+    private String userName;
+    
 	public Integer getId() {
 		return id;
 	}
@@ -71,6 +75,22 @@ public class SignForPackage implements Serializable {
 		this.isNormal = isNormal;
 	}
 
+	public Integer getOperateUid() {
+		return operateUid;
+	}
+
+	public void setOperateUid(Integer operateUid) {
+		this.operateUid = operateUid;
+	}
+
+	public String getUserName() {
+		return userName;
+	}
+
+	public void setUserName(String userName) {
+		this.userName = userName;
+	}
+
 	@Override
     public String toString() {
         return "SignForPackage{" +
@@ -80,6 +100,8 @@ public class SignForPackage implements Serializable {
                 ", depotNo='" + depotNo + '\'' +
                 ", signTime='" + signTime + '\'' +
                 ", isNormal='" + isNormal + '\'' +
+                ", operateUid='" + operateUid + '\'' +
+                ", userName='" + userName + '\'' +
                 '}';
     }
 }

@@ -15,8 +15,8 @@
     </sql>
     
     <insert id="insert" parameterType="com.yoho.order.model.SignForPackage">
-        insert into sign_for_package (date, seller_waybillCode, depot_no, sign_time, is_normal) values (#{date}, #{sellerWaybillCode}, #{depotNo}, 
-        #{signTime}, #{isNormal})
+        insert into sign_for_package (date, seller_waybillCode, depot_no, sign_time, is_normal, operate_uid, user_name) values (#{date}, #{sellerWaybillCode}, #{depotNo}, 
+        #{signTime}, #{isNormal}, #{operateUid}, #{userName})
     </insert>
     
     <select id="selectCountByDate" resultType="java.lang.Integer">

@@ -2725,6 +2725,8 @@ public class BuyerOrderServiceImpl implements IBuyerOrderService, ApplicationCon
     	pkg.setDepotNo(depotNo);
     	pkg.setSignTime(DateUtil.getCurrentTimeSeconds());
     	pkg.setIsNormal(isNormal);
+    	pkg.setOperateUid(new UserHelper().getUserId());
+    	pkg.setUserName(new UserHelper().getUserName());
     	
     	signForPackageMapper.insert(pkg);
     }