Commit 1ddbb4b1 by ping.wu

可能空指针的代码修复,查询小程序配送配置删除,蜜雪定制代码删除

parent eb50901b
...@@ -547,8 +547,8 @@ public class OrderAdapter { ...@@ -547,8 +547,8 @@ public class OrderAdapter {
} else if (Objects.equals(createOrderVo.getOrderType(), OrderType.MALL.getCode())) { } else if (Objects.equals(createOrderVo.getOrderType(), OrderType.MALL.getCode())) {
orderType = OrderType.MALL.getCode(); orderType = OrderType.MALL.getCode();
receiveAddress = (userDeliveryInfoDto != null ? userDeliveryInfoDto.getReceiveProvince() + userDeliveryInfoDto.getReceiveCity() + userDeliveryInfoDto.getReceiveRegion() + userDeliveryInfoDto.getReceiveAddress() : ""); receiveAddress = (userDeliveryInfoDto != null ? userDeliveryInfoDto.getReceiveProvince() + userDeliveryInfoDto.getReceiveCity() + userDeliveryInfoDto.getReceiveRegion() + userDeliveryInfoDto.getReceiveAddress() : "");
createOrderVo.setMobile(userDeliveryInfoDto.getReceiveMobile()); createOrderVo.setMobile(userDeliveryInfoDto != null ? userDeliveryInfoDto.getReceiveMobile() : "");
createOrderVo.setContactsName(userDeliveryInfoDto.getReceiveUserName()); createOrderVo.setContactsName(userDeliveryInfoDto != null ? userDeliveryInfoDto.getReceiveUserName() : "");
} else { } else {
throw new ServiceException(ResponseResult.PARAMETER_MISSING, "非法的订单类型"); throw new ServiceException(ResponseResult.PARAMETER_MISSING, "非法的订单类型");
} }
......
...@@ -250,10 +250,10 @@ public class PayServiceImpl { ...@@ -250,10 +250,10 @@ public class PayServiceImpl {
AssortmentOpenPlatformWxapp wxApp = openPlatformWxappManager.findByPartnerIdAndWxappId(partnerId, wxAppId); AssortmentOpenPlatformWxapp wxApp = openPlatformWxappManager.findByPartnerIdAndWxappId(partnerId, wxAppId);
paymentRequest.setPrincipalName(wxApp.getPrincipalName()); paymentRequest.setPrincipalName(wxApp.getPrincipalName());
// fisherman 2227 测试商户号, 下个版本需要删除 // fisherman 2227 测试商户号, 下个版本需要删除
if ("2080".equals(partnerId)) { // if ("2080".equals(partnerId)) {
//【ID1035981】【蜜雪冰城】订单C端,拼接order_body字段:蜜雪冰城+门店编号 // //【ID1035981】【蜜雪冰城】订单C端,拼接order_body字段:蜜雪冰城+门店编号
paymentRequest.setPrincipalName("蜜雪冰城" + orderBean.getShopId() + "店"); // paymentRequest.setPrincipalName("蜜雪冰城" + orderBean.getShopId() + "店");
} // }
paymentRequest.setReverseNotifyiDcUrl(reverseNotifyiDcUrl); paymentRequest.setReverseNotifyiDcUrl(reverseNotifyiDcUrl);
//修改订单信息 //修改订单信息
OrderExtInfoDto orderExtInfoDto = JSONObject.parseObject(orderBean.getExtInfo(), OrderExtInfoDto.class) == null ? new OrderExtInfoDto() : JSONObject.parseObject(orderBean.getExtInfo(), OrderExtInfoDto.class); OrderExtInfoDto orderExtInfoDto = JSONObject.parseObject(orderBean.getExtInfo(), OrderExtInfoDto.class) == null ? new OrderExtInfoDto() : JSONObject.parseObject(orderBean.getExtInfo(), OrderExtInfoDto.class);
......
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