Merge branch 'base-modify' of http://10.5.52.3/youjj/cloud-platform into base-modify

ace-modules/ace-admin-api/src/main/java/com/github/wxiaoqi/security/admin/feign/dto/AppUserDTO.java

@@ -20,6 +20,7 @@ public class AppUserDTO {
 	private String birthday;
 	private String personSign;
 	private String remark;
+	private Integer imUserid;
 	private String wxOpenid;
 	private String unionid;
 	private String openid;

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/rest/OrderTourVerificationController.java

@@ -49,7 +49,7 @@ public class OrderTourVerificationController extends CommonBaseController {
     ){
         return ObjectRestResponse.succ(verificationBiz.getVerificationList(page,limit,verificationId));
     }
-    @RequestMapping(value = "/verification/check",method = RequestMethod.POST)
+    @RequestMapping(value = "/verification/check",method = RequestMethod.GET)
     @ApiOperation(value = "旅游核销")
     public ObjectRestResponse<BaseOrder> check(
             @RequestParam(value = "no",defaultValue = "") String no
@@ -66,7 +66,7 @@ public class OrderTourVerificationController extends CommonBaseController {
         return verificationBiz.VerificationByOrder(no,list,userDTO);
     }
 
-    @RequestMapping(value = "/verification/finish",method = RequestMethod.POST)
+    @RequestMapping(value = "/verification/finish",method = RequestMethod.GET)
     @ApiOperation(value = "确定发车")
     public ObjectRestResponse<BaseOrder> finishOrder(
             @RequestParam(value = "verificationId",defaultValue = "0") Integer verificationId

xx-tour/xx-tour-server/src/main/java/com/xxfc/platform/tour/biz/TourGoodVerificationBiz.java

@@ -72,7 +72,7 @@ public class TourGoodVerificationBiz extends BaseBiz<TourGoodVerificationMapper,
      * @return
      */
     public int updateTourGoodVerificationStatus(Integer verficationId){
-        return mapper.updateStatusByGoodIdAndSpeIdAndSiteId(verficationId,0);
+        return mapper.updateStatusByGoodIdAndSpeIdAndSiteId(verficationId,1);
     }
 
     /**

xx-tour/xx-tour-server/src/main/java/com/xxfc/platform/tour/mapper/TourGoodVerificationMapper.java

@@ -46,7 +46,7 @@ public interface TourGoodVerificationMapper extends Mapper<TourGoodVerification>
      * @param verficationId
      * @return
      */
-    @Update("update tour_good_verification set `status`=#{status} where where `id`=#{verficationId}")
+    @Update("update tour_good_verification set `status`=#{status}  where `id`=#{verficationId}")
     int updateStatusByGoodIdAndSpeIdAndSiteId(@Param("verficationId") Integer verficationId,@Param("status") Integer status);
 
     /**