diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/uniBss/UniBssUtil.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/uniBss/UniBssUtil.java index 1283a1e..efee767 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/uniBss/UniBssUtil.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/uniBss/UniBssUtil.java @@ -2,10 +2,12 @@ package com.chinaunicom.mall.ebtp.extend.uniBss; import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.JSONArray; import com.chinaunicom.mall.ebtp.common.uniBss.entity.UniBss; import com.chinaunicom.mall.ebtp.common.uniBss.entity.UniBssAttached; import com.chinaunicom.mall.ebtp.common.uniBss.entity.UniBssHead; import com.chinaunicom.mall.ebtp.common.uniBss.service.UniBssServiceImpl; +import com.chinaunicom.mall.ebtp.extend.wps.vo.UniBssMap; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; @@ -71,7 +73,13 @@ public class UniBssUtil { * @return UniBss 对象 */ public String getUniBssJson(Map map){ - return JSON.toJSONString(this.getUniBss(map)); + UniBss uniBss = this.getUniBss(map); + UniBssMap uniBssMap = new UniBssMap(); + uniBssMap.setUniBssHead(uniBss.getUniBssHead()); + uniBssMap.setUniBssAttached(uniBss.getUniBssAttached()); + uniBssMap.setUniBssBodyMap(uniBss.getUniBssBodyMap()==null||uniBss.getUniBssBodyMap().isEmpty()? + JSONArray.parseObject(JSONArray.toJSONString(uniBss.getUniBssBody()), Map.class):uniBss.getUniBssBodyMap()); + return JSON.toJSONString(uniBssMap); } public UniBss getUniBss(Map reqMap){