diff --git a/src/main/java/cn/chjyj/szwh/mapper/OrderGoodsDetailMapper.java b/src/main/java/cn/chjyj/szwh/mapper/OrderGoodsDetailMapper.java index 20ac9b6..4eff5a6 100644 --- a/src/main/java/cn/chjyj/szwh/mapper/OrderGoodsDetailMapper.java +++ b/src/main/java/cn/chjyj/szwh/mapper/OrderGoodsDetailMapper.java @@ -102,7 +102,7 @@ public interface OrderGoodsDetailMapper { * @param qmap * @return */ - List getOrderGoodsDetailByMap(@Param("qmap") Map qmap); + List getFuleOrderGoodsDetailByMap(@Param("qmap") Map qmap); /** * add order goods detail 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 0a10482..92e6b5f 100644 --- a/src/main/java/cn/chjyj/szwh/service/impl/OrderServiceImpl.java +++ b/src/main/java/cn/chjyj/szwh/service/impl/OrderServiceImpl.java @@ -13,7 +13,6 @@ import cn.chjyj.szwh.vo.OrderDetailVo; import com.alibaba.fastjson2.JSON; import com.alibaba.fastjson2.JSONArray; import com.alibaba.fastjson2.JSONObject; -import com.sun.org.apache.xpath.internal.operations.Or; import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -200,11 +199,13 @@ public class OrderServiceImpl implements OrderService { } // 取订单商品的人 OrderUser ogdu = orderUserMapper.getUserOrder(ogd.getBatchcode().toString(), ogd.getEntrustIslicode()); - // 如果已经有记录了 - if (StringUtils.isNotBlank(entrustName)) { - entrustName += "," + ogdu.getName(); - } else { - entrustName = ogdu.getName(); + if(ogdu!=null) { + // 如果已经有记录了 + if (StringUtils.isNotBlank(entrustName)) { + entrustName += "," + ogdu.getName(); + } else { + entrustName = ogdu.getName(); + } } //商品名称 @@ -272,13 +273,17 @@ public class OrderServiceImpl implements OrderService { // 订单用户 , Map odumap = new HashMap(); OrderUser orderUser = orderUserMapper.getUserOrder(batchcode, dv.getEntrust_islicode()); - odumap.put("userType", orderUser.getUserType()); - odumap.put("uscc", orderUser.getUscc()); - odumap.put("name", orderUser.getName()); - odumap.put("islicode", orderUser.getIslicode()); - odumap.put("bankAccountName", orderUser.getBankAccountName()); - odumap.put("state", orderUser.getState()); - retmap.put("userinfo", odumap); + if(orderUser!=null) { + odumap.put("userType", orderUser.getUserType()); + odumap.put("uscc", orderUser.getUscc()); + odumap.put("name", orderUser.getName()); + odumap.put("islicode", orderUser.getIslicode()); + odumap.put("bankAccountName", orderUser.getBankAccountName()); + odumap.put("state", orderUser.getState()); + retmap.put("userinfo", odumap); + }else{ + retmap.put("userinfo",null); + } //来源集合 List orgslist = orderGoodsSourceMapper.getOrderGoodsSourceList(dv.getSource_id()); @@ -392,7 +397,9 @@ public class OrderServiceImpl implements OrderService { for (OrderGoodsDetail odg : odglist) { // for 每个商品 购买者 OrderUser orderUser = orderUserMapper.getUserOrder(bathcode, odg.getEntrustIslicode()); - entnSet.add(orderUser.getName()); + if(orderUser!=null) { + entnSet.add(orderUser.getName()); + } // goodsName += odg.getGoodsName() + ","; goodsType += (odg.getGoodsType() == 1) ? "文化资源数据," : "文化数字内容,"; @@ -797,8 +804,8 @@ public class OrderServiceImpl implements OrderService { //订单用户信息 OrderUser orderUser = orderUserMapper.getUserOrder(od.getBatchcode(), od.getBuyIslicode()); retmap.put("buy_username", orderUser.getName()); - retmap.put("attesttime", sdf.format(orderUser.getAttesttime())); - retmap.put("registertime", sdf.format(orderUser.getRegistertime())); + retmap.put("attesttime", orderUser.getAttesttime()!=null?sdf.format(orderUser.getAttesttime()):null); + retmap.put("registertime", orderUser.getRegistertime()!=null?sdf.format(orderUser.getRegistertime()):null); retmap.put("userType", orderUser.getUserType()); retmap.put("authType", orderUser.getAuthType()); retmap.put("state", orderUser.getState()); @@ -837,19 +844,60 @@ public class OrderServiceImpl implements OrderService { for (OrderGoodsDetail ogd : orderGoodsDetailList) { //Map odgmap =new HashMap(); // 利用goods detail的信息来初始化 - Map odgmap = JSONObject.parseObject(JSON.toJSONString(ogd)); + //Map odgmap = JSONObject.parseObject(JSON.toJSONString(ogd)); + Map odgmap = new HashMap(); + odgmap.put("entrust_islicode",ogd.getEntrustIslicode()); + odgmap.put("islicode",ogd.getIslicode()); + odgmap.put("goods_name",ogd.getGoodsName()); + odgmap.put("goods_image",ogd.getGoodsImage()); + odgmap.put("contract_code",ogd.getContractCode()); + odgmap.put("orderIslicode",ogd.getOrderIslicode()); + odgmap.put("history_entrust_name",ogd.getHistoryEntrustName()); + odgmap.put("history_entrust_code",ogd.getHistoryEntrustCode()); + odgmap.put("identifier",ogd.getIdentifier()); + odgmap.put("identifiers",ogd.getIdentifiers()); + odgmap.put("sourcedata_islicode",ogd.getSourceDownload()); + odgmap.put("close_serial_number",ogd.getCloseSerialNumber()); + odgmap.put("price",ogd.getPrice()); + odgmap.put("goods_price",ogd.getGoodsPrice()); + odgmap.put("service_charge",ogd.getServiceCharge()); + odgmap.put("earnest_money",ogd.getEarnestMoney()); + odgmap.put("transaction_count",ogd.getTransactionCount()); + odgmap.put("money",ogd.getMoney()); + odgmap.put("entrust_service_charge",ogd.getEntrustServiceCharge()); + odgmap.put("entrust_money",ogd.getEarnestMoney()); +// "goods_ownership": 0, +// "goods_ownership_str": "发行权", +// "goods_type": 1, +// "charges_type": 2, +// "goods_islicode": "010007-00000000384699999999-2", +// "goods_entrust": 2, +// "contractual_period": 2, +// "transaction_class": 1, +// "contract": "[]", +// "otherIdentifiers": "11.30,第二次,一次性", +// "classification": " ", +// "source_islicode": "", +// "source_islicode_name": "", +// "source_download": null, +// "close_id": null, +// "close_status": 1, +// "is_close": 0, +// "callback_msg": "", +// "goods_status": 1, +// "entrust_month": 2, //补充其他元素 - retmap.put("close_status", ogd.getCloseStatus()); + //retmap.put("close_status", ogd.getCloseStatus()); // 查询委托方信息 - OrderUser entrUser = orderUserMapper.getUserOrder(ogd.getBatchcode(),ogd.getIslicode()); - if(entrUser!=null){ //not null - odgmap.put("entrust_name",entrUser.getName()); - odgmap.put("attesttime",entrUser.getAttesttime()); - odgmap.put("registertime",entrUser.getRegistertime()); - odgmap.put("userType",entrUser.getUserType()); - odgmap.put("authType",entrUser.getAuthType()); - odgmap.put("state",entrUser.getState()); - } +// OrderUser entrUser = orderUserMapper.getUserOrder(ogd.getBatchcode(),ogd.getIslicode()); +// if(entrUser!=null){ //not null +// odgmap.put("entrust_name",entrUser.getName()); +// odgmap.put("attesttime",entrUser.getAttesttime()); +// odgmap.put("registertime",entrUser.getRegistertime()); +// odgmap.put("userType",entrUser.getUserType()); +// odgmap.put("authType",entrUser.getAuthType()); +// odgmap.put("state",entrUser.getState()); +// } //查询商品状态 Goods tgoods = goodsMapper.getGoodsByIsli(ogd.getGoodsIslicode()); int igoodsStatus=4; //默认 @@ -905,8 +953,8 @@ public class OrderServiceImpl implements OrderService { if (userrole == 1 && od.getStatus() == 3) { retmap.put("status", 4); } - //retmap.put("search_close_money", new BigDecimal(0)); - //retmap.put("total_close_money", new BigDecimal(0)); + retmap.put("search_close_money", new BigDecimal(0)); + retmap.put("total_close_money", new BigDecimal(0)); // outlist.add(retmap); } @@ -914,8 +962,10 @@ public class OrderServiceImpl implements OrderService { int total = orderMapper.countOrderByMap(qmap); // 最外层 outmap.put("total_close_money",new BigDecimal("0.00")); - outmap.put("limit",limit); - outmap.put("page",page); + + outmap.put("per_page",limit); + outmap.put("current_page",page); + outmap.put("last_page",1); outmap.put("total",total); outmap.put("data",outlist); return outmap; diff --git a/src/main/resources/mapper/szwh/OrderGoodsDetailMapper.xml b/src/main/resources/mapper/szwh/OrderGoodsDetailMapper.xml index 4e40a56..9074604 100644 --- a/src/main/resources/mapper/szwh/OrderGoodsDetailMapper.xml +++ b/src/main/resources/mapper/szwh/OrderGoodsDetailMapper.xml @@ -53,6 +53,7 @@ updatetime,is_deleted as isDeleted from where batchcode=#{batchcode} + order by id desc @@ -119,7 +120,7 @@ - SELECT FROM