Browse Source

消息setRead方法处理

hejq 7 years ago
parent
commit
2537dff740

+ 18 - 3
src/main/java/com/uas/platform/b2b/controller/SaleOrderController.java

@@ -4,7 +4,17 @@ import com.alibaba.dubbo.common.utils.CollectionUtils;
 import com.alibaba.fastjson.JSONObject;
 import com.uas.platform.b2b.dao.PurchaseOrderAllDao;
 import com.uas.platform.b2b.dao.PurchaseOrderWaitingDao;
-import com.uas.platform.b2b.model.*;
+import com.uas.platform.b2b.model.OrderType;
+import com.uas.platform.b2b.model.PurchaseOrder;
+import com.uas.platform.b2b.model.PurchaseOrderAll;
+import com.uas.platform.b2b.model.PurchaseOrderDone;
+import com.uas.platform.b2b.model.PurchaseOrderEnd;
+import com.uas.platform.b2b.model.PurchaseOrderItem;
+import com.uas.platform.b2b.model.PurchaseOrderReceived;
+import com.uas.platform.b2b.model.PurchaseOrderReply;
+import com.uas.platform.b2b.model.PurchaseOrderTodo;
+import com.uas.platform.b2b.model.PurchaseOrderWaiting;
+import com.uas.platform.b2b.model.SearchFilter;
 import com.uas.platform.b2b.search.SearchService;
 import com.uas.platform.b2b.service.PurchaseOrderService;
 import com.uas.platform.b2b.service.UserService;
@@ -32,7 +42,12 @@ import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.ModelMap;
 import org.springframework.util.StringUtils;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.ResponseStatus;
 import org.springframework.web.servlet.ModelAndView;
 
 import java.text.SimpleDateFormat;
@@ -1278,7 +1293,7 @@ public class SaleOrderController {
 	@ResponseBody
 	public ModelMap setReadByOrder(@RequestBody Long... sourceId) {
 		ModelMap modelMap = new ModelMap();
-			purchaseOrderService.setReadByOrder("sale", sourceId);
+        purchaseOrderService.setReadByOrder("sale", sourceId);
 		return modelMap;
 	}
 

+ 2 - 1
src/main/java/com/uas/platform/b2b/dao/UserOrderDao.java

@@ -9,6 +9,7 @@ import org.springframework.data.repository.query.Param;
 import org.springframework.stereotype.Repository;
 
 import javax.transaction.Transactional;
+import java.sql.SQLException;
 import java.util.List;
 
 /**
@@ -38,7 +39,7 @@ public interface UserOrderDao extends JpaSpecificationExecutor<UserOrders>, JpaR
      * @param sourceIds 需要设置已读的id
      */
     @Modifying
-    @Transactional
+    @Transactional(rollbackOn = SQLException.class)
     @Query("update UserOrders o set o.readStatus=:status where o.userUU=:userUU and o.enUU=:enUU and o.table=:table and o.category=:category and o.sourceId in :sourceIds")
     void setReadStatus(@Param("enUU") Long enUU, @Param("userUU") Long userUU, @Param("table") String table, @Param("category") String category, @Param("status") Short status, @Param("sourceIds") Long... sourceIds);