| @@ -21,6 +21,7 @@ import com.iformall.service.*; | |||||
| import com.iformall.utils.Constant; | import com.iformall.utils.Constant; | ||||
| import com.iformall.utils.MaUtil; | import com.iformall.utils.MaUtil; | ||||
| import me.chanjar.weixin.common.error.WxErrorException; | import me.chanjar.weixin.common.error.WxErrorException; | ||||
| import me.chanjar.weixin.common.util.json.GsonHelper; | |||||
| import org.apache.commons.lang3.StringUtils; | import org.apache.commons.lang3.StringUtils; | ||||
| import org.slf4j.Logger; | import org.slf4j.Logger; | ||||
| import org.slf4j.LoggerFactory; | import org.slf4j.LoggerFactory; | ||||
| @@ -657,8 +658,6 @@ public class TtMerchantPoiServiceImpl implements TtMerchantPoiService { | |||||
| productObjuct.add("notification",notificationArray); | productObjuct.add("notification",notificationArray); | ||||
| if(EnumCouponContentType.HTML.getCode().equals(coupon.getContentType())){ | if(EnumCouponContentType.HTML.getCode().equals(coupon.getContentType())){ | ||||
| productObjuct.addProperty("notification_rich_text",coupon.getHtml()); | productObjuct.addProperty("notification_rich_text",coupon.getHtml()); | ||||
| }else{ | |||||
| productObjuct.addProperty("notification_rich_text",coupon.getRemark()); | |||||
| } | } | ||||
| productObjuct.addProperty("sub_title",coupon.getSubTitle()); | productObjuct.addProperty("sub_title",coupon.getSubTitle()); | ||||
| @@ -747,7 +746,17 @@ public class TtMerchantPoiServiceImpl implements TtMerchantPoiService { | |||||
| Map<String,Object> map = new HashMap<>(); | Map<String,Object> map = new HashMap<>(); | ||||
| map.put("id",spuSync.getSpuExtId()); | map.put("id",spuSync.getSpuExtId()); | ||||
| map.put("spu_id",spuSync.getSpuId()); | map.put("spu_id",spuSync.getSpuId()); | ||||
| map.put("image_list",spuSync.getImageList()); | |||||
| map.put("name",spuSync.getName()); | map.put("name",spuSync.getName()); | ||||
| if(spuSync.getAttribute() != null){ | |||||
| JsonObject attribute = spuSync.getAttribute(); | |||||
| JsonArray pay_item_groups = attribute.getAsJsonArray("pay_item_groups"); | |||||
| map.put("pay_item_groups",pay_item_groups.getAsString()); | |||||
| map.put("order_limit", GsonHelper.getString(attribute, "order_limit")); | |||||
| map.put("order_valid_start", GsonHelper.getString(attribute, "order_valid_start")); | |||||
| map.put("order_valid_end", GsonHelper.getString(attribute, "order_valid_end")); | |||||
| } | |||||
| map.put("price",spuSync.getPrice()); | map.put("price",spuSync.getPrice()); | ||||
| map.put("origin_price",spuSync.getOriginPrice()); | map.put("origin_price",spuSync.getOriginPrice()); | ||||
| map.put("stock",spuSync.getStock()); | map.put("stock",spuSync.getStock()); | ||||