diff --git a/src/main/java/cn/chjyj/szwh/controller/admin/AdminOrderController.java b/src/main/java/cn/chjyj/szwh/controller/admin/AdminOrderController.java index d5c92d4..7961b4b 100644 --- a/src/main/java/cn/chjyj/szwh/controller/admin/AdminOrderController.java +++ b/src/main/java/cn/chjyj/szwh/controller/admin/AdminOrderController.java @@ -97,10 +97,11 @@ public class AdminOrderController extends BaseController { */ @PostMapping("/orderInfo") public JSONObject orderInfo(String batchcode){ - // - Order order = orderService.getOrderByBatchcode(batchcode); + //罗列出订单信息,及其参数 + List retlist = orderService.orderInfo(batchcode); + jsonObject.put("code",200); - jsonObject.put("data",order); + jsonObject.put("data",retlist); jsonObject.put("msg","成功"); return jsonObject; } diff --git a/src/main/java/cn/chjyj/szwh/service/OrderService.java b/src/main/java/cn/chjyj/szwh/service/OrderService.java index 55086f2..5de2b26 100644 --- a/src/main/java/cn/chjyj/szwh/service/OrderService.java +++ b/src/main/java/cn/chjyj/szwh/service/OrderService.java @@ -37,6 +37,13 @@ public interface OrderService { */ Order getOrderByBatchcode(String batchcode); + /** + * 订单信息 + * @param bathcode + * @return + */ + List orderInfo(String bathcode); + /** * 更新某些字段值 * @param map diff --git a/src/main/java/cn/chjyj/szwh/service/impl/OrderServiceImpl.java b/src/main/java/cn/chjyj/szwh/service/impl/OrderServiceImpl.java index f35ca3f..e546f9c 100644 --- a/src/main/java/cn/chjyj/szwh/service/impl/OrderServiceImpl.java +++ b/src/main/java/cn/chjyj/szwh/service/impl/OrderServiceImpl.java @@ -4,14 +4,18 @@ import cn.chjyj.szwh.bean.Order; import cn.chjyj.szwh.bean.OrderGoodsDetail; import cn.chjyj.szwh.bean.OrderUser; import cn.chjyj.szwh.constant.ChConstant; +import cn.chjyj.szwh.exception.ChException; import cn.chjyj.szwh.mapper.OrderGoodsDetailMapper; import cn.chjyj.szwh.mapper.OrderMapper; import cn.chjyj.szwh.mapper.OrderUserMapper; import cn.chjyj.szwh.service.OrderService; import org.apache.commons.lang3.StringUtils; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.math.BigDecimal; import java.text.SimpleDateFormat; import java.util.*; @@ -20,6 +24,7 @@ import java.util.*; */ @Service public class OrderServiceImpl implements OrderService { + private static Log log = LogFactory.getLog(OrderServiceImpl.class); @Autowired private OrderMapper orderMapper; @Autowired @@ -132,6 +137,52 @@ public class OrderServiceImpl implements OrderService { return orderMapper.getOrderByBatchcode(batchcode); } + /** + * 订单信息细化 + * @param bathcode + * @return + */ + @Override + public List orderInfo(String bathcode) { + List xoutList =new ArrayList(); //返回结果list + Map retmap =new HashMap(); + int code=200; + // 订单基础信息 + Order bsod = orderMapper.getOrderByBatchcode(bathcode); + retmap.put("order",bsod); + xoutList.add(retmap); + + if(bsod==null){ + log.warn("order warn: "+bathcode+" 订单不存在"); + //throw new ChException("订单不存在"); + code=400; + } + //订单商品详情 + List odglist = orderGoodsDetailMapper.getOrderGoodsDetailByBatchCode(bathcode); + + List outlist = new ArrayList(); //中转列表 + + String entrustName="";//委托人 + String goods_name = ""; //商品名称 + String goods_type = ""; // 商品类型 + //$goods_entrust = []; + Set goodsTypeSet =new HashSet(); + + String goods_ownership_str = ""; //商品主人 + BigDecimal price = new BigDecimal(0.00);// + Integer transaction_count = 0; // 交易次数 + BigDecimal earnest_money = new BigDecimal(0.00); + BigDecimal service_charge = new BigDecimal(0.00); + String contract_code = ""; + String close_serial_number = ""; + // + for(OrderGoodsDetail odg:odglist){ + + } + + return xoutList; + } + @Override public int updateOrderStatus(Map map, Integer id) { return orderMapper.updateOrderStatus(map,id);