|
|
@@ -170,6 +170,8 @@ public class OrderServiceImpl implements OrderService {
|
|
|
public WxJsonModel verifyShareCode(String shareCode, String openid, Integer orderID, Integer userID,
|
|
|
Integer organizeID) {
|
|
|
WxJsonModel model = WxJsonModel.newInstance();
|
|
|
+ CmOrder order = orderMapper.findOrder(orderID);
|
|
|
+ if (order == null) return model.error("-2", "该订单已删除");
|
|
|
CmOperationUser operationUser = loginMapper.doLogin(openid, organizeID);
|
|
|
if (operationUser != null && operationUser.getUserID().equals(userID)) {
|
|
|
return model.success(true);
|
|
|
@@ -180,8 +182,6 @@ public class OrderServiceImpl implements OrderService {
|
|
|
}
|
|
|
OrderShareCode orderShareCode = orderMapper.queryCode(orderID);
|
|
|
if (orderShareCode == null) return model.error("该订单没有生成分享码");
|
|
|
- CmOrder order = orderMapper.findOrder(orderID);
|
|
|
- if (order == null) return model.error("该订单已删除");
|
|
|
if (orderShareCode.getShareCode().equals(shareCode) && orderShareCode.getExpiredTime().compareTo(new Date()) == 1) {
|
|
|
CmMallShareCodeRecord codeRecord = new CmMallShareCodeRecord();
|
|
|
codeRecord.setOpenid(openid);
|
|
|
@@ -199,17 +199,23 @@ public class OrderServiceImpl implements OrderService {
|
|
|
}
|
|
|
|
|
|
@Override
|
|
|
- public Map<String, Object> particulars(Integer orderID) {
|
|
|
+ public Map<String, Object> particulars(Integer orderID) throws Exception {
|
|
|
Map<String, Object> map = new HashMap();
|
|
|
//收货地址
|
|
|
BpOrderUserInfo userInfo = orderMapper.findUserInfo(orderID);
|
|
|
//订单信息,运费
|
|
|
CmOrder order = orderMapper.findOrder(orderID);
|
|
|
+ if (order == null) throw new Exception("该订单已删除");
|
|
|
order.setOrderMark("#" + order.getOrderID() + "#");
|
|
|
//111,待付待收待发
|
|
|
if (order.getStatus().equals(11) && order.getPayStatus().equals("1")) {
|
|
|
order.setStatus(111);
|
|
|
}
|
|
|
+ //判断交易全退情况下,是否发过货,77,交易全退可以查看物流
|
|
|
+ List<LogisticsInfo> logisticsInfoList = orderMapper.findLogisticsInfo(orderID, null);
|
|
|
+ if (order.getStatus().equals(7) && logisticsInfoList != null && logisticsInfoList.size() > 0) {
|
|
|
+ order.setStatus(77);
|
|
|
+ }
|
|
|
//商品信息
|
|
|
String[] ShopOrderIDs = {};
|
|
|
if (order.getShopOrderIDs().contains(",")) {
|
|
|
@@ -688,8 +694,7 @@ public class OrderServiceImpl implements OrderService {
|
|
|
|
|
|
|
|
|
@Override
|
|
|
- public Map<String, Object> logistics(Integer orderID) {
|
|
|
- Map<String, Object> map = new HashMap();
|
|
|
+ public List<CmShopOrder> logistics(Integer orderID) {
|
|
|
//物流商品信息
|
|
|
CmOrder order = orderMapper.findOrder(orderID);
|
|
|
String[] ShopOrderIDs = {};
|
|
|
@@ -706,16 +711,15 @@ public class OrderServiceImpl implements OrderService {
|
|
|
}
|
|
|
shopOrder.setCmLogisticsRecords(logisticsRecordList);
|
|
|
shopOrder.setShopLogo(AppUtils.getImageURL("shopLogo", shopOrder.getShopLogo(), 0, domain));
|
|
|
+ //物流信息
|
|
|
+ List<LogisticsInfo> logisticsInfoList = orderMapper.findLogisticsInfo(null, shopOrder.getShopOrderID());
|
|
|
+ for (LogisticsInfo logisticsInfo : logisticsInfoList) {
|
|
|
+ List<Router> routers = JSONArray.parseArray(logisticsInfo.getInfo(), Router.class);
|
|
|
+ logisticsInfo.setRouters(routers);
|
|
|
+ }
|
|
|
+ shopOrder.setLogisticsInfos(logisticsInfoList);
|
|
|
}
|
|
|
- //物流信息
|
|
|
- List<LogisticsInfo> logisticsInfoList = orderMapper.findLogisticsInfo(orderID);
|
|
|
- for (LogisticsInfo logisticsInfo : logisticsInfoList) {
|
|
|
- List<Router> routers = JSONArray.parseArray(logisticsInfo.getInfo(), Router.class);
|
|
|
- logisticsInfo.setRouters(routers);
|
|
|
- }
|
|
|
- map.put("logisticsInfoList", logisticsInfoList);
|
|
|
- map.put("shopOrderList", shopOrderList);
|
|
|
- return map;
|
|
|
+ return shopOrderList;
|
|
|
}
|
|
|
|
|
|
@Override
|
lijun