Merge branch 'master' of http://git.ycjcjy.com/xiangsong/xs-service

src/main/java/com/huiju/estateagents/property/controller/AnnouncementTelController.java

@@ -1,6 +1,7 @@
 package com.huiju.estateagents.property.controller;
 
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.huiju.estateagents.base.BaseController;
 import com.huiju.estateagents.base.ResponseBean;
@@ -171,7 +172,9 @@ public class AnnouncementTelController extends BaseController {
 
 	 @ApiOperation(value = "获取物业号码", notes = "获取物业号码")
 	@RequestMapping(value = "/wx/tels",method = RequestMethod.GET)
-	public ResponseBean getWxTelList(HttpServletRequest request){
-		return ResponseBean.success(announcementTelService.list());
+	public ResponseBean getWxTelList(@RequestParam(value = "type") String type ,HttpServletRequest request){
+		LambdaQueryWrapper<AnnouncementTel> queryWrapper = new LambdaQueryWrapper<>();
+		 queryWrapper.eq(AnnouncementTel::getType,type);
+		return ResponseBean.success(announcementTelService.list(queryWrapper));
 	}
 }

src/main/java/com/huiju/estateagents/property/model/AnnouncementTel.java

@@ -47,6 +47,11 @@ public class AnnouncementTel implements Serializable {
 
     private String remark;
 
+    /**
+     * 物业类型
+     */
+    private String type;
+
     /**
      * 创建人
      */

src/main/java/com/huiju/estateagents/property/service/impl/BuildingOwnerInfoServiceImpl.java

@@ -451,7 +451,7 @@ public class BuildingOwnerInfoServiceImpl extends ServiceImpl<TpBuildingOwnerInf
         list.forEach(e -> {
             e.setOrgId(userElement.getOrgId());
             e.setVerifyStatus("0");
-            e.setPairStatus("o");
+            e.setPairStatus("0");
             e.setCreateUser(userElement.getUserId());
             e.setCreateDate(LocalDateTime.now());
         });

src/main/java/com/huiju/estateagents/property/service/impl/WxPayServiceImpl.java

@@ -248,6 +248,7 @@ public class WxPayServiceImpl implements WxPayServiceI {
 			tpBillInvoice.setUpdateDate(new Date());
 			// 缴费方式  0：微信支付  1：线下缴费 2.支付宝支付
 			tpBillInvoice.setPayType(resultMap.get("pay_type"));
+			tpBillInvoice.setOutTradeNo(outTradeNo);
 			tpBillInvoiceMapper.updateById(tpBillInvoice);
 			// 同时加积分
 			applicationContext.publishEvent(new EventBus(billOrder, EventBus.EventType.payment,1));

src/main/resources/mapper/property/TpTicketMapper.xml

@@ -65,7 +65,7 @@
         p.update_date,
         p.price,
         p.bill_invoice_id,
-        p.worer_id,
+        p.worker_id,
         p.worker_name
         FROM
         tp_ticket p