Merge branch 'gray' into test6.9.1

@@ -49,6 +49,7 @@ public class UrlInterceptor implements HandlerInterceptor {
 
 
         
         
         if ("XYZ".equals(request.getParameter("debug"))) { // 为了测试留的免登陆
         if ("XYZ".equals(request.getParameter("debug"))) { // 为了测试留的免登陆
+            log.info("find XYZ url is {}.",url);
         	return true;
         	return true;
         }
         }
         
         

@@ -25,7 +25,7 @@ import java.util.Map;
 public class LoginController {
 public class LoginController {
     private static final Logger logger = LoggerFactory.getLogger("erpService");
     private static final Logger logger = LoggerFactory.getLogger("erpService");
     
     
-    private static final int SESSION_TIMEOUT_SECONDS = 4 * 60 * 60;
+    private static final int SESSION_TIMEOUT_SECONDS = 3 * 60 * 60;
 
 
     @Resource
     @Resource
     private LoginService loginService;
     private LoginService loginService;

@@ -103,7 +103,7 @@
   </update>
   </update>
 
 
   <select id="selectByTime" resultMap="BaseResultMap">
   <select id="selectByTime" resultMap="BaseResultMap">
-    select id, order_code, start_time, end_time, camera_code from qiniu_live_record
+    select id, order_code, start_time, end_time, camera_code, create_time from qiniu_live_record
     where create_time &gt;= #{startTime, jdbcType=INTEGER} and create_time &lt; #{endTime, jdbcType=INTEGER} and show_flag = 1
     where create_time &gt;= #{startTime, jdbcType=INTEGER} and create_time &lt; #{endTime, jdbcType=INTEGER} and show_flag = 1
   </select>
   </select>
 </mapper>
 </mapper>

@@ -428,12 +428,16 @@ public class BuyerOrderController {
 	}
 	}
 	
 	
 	@RequestMapping(value = "/getSfWaybillCode")
 	@RequestMapping(value = "/getSfWaybillCode")
-    public ApiResponse getSfWaybillCode(BuyerOrderReq req) {
+    public ApiResponse generateSfWaybillCode(BuyerOrderReq req) {
 		LOGGER.info("getSfWaybillCode in. param is {}", req);
 		LOGGER.info("getSfWaybillCode in. param is {}", req);
 		if(StringUtils.isEmpty(req.getOrderCode()) || null == req.getPayMethod()) {
 		if(StringUtils.isEmpty(req.getOrderCode()) || null == req.getPayMethod()) {
 			return new ApiResponse.ApiResponseBuilder().code(400).data("").message("订单号或付款方式不能为空").build();
 			return new ApiResponse.ApiResponseBuilder().code(400).data("").message("订单号或付款方式不能为空").build();
 		}
 		}
 		JSONObject result = buyerOrderService.getSfWaybillCode(req);
 		JSONObject result = buyerOrderService.getSfWaybillCode(req);
+
+
+		LOGGER.info("getSfWaybillCode out. param is {}, result is {}", req, result);
+
 		if(null == result) {
 		if(null == result) {
 			return new ApiResponse.ApiResponseBuilder().code(500).message("查询失败").data(result).build();
 			return new ApiResponse.ApiResponseBuilder().code(500).message("查询失败").data(result).build();
 		}else if(null != result.getInteger("code") && result.getIntValue("code") != 200) {
 		}else if(null != result.getInteger("code") && result.getIntValue("code") != 200) {

@@ -1796,8 +1796,8 @@ public class BuyerOrderServiceImpl implements IBuyerOrderService {
         Map<String, String> addressMap = subAddress(appraiseAddress);
         Map<String, String> addressMap = subAddress(appraiseAddress);
         
         
         //寄件人信息
         //寄件人信息
-        jsonObj.put("jCompany", "Yoho!Buy有货");
-        jsonObj.put("jContact", "Yoho!Buy有货");
+        jsonObj.put("jCompany", "UFO鉴定中心");
+        jsonObj.put("jContact", "UFO鉴定中心");
         jsonObj.put("jTel", "4008899646");
         jsonObj.put("jTel", "4008899646");
         jsonObj.put("jMobile", "4008899646");
         jsonObj.put("jMobile", "4008899646");
         jsonObj.put("jCountry", "中国");
         jsonObj.put("jCountry", "中国");