From 13b2a8f0c5e00af1ef0fac3c45f453abb2481f44 Mon Sep 17 00:00:00 2001 From: xyiege Date: Mon, 18 Jul 2022 00:49:28 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E8=AE=A2=E5=8D=95=E4=BF=A1?= =?UTF-8?q?=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin/AdminOrderController.java | 6 +- .../szwh/mapper/OrderGoodsSourceMapper.java | 10 +++ .../cn/chjyj/szwh/service/OrderService.java | 9 +- .../szwh/service/impl/OrderServiceImpl.java | 87 ++++++++++++++++++- .../mapper/szwh/OrderGoodsSourceMapper.xml | 12 +-- 5 files changed, 112 insertions(+), 12 deletions(-) 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 b9a5a73..f0a483a 100644 --- a/src/main/java/cn/chjyj/szwh/controller/admin/AdminOrderController.java +++ b/src/main/java/cn/chjyj/szwh/controller/admin/AdminOrderController.java @@ -106,10 +106,10 @@ public class AdminOrderController extends BaseController { JSONObject jsonreq=JSONObject.parseObject(request); String batchcode = jsonreq.getString("batchcode"); //罗列出订单信息，及其参数 - List retlist = orderService.orderInfo(batchcode); - Map mp= orderService.orderDetail(batchcode); + Map retlist = orderService.orderInfo(batchcode); + //Map mp= orderService.orderDetail(batchcode); jsonObject.put("code",200); - jsonObject.put("data",mp); + jsonObject.put("data",retlist); jsonObject.put("msg","成功"); return jsonObject; } diff --git a/src/main/java/cn/chjyj/szwh/mapper/OrderGoodsSourceMapper.java b/src/main/java/cn/chjyj/szwh/mapper/OrderGoodsSourceMapper.java index 16e57ef..048e9ae 100644 --- a/src/main/java/cn/chjyj/szwh/mapper/OrderGoodsSourceMapper.java +++ b/src/main/java/cn/chjyj/szwh/mapper/OrderGoodsSourceMapper.java @@ -1,10 +1,20 @@ package cn.chjyj.szwh.mapper; +import cn.chjyj.szwh.bean.OrderGoodsSource; +import org.apache.ibatis.annotations.Param; import org.springframework.stereotype.Component; +import java.util.List; + /** * 订单商品资源mapper */ @Component public interface OrderGoodsSourceMapper { + /** + * 查找未删除订单商品来源 + * @param detailId + * @return + */ + List getOrderGoodsSourceList(@Param("detailId") String detailId); } diff --git a/src/main/java/cn/chjyj/szwh/service/OrderService.java b/src/main/java/cn/chjyj/szwh/service/OrderService.java index 5de2b26..86f821e 100644 --- a/src/main/java/cn/chjyj/szwh/service/OrderService.java +++ b/src/main/java/cn/chjyj/szwh/service/OrderService.java @@ -23,6 +23,13 @@ public interface OrderService { */ Map getOrderList(Map qumap, int page, int limit); + /** + * 商品详情 + * @param batchcode + * @return + */ + Map orderDetail(String batchcode); + /** * 根据编号查询订单信息 * @param id @@ -42,7 +49,7 @@ public interface OrderService { * @param bathcode * @return */ - List orderInfo(String bathcode); + Map orderInfo(String bathcode); /** * 更新某些字段值 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 631a668..7507a63 100644 --- a/src/main/java/cn/chjyj/szwh/service/impl/OrderServiceImpl.java +++ b/src/main/java/cn/chjyj/szwh/service/impl/OrderServiceImpl.java @@ -2,13 +2,17 @@ package cn.chjyj.szwh.service.impl; import cn.chjyj.szwh.bean.Order; import cn.chjyj.szwh.bean.OrderGoodsDetail; +import cn.chjyj.szwh.bean.OrderGoodsSource; 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.OrderGoodsSourceMapper; import cn.chjyj.szwh.mapper.OrderMapper; import cn.chjyj.szwh.mapper.OrderUserMapper; import cn.chjyj.szwh.service.OrderService; +import cn.chjyj.szwh.vo.OrderDetailVo; +import com.alibaba.fastjson.JSONObject; import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -34,6 +38,8 @@ public class OrderServiceImpl implements OrderService { */ @Autowired private OrderGoodsDetailMapper orderGoodsDetailMapper; + @Autowired + private OrderGoodsSourceMapper orderGoodsSourceMapper; @Override public List getAllOrderList(int page) { @@ -129,6 +135,51 @@ public class OrderServiceImpl implements OrderService { return retmap; } + /** + * 订单详情,方法2 + * @param batchcode + * @return + */ + @Override + public Map orderDetail(String batchcode) { + Map retmap =new HashMap(); + // 订单详情及产品信息 + OrderDetailVo ordv =orderGoodsDetailMapper.getOrderDetailVo(batchcode); + if(ordv==null){ + // 订单不存在 + } + // 商品图片 + if(StringUtils.isNotBlank(ordv.getGoods_image())){ + //todo 远程获取图 + } + + // 订单用户 , + OrderUser orderUser = orderUserMapper.getUserOrder(batchcode,ordv.getEntrust_islicode()); + // 显示时候取出ID， + orderUser.setId(null); + orderUser.setBatchcode(null); + retmap.put("userinfo",orderUser); + + //商品来源 + List orderGoodsSourceList = orderGoodsSourceMapper. + getOrderGoodsSourceList(ordv.getSource_id()); + // 遍历 + for(OrderGoodsSource ods:orderGoodsSourceList){ + String sourceData = ods.getSourceData(); + // 转为json + JSONObject json = JSONObject.parseObject(sourceData); + Integer dataType= json.getInteger("datatype"); + // 如果不存在的话，需要进行下载 +// if(dataType==1){ +// +// }else{ +// +// } + } + + return retmap; + } + @Override public Order getOrderById(Integer id) { return orderMapper.getOrderById(id); @@ -145,12 +196,13 @@ public class OrderServiceImpl implements OrderService { * @return */ @Override - public List orderInfo(String bathcode) { + public Map 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); @@ -169,6 +221,8 @@ public class OrderServiceImpl implements OrderService { String goods_type = ""; // 商品类型 //$goods_entrust = []; Set goodsTypeSet =new HashSet(); + Set goods_entrust= new HashSet(); + String goods_ownership_str = ""; //商品主人 BigDecimal price = new BigDecimal(0.00);// @@ -177,12 +231,41 @@ public class OrderServiceImpl implements OrderService { BigDecimal service_charge = new BigDecimal(0.00); String contract_code = ""; String close_serial_number = ""; + + Set entnSet =new HashSet(); // for(OrderGoodsDetail odg:odglist){ + // for 每个商品 购买者 + OrderUser orderUser = orderUserMapper.getUserOrder(bathcode,odg.getEntrustIslicode()); + entnSet.add(orderUser.getName()); + // + goods_name+=odg.getGoodsName()+","; + goods_type+=(odg.getGoodsType()==1)? "文化资源数据," : "文化数字内容,"; + // + String tmstr=odg.getGoodsEntrust()==1?"转让" : "授权"; + goods_entrust.add(tmstr); + + // } - return xoutList; + //购买者 + OrderUser buyuser= orderUserMapper.getUserOrder(bathcode,bsod.getBuyIslicode()); + retmap.put("buyuser",buyuser); + + //分账比例 todo + retmap.put("ratio_setting",null); + + // 资金结算表 + //$closeTable = $this->getCloseTable($order, $order_detail); + retmap.put("close",null); + + // 发票 + //$bill = $this->getBill($batchcode); + //$result['bill'] = $bill; + retmap.put("bill",null); + + return retmap; } @Override diff --git a/src/main/resources/mapper/szwh/OrderGoodsSourceMapper.xml b/src/main/resources/mapper/szwh/OrderGoodsSourceMapper.xml index af3b2c8..26719f3 100644 --- a/src/main/resources/mapper/szwh/OrderGoodsSourceMapper.xml +++ b/src/main/resources/mapper/szwh/OrderGoodsSourceMapper.xml @@ -14,12 +14,12 @@ order_goods_source - - + select + from + where detail_id=#{detailId} + and is_deleted=0 ;