合并

CODE/smart-community/app-api/src/main/java/com/community/huiju/controller/MessageController.java

@@ -111,4 +111,18 @@ public class MessageController extends BaseController {
 		messageService.updateMessageReadStatus(communityId, userId);
 		return responseBean;
 	}
+
+
+	@ApiOperation(value = "根据消息id进行已读", notes = "根据消息id进行已读")
+	@ApiImplicitParams({ @ApiImplicitParam(paramType = "path", dataType = "String", name = "messageId", value = "消息id"),
+			@ApiImplicitParam(paramType = "header",dataType = "String",name = "X-Auth-Token",value = "Token")})
+	@RequestMapping(value = "/messageIdreadStatus/{messageId}",method = RequestMethod.PUT)
+	public ResponseBean updateMessageByIdReadStatus(HttpSession session, @PathVariable("messageId") Integer messageId) {
+		ResponseBean responseBean = new ResponseBean();
+		UserElement userElement = (UserElement) session.getAttribute(Constant.APP_USER_SESSION);
+		responseBean = messageService.updateMessageByIdReadStatus(userElement, messageId);
+		return responseBean;
+	}
+
+
 }

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

@@ -53,4 +53,11 @@ public interface TpMessageMapper {
      * @return
      */
     TpMessage selectConditionsTpMessage(Map<String, Object> map);
+
+    /**
+     * 根据条件查询 消息代办
+     * @param map
+     * @return
+     */
+    TpMessage selectBillinvoiceMessage(@Param("map") Map<String, Object> map);
 }

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

@@ -1,5 +1,8 @@
 package com.community.huiju.service;
 
+import com.community.commom.mode.ResponseBean;
+import com.community.commom.session.UserElement;
+
 import java.util.Map;
 
 public interface MessageServiceI {
@@ -24,4 +27,12 @@ public interface MessageServiceI {
 	 * 全部已读
 	 */
 	void updateMessageReadStatus(Integer communityId, Integer userId);
+
+	/**
+	 * 根据消息的id, 进行已读操作
+	 * @param userElement
+	 * @param messageId
+	 * @return
+	 */
+	ResponseBean updateMessageByIdReadStatus(UserElement userElement, Integer messageId);
 }

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

@@ -1,6 +1,8 @@
 package com.community.huiju.service.impl;
 
 import com.community.commom.constant.Constant;
+import com.community.commom.mode.ResponseBean;
+import com.community.commom.session.UserElement;
 import com.community.huiju.dao.TpBillInvoiceMapper;
 import com.community.huiju.dao.TpBillMapper;
 import com.community.huiju.dao.TpMessageMapper;
@@ -13,6 +15,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.util.StringUtils;
 
+import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -112,4 +115,25 @@ public class MessageServiceImpl implements MessageServiceI {
 	public void updateMessageReadStatus(Integer communityId, Integer userId) {
 		tpMessageMapper.updateReadStatus(communityId, userId);
 	}
+
+	@Override
+	public ResponseBean updateMessageByIdReadStatus(UserElement userElement, Integer messageId) {
+		ResponseBean responseBean = new ResponseBean();
+
+		TpMessage tpMessage = tpMessageMapper.selectByPrimaryKey(messageId);
+		if (null == tpMessage) {
+			responseBean.addError("消息不存在!");
+			return responseBean;
+		}
+		tpMessage.setReadStatus("1");
+		tpMessage.setUpdateDate(new Date());
+		tpMessage.setUpdateUser(userElement.getId());
+		int row = tpMessageMapper.updateByPrimaryKeySelective(tpMessage);
+		if (row > 0) {
+			responseBean.addSuccess("操作成功!");
+			return responseBean;
+		}
+		responseBean.addError("操作失败!");
+		return responseBean;
+	}
 }

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

@@ -8,6 +8,7 @@ import com.community.huiju.common.wxpay.WXPayUtil;
 import com.community.huiju.dao.*;
 import com.community.huiju.model.*;
 import com.community.huiju.service.WxPayServiceI;
+import com.google.common.collect.Maps;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -43,6 +44,9 @@ public class WxPayServiceImpl implements WxPayServiceI {
 	@Autowired
 	private TaSysRoleMapper taSysRoleMapper;
 
+	@Autowired
+	private TpMessageMapper tpMessageMapper;
+
 	/**
 	 * 微信支付统一下单
 	 *
@@ -165,6 +169,16 @@ public class WxPayServiceImpl implements WxPayServiceI {
 		}
 		tpBillMapper.updateByPrimaryKeySelective(tpBill);
 
+
+		// 把相对应的APP端, 代办消息设置为无效
+		Map<String, Object> map = Maps.newHashMap();
+		map.put("communityId", tpBillInvoice.getCommunityId());
+		map.put("billInvoiceId", tpBillInvoice.getId());
+		map.put("userId", tpBillInvoice.getTaUserId());
+		TpMessage tpMessage = tpMessageMapper.selectBillinvoiceMessage(map);
+		tpMessage.setStatus("0");
+		tpMessageMapper.updateByPrimaryKeySelective(tpMessage);
+
 		return "success";
 	}
 	

CODE/smart-community/app-api/src/main/resources/mapper/TpBillInvoiceMapper.xml

@@ -265,7 +265,8 @@
         s.pay_name AS payName,
         s.pay_remark AS payRemark,
         s.pay_type AS payType,
-        s.create_time AS createTime
+        s.create_time AS createTime,
+        i.out_trade_no AS outTradeNo
     FROM
         tp_bill_invoice i
         LEFT JOIN tp_bill b ON b.id = i.bill_id

CODE/smart-community/app-api/src/main/resources/mapper/TpMessageMapper.xml

@@ -433,4 +433,18 @@
       </if>
     </trim>
   </select>
+
+  <select id="selectBillinvoiceMessage" resultMap="BaseResultMap" parameterType="map">
+    select
+    <include refid="Base_Column_List" />
+    from tp_message
+    where
+    community_id = #{map.communityId}
+    and bill_id = #{map.billInvoiceId}
+    and uuid_type = 1
+    and uuid = #{map.userId}
+    and message_type = 7
+    and advice_type = 1
+    and source = 2
+  </select>
 </mapper>

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

@@ -201,6 +201,20 @@ public class BillInvoiceServiceImpl extends ServiceImpl<BillInvoiceMapper, BillI
                 }
                 billMapper.updateById(bill);
 
+                // 把相对应的 APP端用户的代办消息进行设置为无效
+                QueryWrapper<Message> messageQueryWrapper = new QueryWrapper<>();
+                messageQueryWrapper.eq("community_id", userElement.getCommunityId());
+                messageQueryWrapper.eq("bill_id", billInvoice.getId());
+                messageQueryWrapper.eq("uuid_type", "1");
+                messageQueryWrapper.eq("uuid", billInvoice.getTaUserId());
+                messageQueryWrapper.eq("message_type", "7");
+                messageQueryWrapper.eq("advice_type", "1");
+                messageQueryWrapper.eq("source", "2");
+
+                Message one = iMessageService.getOne(messageQueryWrapper);
+                one.setStatus("0");
+                iMessageService.updateById(one);
+
             }
         });