Merge branch 'dev_确认收货优化' into test6.9.7

@@ -61,7 +61,7 @@
     
     <update id="upadteAuditResult">
        update self_size set status=#{status}, audit_time=unix_timestamp(), audit_uid=#{auditUid}  
-       where id=#{id}
+       where id=#{id} and status=0
     </update>
   
 </mapper>
\ No newline at end of file

@@ -220,8 +220,10 @@ public class SelfSizeServiceImpl implements ISelfSizeService {
     	clearProductDetailCache(selfSize.getProductId());
     	
     	if(num > 0 && req.getStatus().intValue() == 1) {//审核通过
-    		//添加尺码到storage表
-    		saveStorage(selfSize);
+			//添加尺码到storage表
+			if (storageMapper.selectBySize(selfSize.getProductId(), selfSize.getSizeId()) == null) {
+				saveStorage(selfSize);
+			}
     		
     		Product product = productMapper.selectByPrimaryKey(selfSize.getProductId());
     		Size size = ufoSizeMapper.selectOneById(selfSize.getSizeId());
@@ -242,7 +244,7 @@ public class SelfSizeServiceImpl implements ISelfSizeService {
         		inboxService.sendSmsMessage(smsReq);
     		}
     	}
-    	return num;
+    	return 1;
     }
     
     private int saveStorage(SelfSize selfSize) {