|
|
@@ -95,8 +95,43 @@ public class BssAskServiceImpl implements IBssAskService {
|
|
|
* @param historyId お問い合わせ履歴プライマリ・キー
|
|
|
* @return お問い合わせ
|
|
|
*/
|
|
|
+ @SneakyThrows
|
|
|
public BssAskVo selectByHistoryId(String historyId){
|
|
|
- return null;
|
|
|
+
|
|
|
+ BssAskHistoryVo askHistoryVo = bssAskHistoryMapper.selectById(historyId);
|
|
|
+ if (askHistoryVo == null) {
|
|
|
+ throw new ServiceException(MessageUtils.message("E0007"));
|
|
|
+ }
|
|
|
+
|
|
|
+ // 問合せ情報を検索
|
|
|
+ BssAskVo bssAskVo = bssAskMapper.selectById(askHistoryVo.getAskId());
|
|
|
+ if (bssAskVo == null) {
|
|
|
+ throw new ServiceException(MessageUtils.message("E0007"));
|
|
|
+ }
|
|
|
+ if (ValueUtils.isNotEmpty(bssAskVo.getPhoneNumber())) {
|
|
|
+ String phoneNumber = DecryptUtils.decryptAES(bssAskVo.getPhoneNumber());
|
|
|
+ bssAskVo.setPhoneNumber(phoneNumber);
|
|
|
+ }
|
|
|
+
|
|
|
+ bssAskVo.setCategory1(askHistoryVo.getCategory1());
|
|
|
+ bssAskVo.setCategory2(askHistoryVo.getCategory2());
|
|
|
+ bssAskVo.setAskAnswerRemark(askHistoryVo.getAskAnswerRemark());
|
|
|
+ bssAskVo.setStatus(askHistoryVo.getStatus());
|
|
|
+
|
|
|
+ // 農家情報
|
|
|
+ if (ValueUtils.isNotEmpty(bssAskVo.getFarmerId())) {
|
|
|
+ bssAskVo.setMastFarmerVo(mastFarmerService.selectMastFarmerByFarmId(bssAskVo.getFarmerId()));
|
|
|
+ }
|
|
|
+
|
|
|
+ // 注文情報
|
|
|
+ if (ValueUtils.isNotEmpty(bssAskVo.getOrderId())) {
|
|
|
+ BssOrderDetailVo detailVo = orderService.selectOrderByOrderId(bssAskVo.getOrderId());
|
|
|
+ String statusLabel = DictUtils.getDictLabel(CrmConstants.DICT_TYPE_ORDER_STATUS, bssAskVo.getStatus());
|
|
|
+ detailVo.setStatusLabel(statusLabel);
|
|
|
+ bssAskVo.setOrderDetailVo(detailVo);
|
|
|
+ }
|
|
|
+
|
|
|
+ return bssAskVo;
|
|
|
}
|
|
|
|
|
|
/**
|
|
|
@@ -292,8 +327,6 @@ public class BssAskServiceImpl implements IBssAskService {
|
|
|
bssAskHistory.setCategory2(category2);
|
|
|
}
|
|
|
|
|
|
-
|
|
|
-
|
|
|
return bssAskHistoryMapper.insert(bssAskHistory);
|
|
|
}
|
|
|
|