From c4c5e6cac07cebf4a7aad8f06cebb088a0ff7bb3 Mon Sep 17 00:00:00 2001 From: xyiege Date: Sat, 3 Dec 2022 15:36:28 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/chjyj/szwh/bean/OrderGoodsDetail.java | 19 ++++++++++++++ .../szwh/controller/api/OrderController.java | 1 - .../szwh/service/impl/OrderServiceImpl.java | 26 ++++++++++++++++--- .../szwh/service/impl/PayServiceImpl.java | 2 +- 4 files changed, 42 insertions(+), 6 deletions(-) diff --git a/src/main/java/cn/chjyj/szwh/bean/OrderGoodsDetail.java b/src/main/java/cn/chjyj/szwh/bean/OrderGoodsDetail.java index f479a97..2e56b58 100644 --- a/src/main/java/cn/chjyj/szwh/bean/OrderGoodsDetail.java +++ b/src/main/java/cn/chjyj/szwh/bean/OrderGoodsDetail.java @@ -36,25 +36,36 @@ public class OrderGoodsDetail implements Serializable { private String goodsName;//商品名称 @JSONField(name = "goods_image") private String goodsImage;//商品图片 + @JSONField(name = "contract_code") private String contractCode;//合约关联编码(订单交易isli标识码) + @JSONField(name = "order_islicode") private String orderIslicode; + @JSONField(name = "history_entrust_name") private String historyEntrustName;//历史委托方名称 + @JSONField(name = "history_entrust_code") private String historyEntrustCode;//历史委托方组织机构代码 private String identifier;//资源isli private String identifiers;//合约ISLI标志码/商品ISLI编码 + @JSONField(name = "sourcedata_islicode") private String sourcedataIslicode;//sourceData里的islicode + @JSONField(name = "close_serial_number") private String closeSerialNumber;//结算流水号 private BigDecimal price;//单价 + @JSONField(name = "goods_price") private BigDecimal goodsPrice;//标的金额（不算服务费） @JSONField(name = "service_charge") private BigDecimal serviceCharge;//服务费金额 + @JSONField(name = "earnest_money") private BigDecimal earnestMoney;//商品保证金 + @JSONField(name = "transaction_count") private Integer transactionCount;//交易数量 private BigDecimal money;//商品总金额 @JSONField(name = "entrust_service_charge") private BigDecimal entrustServiceCharge;//委托方服务费 private BigDecimal entrustMoney;//委托方金额 + @JSONField(name = "goods_ownership") private Integer goodsOwnership;//商品类型；1：所有权；2：使用权 + @JSONField(name = "goods_ownership_str") private String goodsOwnershipStr;//商品权属 private Integer goodsType;//商品类型；1：文化资源数据；2：文化数字内容 @JSONField(name = "charges_type") @@ -62,19 +73,27 @@ public class OrderGoodsDetail implements Serializable { private String goodsIslicode;//商品isli标识码 @JSONField(name = "goods_entrust") private Integer goodsEntrust;//商品委托类型；1：转让；2：许可 + @JSONField(name = "contractual_period") private Integer contractualPeriod;//委托周期；1：永久，2：单次，3：周期 + @JSONField(name = "transaction_class") private Integer transactionClass;//交易种类；1：权属；2：商品 private String contract;//描述 private String otherIdentifiers;//权属自有标识符（商品自有标识符） private String classification;//标的商品的分类（交易种类为商品时候用的） private String sourceIslicode;//资源isli标识码 + @JSONField(name = "source_islicode_name") private String sourceIslicodeName;//资源名称 private String dataJson;//数据；json格式 private String sourceJson; + @JSONField(name = "source_download") private String sourceDownload;//资源下载数据 + @JSONField(name = "close_id") private String closeId;//该次结算批次号 + @JSONField(name = "close_status") private Integer closeStatus;//1：无结算信息；2：结算中；3：用户名和收款人不一致；4：收款信息错误；5：结算成功 + @JSONField(name = "is_close") private Integer isClose; + @JSONField(name = "callback_msg") private String callbackMsg; private Date createtime;//创建时间 private Date updatetime;//修改时间 diff --git a/src/main/java/cn/chjyj/szwh/controller/api/OrderController.java b/src/main/java/cn/chjyj/szwh/controller/api/OrderController.java index a2d3afc..febdd21 100644 --- a/src/main/java/cn/chjyj/szwh/controller/api/OrderController.java +++ b/src/main/java/cn/chjyj/szwh/controller/api/OrderController.java @@ -23,7 +23,6 @@ import java.util.Map; /** * 用户订单信息 - * only POST method */ @RestController @RequestMapping( value = "/api/Order") 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 7a80e6a..0a10482 100644 --- a/src/main/java/cn/chjyj/szwh/service/impl/OrderServiceImpl.java +++ b/src/main/java/cn/chjyj/szwh/service/impl/OrderServiceImpl.java @@ -766,6 +766,7 @@ public class OrderServiceImpl implements OrderService { */ @Override public Map queryOrder(Map qmap, Integer userrole, Integer page, Integer limit) { + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss"); int start = page > 1 ? (page - 1) * limit : 0; Map outmap = new HashMap(); //订单结算 todo @@ -775,13 +776,29 @@ public class OrderServiceImpl implements OrderService { for (Order od : orderList) { Map retmap = new HashMap<>(); //订单的产品转为map - JSONObject odjson = (JSONObject) JSON.toJSON(od); - retmap = JSONObject.parseObject(odjson.toJSONString()); + //JSONObject odjson = (JSONObject) JSON.toJSON(od); + //retmap = JSONObject.parseObject(odjson.toJSONString()); + retmap.put("batchcode",od.getBatchcode()); + retmap.put("total_service_charge", od.getTotalServiceCharge()); + retmap.put("total_money",od.getTotalMoney()); + retmap.put("type",od.getType()); + retmap.put("status",od.getStatus()); + retmap.put("createtime",od.getCreatetime()!=null?sdf.format(od.getCreatetime()):null); + retmap.put("paymenttime",od.getPaymenttime()!=null?sdf.format(od.getPaymenttime()):null); + retmap.put("receivetime",od.getReceivetime()!=null?sdf.format(od.getReceivetime()):null); + retmap.put("closetime",od.getClosetime()!=null?sdf.format(od.getClosetime()):null); + retmap.put("buy_islicode",od.getBuyIslicode()); + retmap.put("pay_status",od.getPayStatus()); + retmap.put("close_status",od.getCloseStatus()); + retmap.put("charge_channel",od.getChargeChannel()); + retmap.put("completetime",od.getCompletetime()!=null?sdf.format(od.getCompletetime()):null); + retmap.put("account_ratio_id",od.getAccountRatioId()); + //订单用户信息 OrderUser orderUser = orderUserMapper.getUserOrder(od.getBatchcode(), od.getBuyIslicode()); retmap.put("buy_username", orderUser.getName()); - retmap.put("attesttime", orderUser.getAttesttime()); - retmap.put("registertime", orderUser.getRegistertime()); + retmap.put("attesttime", sdf.format(orderUser.getAttesttime())); + retmap.put("registertime", sdf.format(orderUser.getRegistertime())); retmap.put("userType", orderUser.getUserType()); retmap.put("authType", orderUser.getAuthType()); retmap.put("state", orderUser.getState()); @@ -806,6 +823,7 @@ public class OrderServiceImpl implements OrderService { BigDecimal rate = entrustAmount.divide(new BigDecimal("100"), 2, RoundingMode.HALF_UP).setScale(2, RoundingMode.HALF_UP); totalCloseMoney = totalCloseMoney.add(od.getTotalMoney().multiply(rate)).setScale(2, RoundingMode.HALF_UP); } + // 结算金额 retmap.put("close_money", totalCloseMoney); } // diff --git a/src/main/java/cn/chjyj/szwh/service/impl/PayServiceImpl.java b/src/main/java/cn/chjyj/szwh/service/impl/PayServiceImpl.java index dc1f7ec..480b3ed 100644 --- a/src/main/java/cn/chjyj/szwh/service/impl/PayServiceImpl.java +++ b/src/main/java/cn/chjyj/szwh/service/impl/PayServiceImpl.java @@ -91,7 +91,7 @@ public class PayServiceImpl implements PayService { //订单商品详情 List orderGoodsDetailList = orderGoodsDetailMapper.getOrderGoodsDetailByBatchCode(batchcode); for (OrderGoodsDetail odgd : orderGoodsDetailList) { - Map odmap = new HashMap(); + String dateStr = "";//订单年限 int transCount = 1;// if (odgd.getGoodsEntrust() == 1 || odgd.getChargesType() == 1) {