|
|
@@ -4,14 +4,8 @@ import com.github.pagehelper.Page;
|
|
|
import com.github.pagehelper.util.StringUtil;
|
|
|
import com.jpsoft.enterprise.config.OSSConfig;
|
|
|
import com.jpsoft.enterprise.modules.base.dto.BillDetailDTO;
|
|
|
-import com.jpsoft.enterprise.modules.base.entity.BillDetailInfo;
|
|
|
-import com.jpsoft.enterprise.modules.base.entity.BillInfo;
|
|
|
-import com.jpsoft.enterprise.modules.base.entity.CompanyInfo;
|
|
|
-import com.jpsoft.enterprise.modules.base.entity.OrderInfo;
|
|
|
-import com.jpsoft.enterprise.modules.base.service.BillDetailInfoService;
|
|
|
-import com.jpsoft.enterprise.modules.base.service.BillInfoService;
|
|
|
-import com.jpsoft.enterprise.modules.base.service.CompanyInfoService;
|
|
|
-import com.jpsoft.enterprise.modules.base.service.OrderInfoService;
|
|
|
+import com.jpsoft.enterprise.modules.base.entity.*;
|
|
|
+import com.jpsoft.enterprise.modules.base.service.*;
|
|
|
import com.jpsoft.enterprise.modules.common.dto.MessageResult;
|
|
|
import com.jpsoft.enterprise.modules.common.dto.Sort;
|
|
|
import com.jpsoft.enterprise.modules.common.utils.OSSUtil;
|
|
|
@@ -55,6 +49,12 @@ public class BillDetailController {
|
|
|
@Autowired
|
|
|
private OrderInfoService orderInfoService;
|
|
|
|
|
|
+ @Autowired
|
|
|
+ private PersonInfoService personInfoService;
|
|
|
+
|
|
|
+ @Autowired
|
|
|
+ private MessageReceiverService messageReceiverService;
|
|
|
+
|
|
|
@Autowired
|
|
|
private OSSConfig ossConfig;
|
|
|
|
|
|
@@ -279,10 +279,26 @@ public class BillDetailController {
|
|
|
for (BillDetailInfo billDetailInfo:list) {
|
|
|
billDetailInfo.setRushStatus("1");
|
|
|
billDetailInfo.setUpdateBy(subject);
|
|
|
- billDetailInfo.setUpdateTime(new Date());
|
|
|
+ Date now = new Date();
|
|
|
+ billDetailInfo.setUpdateTime(now);
|
|
|
|
|
|
affectCount += billDetailInfoService.update(billDetailInfo);
|
|
|
|
|
|
+ //推送站内消息
|
|
|
+ List<PersonInfo> personInfoList = personInfoService.findByCompanyId(billDetailInfo.getCompanyId());
|
|
|
+
|
|
|
+ for (PersonInfo personInfo:personInfoList) {
|
|
|
+ MessageReceiver messageReceiver = new MessageReceiver();
|
|
|
+ messageReceiver.setId(UUID.randomUUID().toString());
|
|
|
+ messageReceiver.setReadStatus(false);
|
|
|
+ messageReceiver.setDelFlag(false);
|
|
|
+ messageReceiver.setMessageId("2");//账单推送消息
|
|
|
+ messageReceiver.setPersonId(personInfo.getId());
|
|
|
+ messageReceiver.setCreateBy(subject);
|
|
|
+ messageReceiver.setCreateTime(now);
|
|
|
+
|
|
|
+ messageReceiverService.insert(messageReceiver);
|
|
|
+ }
|
|
|
}
|
|
|
|
|
|
if (affectCount > 0) {
|