合并

CODE/foreign-service/src/main/java/com/community/huiju/controller/FSController.java

@@ -67,57 +67,72 @@ public class FSController extends BaseController {
     @RequestMapping(value = "/car/apiThirdPartyMonthCardPay", method = RequestMethod.POST)
     @ApiOperation(value = "月卡续费", notes = "月卡续费")
     @ApiImplicitParams({
-            @ApiImplicitParam(dataTypeClass = String.class, paramType = "body", name = "parameter", value = "Phone手机号;RenewDayType续费日期类型( 3:年 2:月 1:日, 选入对应的数字);" +
-                    "RenewDay续费日期数目;" +
-                    "PayStyle交易方式(中文描述)，例如：微信、 支付宝、 银联;" +
-                    "CarNo车牌号;" +
-                    "CardNo停车卡号;" +
-                    "RechargeAmt充值续费金额;"),
+//            @ApiImplicitParam(dataTypeClass = String.class, paramType = "body", name = "parameter", value = "Phone手机号;RenewDayType续费日期类型( 3:年 2:月 1:日, 选入对应的数字);" +
+//                    "RenewDay续费日期数目;" +
+//                    "PayStyle交易方式(中文描述)，例如：微信、 支付宝、 银联;" +
+//                    "CarNo车牌号;" +
+//                    "CardNo停车卡号;" +
+//                    "RechargeAmt充值续费金额;"),
             @ApiImplicitParam(dataTypeClass = String.class, paramType = "form", name = "appid", value = "appid"),
             @ApiImplicitParam(dataTypeClass = String.class, paramType = "form", name = "datetime", value = "时间戳"),
             @ApiImplicitParam(dataTypeClass = String.class, paramType = "form", name = "encrypt", value = "加密方式"),
             @ApiImplicitParam(dataTypeClass = String.class, paramType = "form", name = "sign", value = "签名"),
+            @ApiImplicitParam(dataTypeClass = String.class, paramType = "form", name = "Phone", value = "手机号"),
+            @ApiImplicitParam(dataTypeClass = String.class, paramType = "form", name = "RenewDayType", value = "续费日期类型( 3:年 2:月 1:日, 选入对应的数字)"),
+            @ApiImplicitParam(dataTypeClass = String.class, paramType = "form", name = "RenewDay", value = "续费日期数目"),
+            @ApiImplicitParam(dataTypeClass = String.class, paramType = "form", name = "PayStyle", value = "交易方式(中文描述)，例如：微信、 支付宝、 银联"),
+            @ApiImplicitParam(dataTypeClass = String.class, paramType = "form", name = "CarNo", value = "车牌号"),
+            @ApiImplicitParam(dataTypeClass = String.class, paramType = "form", name = "CardNo", value = "停车卡号"),
+            @ApiImplicitParam(dataTypeClass = String.class, paramType = "form", name = "RechargeAmt", value = "充值续费金额"),
     })
-    public ResponseBean apiThirdPartyMonthCardPay(@RequestBody String parameter) {
+    public ResponseBean apiThirdPartyMonthCardPay(@RequestParam(value = "Phone") String Phone,
+                                                  @RequestParam(value = "RenewDayType") String RenewDayType,
+                                                  @RequestParam(value = "RenewDay") String RenewDay,
+                                                  @RequestParam(value = "PayStyle") String PayStyle,
+                                                  @RequestParam(value = "CarNo") String CarNo,
+                                                  @RequestParam(value = "CardNo", required = false) String CardNo,
+                                                  @RequestParam(value = "RechargeAmt") String RechargeAmt) {
         ResponseBean responseBean = new ResponseBean();
-        JSONObject jsonObject = JSONObject.parseObject(parameter);
-        responseBean = iFuShiService.apiThirdPartyMonthCardPay(jsonObject.getString("Phone"),
-                jsonObject.getString("RenewDayType"),
-                jsonObject.getString("RenewDay"),
-                jsonObject.getString("PayStyle"),
-                jsonObject.getString("CarNo"),
-                jsonObject.getString("CardNo"),
-                jsonObject.getString("RechargeAmt"));
+        responseBean = iFuShiService.apiThirdPartyMonthCardPay(Phone, RenewDayType,
+                RenewDay, PayStyle, CarNo, CardNo, RechargeAmt);
         return responseBean;
     }
 
     @RequestMapping(value = "/car/apiThirdPartyTemporaryCardPay", method = RequestMethod.POST)
     @ApiOperation(value = "第三方临时卡上发缴费", notes = "第三方临时卡上发缴费")
     @ApiImplicitParams({
-            @ApiImplicitParam(dataTypeClass = String.class, paramType = "body", name = "parameter", value = "Amount应缴金额（单位元）;" +
-                    "ActualAmount实缴金额（单位元）;" +
-                    "DeductionAmount抵扣金额（单位元）;" +
-                    "Reason抵扣原因;" +
-                    "PayStyle交易方式(汉字描述)，例如：微信、支付宝、银联;" +
-                    "CarNo车牌号;" +
-                    "CardNo停车卡号;" +
-                    "CouponList使用的优惠券列表"),
+//            @ApiImplicitParam(dataTypeClass = String.class, paramType = "body", name = "parameter", value = "Amount应缴金额（单位元）;" +
+//                    "ActualAmount实缴金额（单位元）;" +
+//                    "DeductionAmount抵扣金额（单位元）;" +
+//                    "Reason抵扣原因;" +
+//                    "PayStyle交易方式(汉字描述)，例如：微信、支付宝、银联;" +
+//                    "CarNo车牌号;" +
+//                    "CardNo停车卡号;" +
+//                    "CouponList使用的优惠券列表"),
             @ApiImplicitParam(dataTypeClass = String.class, paramType = "form", name = "appid", value = "appid"),
             @ApiImplicitParam(dataTypeClass = String.class, paramType = "form", name = "datetime", value = "时间戳"),
             @ApiImplicitParam(dataTypeClass = String.class, paramType = "form", name = "encrypt", value = "加密方式"),
             @ApiImplicitParam(dataTypeClass = String.class, paramType = "form", name = "sign", value = "签名"),
+            @ApiImplicitParam(dataTypeClass = String.class, paramType = "form", name = "Amount", value = "应缴金额（单位元）"),
+            @ApiImplicitParam(dataTypeClass = String.class, paramType = "form", name = "ActualAmount", value = "实缴金额（单位元）"),
+            @ApiImplicitParam(dataTypeClass = String.class, paramType = "form", name = "DeductionAmount", value = "抵扣金额（单位元）"),
+            @ApiImplicitParam(dataTypeClass = String.class, paramType = "form", name = "Reason", value = "抵扣原因"),
+            @ApiImplicitParam(dataTypeClass = String.class, paramType = "form", name = "PayStyle", value = "交易方式(汉字描述)，例如：微信、支付宝、银联"),
+            @ApiImplicitParam(dataTypeClass = String.class, paramType = "form", name = "CarNo", value = "车牌号"),
+            @ApiImplicitParam(dataTypeClass = String.class, paramType = "form", name = "CardNo", value = "停车卡号"),
+            @ApiImplicitParam(dataTypeClass = String.class, paramType = "form", name = "CouponList", value = "使用的优惠券列表"),
     })
-    public ResponseBean apiThirdPartyTemporaryCardPay(@RequestBody String parameter) {
+    public ResponseBean apiThirdPartyTemporaryCardPay(@RequestParam(value = "Amount") String Amount,
+                                                      @RequestParam(value = "ActualAmount") String ActualAmount,
+                                                      @RequestParam(value = "DeductionAmount") String DeductionAmount,
+                                                      @RequestParam(value = "Reason", required = false) String Reason,
+                                                      @RequestParam(value = "PayStyle") String PayStyle,
+                                                      @RequestParam(value = "CarNo") String CarNo,
+                                                      @RequestParam(value = "CardNo",  required = false) String CardNo,
+                                                      @RequestParam(value = "CouponList", required = false) String CouponList) {
         ResponseBean responseBean = new ResponseBean();
-        JSONObject jsonObject = JSONObject.parseObject(parameter);
-        responseBean = iFuShiService.apiThirdPartyTemporaryCardPay(jsonObject.getString("Amount"),
-                jsonObject.getString("ActualAmount"),
-                jsonObject.getString("DeductionAmount"),
-                jsonObject.getString("Reason"),
-                jsonObject.getString("PayStyle"),
-                jsonObject.getString("CarNo"),
-                jsonObject.getString("CardNo"),
-                jsonObject.getString("CouponList"));
+        responseBean = iFuShiService.apiThirdPartyTemporaryCardPay(Amount, ActualAmount, DeductionAmount,
+                Reason, PayStyle, CarNo, CardNo, CouponList);
         return responseBean;
     }
 

CODE/foreign-service/src/main/java/com/community/huiju/controller/TaUserController.java

@@ -87,7 +87,11 @@ public class TaUserController extends BaseController {
     @RequestMapping(value = "/user", method = RequestMethod.GET)
     @ApiOperation(value = "根据用户手机号查询", notes = "根据用户手机号查询")
     @ApiImplicitParams({
-            @ApiImplicitParam(dataTypeClass = String.class, paramType = "query", name = "phone", value = "手机号")
+            @ApiImplicitParam(dataTypeClass = String.class, paramType = "query", name = "phone", value = "手机号"),
+            @ApiImplicitParam(dataTypeClass = String.class, paramType = "query", name = "appid", value = "appid"),
+            @ApiImplicitParam(dataTypeClass = String.class, paramType = "query", name = "datetime", value = "时间戳"),
+            @ApiImplicitParam(dataTypeClass = String.class, paramType = "query", name = "encrypt", value = "加密方式"),
+            @ApiImplicitParam(dataTypeClass = String.class, paramType = "query", name = "sign", value = "签名"),
     })
     public ResponseBean updateUser(@RequestParam(value = "phone") String phone){
         ResponseBean responseBean = iTaUserService.getTaUserByPhone(phone);

CODE/foreign-service/src/main/java/com/community/huiju/controller/TaUserVerifyController.java

@@ -92,4 +92,22 @@ public class TaUserVerifyController extends BaseController {
         return responseBean;
     }
 
+
+    @RequestMapping(value = "/user/verify/{userVerifyId}", method = RequestMethod.GET)
+    @ApiOperation(value = "根据 用户id 和 房产审核id ", notes = "根据 用户id 和 房产审核id ")
+    @ApiImplicitParams({
+            @ApiImplicitParam(dataTypeClass = Integer.class, paramType = "query", name = "userId", value = "用户Id"),
+            @ApiImplicitParam(dataTypeClass = Integer.class, paramType = "path", name = "userVerifyId", value = "房产审核Id"),
+            @ApiImplicitParam(dataTypeClass = String.class, paramType = "query", name = "appid", value = "appid"),
+            @ApiImplicitParam(dataTypeClass = String.class, paramType = "query", name = "datetime", value = "时间戳"),
+            @ApiImplicitParam(dataTypeClass = String.class, paramType = "query", name = "encrypt", value = "加密方式"),
+            @ApiImplicitParam(dataTypeClass = String.class, paramType = "query", name = "sign", value = "签名"),
+    })
+    public ResponseBean getUserVerifyByByUserIdAndUserVerifyId(@RequestParam(value = "userId") Integer userId,
+                                         @PathVariable(value = "userVerifyId") Integer userVerifyId) {
+        ResponseBean responseBean = new ResponseBean();
+        responseBean = iTaUserVerifyService.getUserVerifyByByUserIdAndUserVerifyId(userId, userVerifyId);
+        return responseBean;
+    }
+
 }

CODE/foreign-service/src/main/java/com/community/huiju/controller/TpEquipmentController.java

@@ -30,9 +30,9 @@ public class TpEquipmentController extends BaseController {
 
     @ApiOperation(value = "获取监控列表数据 HLS",notes = "根据小区ID获取")
     @ApiImplicitParams({
-            @ApiImplicitParam(paramType = "path",dataType = "Integer",name = "communityId",value = "小区ID"),
-            @ApiImplicitParam(paramType = "query",dataType = "Integer",name = "pageNo",value = "第几页"),
-            @ApiImplicitParam(paramType = "query",dataType = "Integer",name = "pageSize",value = "一页多少行"),
+            @ApiImplicitParam(paramType = "path",dataTypeClass = Integer.class, name = "communityId",value = "小区ID"),
+            @ApiImplicitParam(paramType = "query",dataTypeClass = Integer.class,name = "pageNo",value = "第几页"),
+            @ApiImplicitParam(paramType = "query",dataTypeClass = Integer.class,name = "pageSize",value = "一页多少行"),
             @ApiImplicitParam(dataTypeClass = String.class, paramType = "query", name = "appid", value = "appid"),
             @ApiImplicitParam(dataTypeClass = String.class, paramType = "query", name = "datetime", value = "时间戳"),
             @ApiImplicitParam(dataTypeClass = String.class, paramType = "query", name = "encrypt", value = "加密方式"),

CODE/foreign-service/src/main/java/com/community/huiju/service/ITaUserVerifyService.java

@@ -43,4 +43,13 @@ public interface ITaUserVerifyService extends IService<TaUserVerify> {
      */
     ResponseBean getUserVerifyByUserIdAndCommunityId(Integer userId, Integer communityId);
 
+
+    /**
+     * 查询 房产信息， 根据 用户id 和 房产审核id
+     * @param userId
+     * @param userVerifyId
+     * @return
+     */
+    ResponseBean getUserVerifyByByUserIdAndUserVerifyId(Integer userId, Integer userVerifyId);
+
 }

CODE/foreign-service/src/main/java/com/community/huiju/service/impl/TaUserVerifyServiceImpl.java

@@ -250,4 +250,18 @@ public class TaUserVerifyServiceImpl extends ServiceImpl<TaUserVerifyMapper, TaU
         responseBean.addSuccess(list);
         return responseBean;
     }
+
+
+    @Override
+    public ResponseBean getUserVerifyByByUserIdAndUserVerifyId(Integer userId, Integer userVerifyId) {
+        ResponseBean responseBean = new ResponseBean();
+        TaUserVerify hasUserVerify = taUserVerifyMapper.selectByUserIdAndUserVerifyId(userId, userVerifyId);
+        if (null == hasUserVerify) {
+            responseBean.addError(ResponseErrorsMessages.NOT_USER_VERIFY.getCode(), ResponseErrorsMessages.NOT_USER_VERIFY.getMsg());
+            return responseBean;
+        }
+
+        responseBean.addSuccess(hasUserVerify);
+        return responseBean;
+    }
 }

CODE/smart-community/app-api/src/main/java/com/community/huiju/dao/TpBillOrderMapper.java

@@ -43,7 +43,7 @@ public interface TpBillOrderMapper {
      */
     @ResultMap("BaseResultMap")
     @Select("SELECT tbo.* FROM tp_bill_order tbo LEFT JOIN tp_bill_invoice tbi on tbo.tp_bill_invoice_id = tbi.id " +
-            "WHERE tbi.room_no_id = #{roomNoId} and tbo.order_status = 1 GROUP BY tbo.order_bumber")
+            "WHERE tbi.room_no_id = #{roomNoId} and tbo.order_status = 1 GROUP BY tbo.order_bumber ORDER BY tbo.create_date DESC")
     List<TpBillOrder> selectByRoomNoId(@Param("roomNoId") Integer roomNoId);
 
     /**

CODE/smart-community/app-api/src/main/java/com/community/huiju/service/impl/MonitoringServiceImpl.java

@@ -17,6 +17,7 @@ import com.github.pagehelper.Page;
 import com.github.pagehelper.PageHelper;
 import com.google.common.collect.Maps;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -202,6 +203,11 @@ public class MonitoringServiceImpl implements IMonitoringService {
          */
 
         List<TpEquipment> tpEquipments = tpEquipmentMapper.selectByCommunityIdAndUnitId(userElement.getCommunityId(), userElement.getUnitId(), 5);
+        if (CollectionUtils.isEmpty(tpEquipments)) {
+            String address = toCommunities.getCommunityName() + tpUnit.getPhaseName() + tpUnit.getBuildingName() + tpUnit.getName();
+            responseBean.addError("系统未配置单元门口机设备!", address, null);
+            return responseBean;
+        }
         TpEquipment tpEquipment = tpEquipments.get(0);
         TpConfiguration tpConfiguration = tpConfigurationMapper.selectByPrimaryKey(tpEquipment.getUuidId());
 

CODE/smart-community/property-api/src/main/java/com/community/huiju/service/impl/TpShopSettingServiceImpl.java

@@ -58,6 +58,7 @@ public class TpShopSettingServiceImpl extends ServiceImpl<TpShopSettingMapper, T
 			//查看是否存在系统创建的四条数据
 			QueryWrapper<TpShopType> queryWrapper = new QueryWrapper<>();
 			queryWrapper.eq("community_id",userElement.getCommunityId());
+			queryWrapper.eq("source","sys");
 			List<TpShopType> list = shopTypeMapper.selectList(queryWrapper);
 			if (list.size() < 1){
 				//插入数据

VUECODE/smart-property-manage/src/router/index.js

@@ -487,7 +487,7 @@ export const constantRouterMap = [
         path: '/grogshop/grogshopRoom',
         component: () => import('@/views/grogshop/grogshopRoom'),
         name: 'grogshop-grogshopRoom',
-        meta: { title: '房屋列表', icon: 'table' }
+        meta: { title: '房型列表', icon: 'table' }
       },
       {
         path: '/grogshop/grogshopRoomAdd',

VUECODE/smart-property-manage/src/views/grogshop/configindex.vue

@@ -48,6 +48,7 @@
       <el-form-item label="酒店地址" prop="hotelAddress">
         <el-input v-model="listData.hotelAddress"/>
       </el-form-item>
+<<<<<<< HEAD
       <el-form-item label="地图定位">
         <span  style="font-size:0.7vw;color:#C0C0C0">在地图上搜索选择酒店位置确定坐标值，供APP端用户导航</span>
         <div>
@@ -55,6 +56,12 @@
         <el-input placeholder="经度" v-model="listData.hotelLongitude" style="width: 150px;" />
         <el-input placeholder="纬度" v-model="listData.hotelLatitude" style="width: 150px;" />
         </div>
+=======
+      <el-form-item label="高德坐标" prop="hotelLatitude">
+        <el-input placeholder="经度" v-model="listData.hotelLongitude" style="width: 150px;" />
+        <el-input placeholder="纬度" v-model="listData.hotelLatitude" style="width: 150px;" />
+        <span  style="color:#C0C0C0">在地图上搜索选择酒店位置确定坐标值，供APP端用户导航</span>
+>>>>>>> e8f4a282c9948bc18a2bac11b9a4ab6b8d9e8c70
       </el-form-item>
       <el-form-item label="">
          <!-- 地图 -->
@@ -65,7 +72,7 @@
           </el-amap>
         </div>
       </el-form-item>
-      <el-form-item label="房间介绍" prop="hotelIntroduction">
+      <el-form-item label="酒店介绍" prop="hotelIntroduction">
           <!-- <el-input v-model="addForm.bannerContent" placeholder="内容详情"/> -->
           <div id="father">
             <wangeditor :content="listData.hotelIntroduction" @wangeditorEvent="wangeditorValue"/>
@@ -133,8 +140,11 @@ export default {
         hotelName: [
           { required: true, message: '酒店名称', trigger: 'blur' }
         ],
+        hotelLatitude: [
+          { required: true, message: '请输入坐标', trigger: 'blur' }
+        ],
         hotelIntroduction: [
-          { required: true, message: '房间介绍不能为空', trigger: 'change' }
+          { required: true, message: '酒店介绍不能为空', trigger: 'change' }
         ],
       }
     }

VUECODE/smart-property-manage/src/views/grogshop/grogshopRoomAdd.vue

@@ -7,11 +7,11 @@
        <!-- <el-form-item label="房型号" prop="roomNo">
         <el-input v-model="ruleForm.roomNo" placeholder="房型号"/>
       </el-form-item> -->
-     <el-form-item class="filter-item" label="房型描述" prop="remark" >
-        <el-input v-model.trim="ruleForm.remark" placeholder="房型描述"/>
+     <el-form-item class="filter-item" label="房间短描述" prop="remark" >
+        <el-input v-model.trim="ruleForm.remark" placeholder="房间推荐语等"/>
       </el-form-item>
       <el-form-item label="房型价格" prop="price">
-        <el-input v-model="ruleForm.price" placeholder="房型价格" onkeyup="this.value=this.value.replace(/\D/g,'')"/>
+        <el-input v-model="ruleForm.price" placeholder="单位元" onkeyup="this.value=this.value.replace(/\D/g,'')"/>
       </el-form-item>
       <el-form-item class="filter-item"  label="上架状态" prop="roomStatus">
         <el-select v-model="ruleForm.roomStatus" placeholder="上架">
@@ -20,7 +20,7 @@
         </el-select>
       </el-form-item>
       <el-form-item label="权重" prop="sort">
-        <el-input v-model="ruleForm.sort" placeholder="请输入权重数值" onkeyup="this.value=this.value.replace(/\D/g,'')"/>
+        <el-input v-model="ruleForm.sort" placeholder="不小于0的整数" onkeyup="this.value=this.value.replace(/\D/g,'')"/>
       </el-form-item>  
       <el-form-item>
         <el-button type="primary" @click="submitForm()">保存</el-button>

VUECODE/smart-property-manage/src/views/grogshop/grogshopRoomEdit.vue

@@ -7,11 +7,11 @@
       <!-- <el-form-item label="房型号" >
         <el-input v-model="ruleForm.roomNo" placeholder="房型号"/>
       </el-form-item> -->
-     <el-form-item class="filter-item" label="房型描述" prop="remark" >
-        <el-input v-model.trim="ruleForm.remark" placeholder="房型描述"/>
+     <el-form-item class="filter-item" label="房间短描述" prop="remark" >
+        <el-input v-model.trim="ruleForm.remark" placeholder="房间推荐语等"/>
       </el-form-item>
       <el-form-item label="房型价格">
-        <el-input v-model="ruleForm.price" placeholder="房型价格"/>
+        <el-input v-model="ruleForm.price" placeholder="单位元"/>
       </el-form-item>
       <el-form-item class="filter-item"  label="上架状态">
         <el-select v-model="ruleForm.roomStatus" placeholder="上架">
@@ -20,7 +20,7 @@
         </el-select>
       </el-form-item>
       <el-form-item label="权重" prop="sort">
-        <el-input v-model="ruleForm.sort" placeholder="权重"/>
+        <el-input v-model="ruleForm.sort" placeholder="不小于0的整数"/>
       </el-form-item>  
       <el-form-item>
         <el-button type="primary" @click="submitForm()">保存</el-button>

VUECODE/smart-property-manage/src/views/shop/shopSetting.vue

@@ -112,7 +112,7 @@ export default {
     },
     changeSetting() {
       this.ChangeShopSetting(this.shopSettingValue).then((res) => {
-        search()
+        this.search()
       }).catch(() => {
         console.log('error shopTypeList')
       })