Commit f28d40be by 周晓航

修改 微信推送模板 地址限制问题

parent 1c4d9c94
...@@ -20,6 +20,7 @@ import com.freemud.application.sdk.api.structure.request.PushMessageNoticeDto; ...@@ -20,6 +20,7 @@ import com.freemud.application.sdk.api.structure.request.PushMessageNoticeDto;
import com.freemud.sdk.api.assortment.message.request.MessagePushOrderTemplateRequest; import com.freemud.sdk.api.assortment.message.request.MessagePushOrderTemplateRequest;
import com.freemud.sdk.api.assortment.message.request.MessageTemplateRequest; import com.freemud.sdk.api.assortment.message.request.MessageTemplateRequest;
import com.google.gson.Gson; import com.google.gson.Gson;
import org.apache.commons.lang.StringUtils;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
@Component @Component
...@@ -62,7 +63,12 @@ public class MessageNoticeAdapter { ...@@ -62,7 +63,12 @@ public class MessageNoticeAdapter {
messageTemplateRequest.setAppId(extInfo.getAppid()); messageTemplateRequest.setAppId(extInfo.getAppid());
messageTemplateRequest.setPartnerId(orderBean.getCompanyId()); messageTemplateRequest.setPartnerId(orderBean.getCompanyId());
MessagePushOrderTemplateRequest messagePushOrderTemplateRequest = new MessagePushOrderTemplateRequest(); MessagePushOrderTemplateRequest messagePushOrderTemplateRequest = new MessagePushOrderTemplateRequest();
messagePushOrderTemplateRequest.setAddress(orderBean.getAddress());
// 微信推送 地址长度限制20字符, 多余截取不要
messagePushOrderTemplateRequest.setAddress(StringUtils.isEmpty(orderBean.getAddress()) ?
orderBean.getAddress() :
(orderBean.getAddress().length() > 20 ? orderBean.getAddress().substring(0, 20) : orderBean.getAddress()));
messagePushOrderTemplateRequest.setDaySeq(orderBean.getDaySeq()); messagePushOrderTemplateRequest.setDaySeq(orderBean.getDaySeq());
messagePushOrderTemplateRequest.setGmtExpect(orderBean.getGmtExpect()); messagePushOrderTemplateRequest.setGmtExpect(orderBean.getGmtExpect());
messagePushOrderTemplateRequest.setShopName(orderBean.getShopName()); messagePushOrderTemplateRequest.setShopName(orderBean.getShopName());
......
...@@ -12,6 +12,7 @@ import com.freemud.sdk.api.assortment.message.request.MessageTemplateRequest; ...@@ -12,6 +12,7 @@ import com.freemud.sdk.api.assortment.message.request.MessageTemplateRequest;
import com.freemud.sdk.api.assortment.order.adapter.OrderSdkAdapter; import com.freemud.sdk.api.assortment.order.adapter.OrderSdkAdapter;
import com.freemud.sdk.api.assortment.order.response.order.QueryOrdersResponse; import com.freemud.sdk.api.assortment.order.response.order.QueryOrdersResponse;
import org.apache.commons.lang.ObjectUtils; import org.apache.commons.lang.ObjectUtils;
import org.apache.commons.lang.StringUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
...@@ -65,20 +66,20 @@ public class MessagePushAdapter { ...@@ -65,20 +66,20 @@ public class MessagePushAdapter {
Integer orderStatus = order.getStatus(); Integer orderStatus = order.getStatus();
switch (opType) { switch (opType) {
case ORDER_CONFIRM: case ORDER_CONFIRM:
orderStatus= OrderStatus.RECEIPT.getCode(); orderStatus = OrderStatus.RECEIPT.getCode();
break; break;
case ORDER_DONE: case ORDER_DONE:
orderStatus=OrderStatus.COMPLETE_MAKE.getCode(); orderStatus = OrderStatus.COMPLETE_MAKE.getCode();
break; break;
case ORDER_SEND: case ORDER_SEND:
orderStatus=OrderStatus.DISTRIBUTION.getCode(); orderStatus = OrderStatus.DISTRIBUTION.getCode();
break; break;
case ORDER_AFFIRM: case ORDER_AFFIRM:
orderStatus=OrderStatus.COMPLETE.getCode(); orderStatus = OrderStatus.COMPLETE.getCode();
break; break;
case ORDER_REJECT: case ORDER_REJECT:
case ORDER_AGREE_REFUND: case ORDER_AGREE_REFUND:
orderStatus=OrderStatus.CANCEL.getCode(); orderStatus = OrderStatus.CANCEL.getCode();
break; break;
case ORDER_REJECT_REFUND: case ORDER_REJECT_REFUND:
break; break;
...@@ -93,14 +94,19 @@ public class MessagePushAdapter { ...@@ -93,14 +94,19 @@ public class MessagePushAdapter {
public MessageTemplateRequest<MessagePushOrderTemplateRequest> convent2MessageTemplateRequest(QueryOrdersResponse.DataBean.OrderBean order, String reason, OperateType opType) { public MessageTemplateRequest<MessagePushOrderTemplateRequest> convent2MessageTemplateRequest(QueryOrdersResponse.DataBean.OrderBean order, String reason, OperateType opType) {
OrderExtInfoDto extInfo = JSONObject.parseObject(order.getExtInfo(), OrderExtInfoDto.class); OrderExtInfoDto extInfo = JSONObject.parseObject(order.getExtInfo(), OrderExtInfoDto.class);
if (extInfo==null){ if (extInfo == null) {
return null; return null;
} }
MessageTemplateRequest<MessagePushOrderTemplateRequest> messageTemplateRequest = new MessageTemplateRequest<>(); MessageTemplateRequest<MessagePushOrderTemplateRequest> messageTemplateRequest = new MessageTemplateRequest<>();
messageTemplateRequest.setAppId(extInfo.getAppid()); messageTemplateRequest.setAppId(extInfo.getAppid());
messageTemplateRequest.setPartnerId(order.getCompanyId()); messageTemplateRequest.setPartnerId(order.getCompanyId());
MessagePushOrderTemplateRequest messagePushOrderTemplateRequest = new MessagePushOrderTemplateRequest(); MessagePushOrderTemplateRequest messagePushOrderTemplateRequest = new MessagePushOrderTemplateRequest();
messagePushOrderTemplateRequest.setAddress(order.getAddress());
// 微信推送 地址长度限制20字符, 多余截取不要
messagePushOrderTemplateRequest.setAddress(StringUtils.isEmpty(order.getAddress()) ?
order.getAddress() :
(order.getAddress().length() > 20 ? order.getAddress().substring(0, 20) : order.getAddress()));
messagePushOrderTemplateRequest.setDaySeq(order.getDaySeq()); messagePushOrderTemplateRequest.setDaySeq(order.getDaySeq());
messagePushOrderTemplateRequest.setGmtExpect(order.getGmtExpect()); messagePushOrderTemplateRequest.setGmtExpect(order.getGmtExpect());
messagePushOrderTemplateRequest.setShopName(order.getShopName()); messagePushOrderTemplateRequest.setShopName(order.getShopName());
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment