订单详情

src/main/java/com/caimei/controller/order/OrderController.java

@@ -52,7 +52,7 @@ public class OrderController {
     @RequestMapping("/particulars")
     public WxJsonModel particulars(Integer orderID) {
         Map<String, Object> map = orderService.particulars(orderID);
-        return null;
+        return WxJsonModel.newInstance().success(map);
     }
 
     /**

src/main/java/com/caimei/entity/CmDiscernReceipt.java

@@ -0,0 +1,303 @@
+package com.caimei.entity;
+
+import java.io.Serializable;
+
+public class CmDiscernReceipt implements Serializable {
+    private Integer id;
+    private String payWay;  //用户付款方式：1线上，2线下
+    private String payType; //付款类型：1建设银行7297、2广发银行0115、3中信银行7172、4中信银行0897、5中信银行0897-财付通、6中信银行0897-支付宝、7线上-支付宝、8线上-微信支付、9线上-快钱支付
+    private String payTypeStr;
+    private String receiptType;  //收款款项类型：1订单款，2非订单款，3返佣款 4订单款或者非订单款（因财务阶段无法区分订单非订单）
+    private String receiptStatus;   //收款状态：1待确认、2已确认(待审核)、3审核通过、4审核未通过、5收款撤销【线上支付成功为审核通过】
+    private String smsContent;  //短信内容
+    private String smsMd5Code;  //短信内容Md5加密串（适用于二次短信匹配查询）
+    private String orderFlag;   //订单标识
+    private Double receiptAmount;   //收款金额（线上一次性付款和支付金额一致）
+    private Double handlingFee;     //手续费(个别银行存在手续费)
+    private String confirmType;     //确认订单类型：1小额抹平确认，2大额抹平确认，3大额退款余额，4确认关联
+    private String confirmUserPermissionID; //确认人权限ID(对应receipt_user_permission表)
+    private String reviewUserPermissionID;  //审核人权限ID(对应receipt_user_permission表)
+    private String cancelUserPermissionID;  //撤销人权限ID(对应receipt_user_permission表)
+    private String transactionNum;  //交易号--[线上字段]
+    private String bankID;  //银行Id--[线上字段]
+    private String bankCode;    //银行卡号--[线上字段]
+    private String kuaiQianPayTypeID;    //快钱支付类型ID--[线上字段]
+    private String kuaiQianPayerID;    //块钱支付ID--[线上字段]
+    private String rePayFlag;    //支付状态 1支付成功--[线上字段]
+    private Double actualAmount;    //支付金额--[线上字段]
+    private String formData;    //支付回调返回数据--[线上字段]
+    private String problem;    //支付问题--[线上字段]
+    private String noOrderReason;    //非订单款说明(适用协销确认的时候区分订单和非订单款)
+    private String reviewReason;    //审核不通过原因
+    private String cancelReason;    //撤销原因
+    private String receiptDate;    //收款时间
+    private String confirmDate;    //确认时间
+    private String reviewDate;    //审核时间
+    private String cancelDate;    //撤销时间
+    private String updateDate;    //更新操作时间
+    private String delFlag;     //作废标记 0 否，其余是
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public String getPayWay() {
+        return payWay;
+    }
+
+    public void setPayWay(String payWay) {
+        this.payWay = payWay;
+    }
+
+    public String getPayType() {
+        return payType;
+    }
+
+    public void setPayType(String payType) {
+        this.payType = payType;
+    }
+
+    public String getPayTypeStr() {
+        return payTypeStr;
+    }
+
+    public void setPayTypeStr(String payTypeStr) {
+        this.payTypeStr = payTypeStr;
+    }
+
+    public String getReceiptType() {
+        return receiptType;
+    }
+
+    public void setReceiptType(String receiptType) {
+        this.receiptType = receiptType;
+    }
+
+    public String getReceiptStatus() {
+        return receiptStatus;
+    }
+
+    public void setReceiptStatus(String receiptStatus) {
+        this.receiptStatus = receiptStatus;
+    }
+
+    public String getSmsContent() {
+        return smsContent;
+    }
+
+    public void setSmsContent(String smsContent) {
+        this.smsContent = smsContent;
+    }
+
+    public String getSmsMd5Code() {
+        return smsMd5Code;
+    }
+
+    public void setSmsMd5Code(String smsMd5Code) {
+        this.smsMd5Code = smsMd5Code;
+    }
+
+    public String getOrderFlag() {
+        return orderFlag;
+    }
+
+    public void setOrderFlag(String orderFlag) {
+        this.orderFlag = orderFlag;
+    }
+
+    public Double getReceiptAmount() {
+        return receiptAmount;
+    }
+
+    public void setReceiptAmount(Double receiptAmount) {
+        this.receiptAmount = receiptAmount;
+    }
+
+    public Double getHandlingFee() {
+        return handlingFee;
+    }
+
+    public void setHandlingFee(Double handlingFee) {
+        this.handlingFee = handlingFee;
+    }
+
+    public String getConfirmType() {
+        return confirmType;
+    }
+
+    public void setConfirmType(String confirmType) {
+        this.confirmType = confirmType;
+    }
+
+    public String getConfirmUserPermissionID() {
+        return confirmUserPermissionID;
+    }
+
+    public void setConfirmUserPermissionID(String confirmUserPermissionID) {
+        this.confirmUserPermissionID = confirmUserPermissionID;
+    }
+
+    public String getReviewUserPermissionID() {
+        return reviewUserPermissionID;
+    }
+
+    public void setReviewUserPermissionID(String reviewUserPermissionID) {
+        this.reviewUserPermissionID = reviewUserPermissionID;
+    }
+
+    public String getCancelUserPermissionID() {
+        return cancelUserPermissionID;
+    }
+
+    public void setCancelUserPermissionID(String cancelUserPermissionID) {
+        this.cancelUserPermissionID = cancelUserPermissionID;
+    }
+
+    public String getTransactionNum() {
+        return transactionNum;
+    }
+
+    public void setTransactionNum(String transactionNum) {
+        this.transactionNum = transactionNum;
+    }
+
+    public String getBankID() {
+        return bankID;
+    }
+
+    public void setBankID(String bankID) {
+        this.bankID = bankID;
+    }
+
+    public String getBankCode() {
+        return bankCode;
+    }
+
+    public void setBankCode(String bankCode) {
+        this.bankCode = bankCode;
+    }
+
+    public String getKuaiQianPayTypeID() {
+        return kuaiQianPayTypeID;
+    }
+
+    public void setKuaiQianPayTypeID(String kuaiQianPayTypeID) {
+        this.kuaiQianPayTypeID = kuaiQianPayTypeID;
+    }
+
+    public String getKuaiQianPayerID() {
+        return kuaiQianPayerID;
+    }
+
+    public void setKuaiQianPayerID(String kuaiQianPayerID) {
+        this.kuaiQianPayerID = kuaiQianPayerID;
+    }
+
+    public String getRePayFlag() {
+        return rePayFlag;
+    }
+
+    public void setRePayFlag(String rePayFlag) {
+        this.rePayFlag = rePayFlag;
+    }
+
+    public Double getActualAmount() {
+        return actualAmount;
+    }
+
+    public void setActualAmount(Double actualAmount) {
+        this.actualAmount = actualAmount;
+    }
+
+    public String getFormData() {
+        return formData;
+    }
+
+    public void setFormData(String formData) {
+        this.formData = formData;
+    }
+
+    public String getProblem() {
+        return problem;
+    }
+
+    public void setProblem(String problem) {
+        this.problem = problem;
+    }
+
+    public String getNoOrderReason() {
+        return noOrderReason;
+    }
+
+    public void setNoOrderReason(String noOrderReason) {
+        this.noOrderReason = noOrderReason;
+    }
+
+    public String getReviewReason() {
+        return reviewReason;
+    }
+
+    public void setReviewReason(String reviewReason) {
+        this.reviewReason = reviewReason;
+    }
+
+    public String getCancelReason() {
+        return cancelReason;
+    }
+
+    public void setCancelReason(String cancelReason) {
+        this.cancelReason = cancelReason;
+    }
+
+    public String getReceiptDate() {
+        return receiptDate;
+    }
+
+    public void setReceiptDate(String receiptDate) {
+        this.receiptDate = receiptDate;
+    }
+
+    public String getConfirmDate() {
+        return confirmDate;
+    }
+
+    public void setConfirmDate(String confirmDate) {
+        this.confirmDate = confirmDate;
+    }
+
+    public String getReviewDate() {
+        return reviewDate;
+    }
+
+    public void setReviewDate(String reviewDate) {
+        this.reviewDate = reviewDate;
+    }
+
+    public String getCancelDate() {
+        return cancelDate;
+    }
+
+    public void setCancelDate(String cancelDate) {
+        this.cancelDate = cancelDate;
+    }
+
+    public String getUpdateDate() {
+        return updateDate;
+    }
+
+    public void setUpdateDate(String updateDate) {
+        this.updateDate = updateDate;
+    }
+
+    public String getDelFlag() {
+        return delFlag;
+    }
+
+    public void setDelFlag(String delFlag) {
+        this.delFlag = delFlag;
+    }
+}

src/main/java/com/caimei/entity/CmOrderProduct.java

@@ -67,7 +67,6 @@ public class CmOrderProduct implements Serializable {
     private Double actPreferential;//活动优惠金额
     private String productImage; //商品图片
     private String productUnit;  //商品规格
-    private List<NewCmFinanceReceipts> newCmFinanceReceiptsList; //订单商品id对应一个进账记录  订单id对应多个
     private Integer deliveryNum; // 发货数量
     private String logisticsBatchID; // 发货批次ID
     private Integer outStoreTimes;  // 发货批次
@@ -520,14 +519,6 @@ public class CmOrderProduct implements Serializable {
         this.productUnit = productUnit;
     }
 
-    public List<NewCmFinanceReceipts> getNewCmFinanceReceiptsList() {
-        return newCmFinanceReceiptsList;
-    }
-
-    public void setNewCmFinanceReceiptsList(List<NewCmFinanceReceipts> newCmFinanceReceiptsList) {
-        this.newCmFinanceReceiptsList = newCmFinanceReceiptsList;
-    }
-
     public Integer getDeliveryNum() {
         return deliveryNum;
     }

src/main/java/com/caimei/entity/CmReturnedPurchase.java

@@ -0,0 +1,227 @@
+package com.caimei.entity;
+
+import java.io.Serializable;
+
+/**
+ * 退货退款Entity
+ * @author ye.qin
+ * @version 2019-05-24
+ */
+public class CmReturnedPurchase implements Serializable {
+	private Integer id;
+	private String returnedNo;        // 退款退货编号
+	private Integer orderID;        // 主订单ID
+	private String orderNo;         //主订单号
+	private String userName;        //买家名
+	private Integer userID;        // 用户ID（买家）
+	private String status;        // 状态：1退货退款中、2已完成、3已取消
+	private String returnedWay;        // 退款方式 1账户余额、2线下转账、3线上退回
+	private String returnedBankInfo;        // 退款银行信息（银行名称、户名、开户行、银行账号）
+	private Double returnedPurchaseFee;        // 退款(退货)总金额
+	private Double refundFee;        // 退款总额(给买家)
+	private String image1;        // 凭证图片1
+	private String image2;        // 凭证图片2
+	private String image3;        // 凭证图片3
+	private String image4;        // 凭证图片4
+	private String image5;        // 凭证图片5
+	private String reviewImage1;        // 凭证图片1
+	private String reviewImage2;        // 凭证图片2
+	private String reviewImage3;        // 凭证图片3
+	private String reviewImage4;        // 凭证图片4
+	private String reviewImage5;        // 凭证图片5
+	private String reviewRemarks;   //审核备注
+	private String returnTime;        // 申请退款时间
+	private String confirmReturnTime;        // 确认退款时间
+
+	public Integer getId() {
+		return id;
+	}
+
+	public void setId(Integer id) {
+		this.id = id;
+	}
+
+	public String getReturnedNo() {
+		return returnedNo;
+	}
+
+	public void setReturnedNo(String returnedNo) {
+		this.returnedNo = returnedNo;
+	}
+
+	public Integer getOrderID() {
+		return orderID;
+	}
+
+	public void setOrderID(Integer orderID) {
+		this.orderID = orderID;
+	}
+
+	public String getOrderNo() {
+		return orderNo;
+	}
+
+	public void setOrderNo(String orderNo) {
+		this.orderNo = orderNo;
+	}
+
+	public String getUserName() {
+		return userName;
+	}
+
+	public void setUserName(String userName) {
+		this.userName = userName;
+	}
+
+	public Integer getUserID() {
+		return userID;
+	}
+
+	public void setUserID(Integer userID) {
+		this.userID = userID;
+	}
+
+	public String getStatus() {
+		return status;
+	}
+
+	public void setStatus(String status) {
+		this.status = status;
+	}
+
+	public String getReturnedWay() {
+		return returnedWay;
+	}
+
+	public void setReturnedWay(String returnedWay) {
+		this.returnedWay = returnedWay;
+	}
+
+	public String getReturnedBankInfo() {
+		return returnedBankInfo;
+	}
+
+	public void setReturnedBankInfo(String returnedBankInfo) {
+		this.returnedBankInfo = returnedBankInfo;
+	}
+
+	public Double getReturnedPurchaseFee() {
+		return returnedPurchaseFee;
+	}
+
+	public void setReturnedPurchaseFee(Double returnedPurchaseFee) {
+		this.returnedPurchaseFee = returnedPurchaseFee;
+	}
+
+	public Double getRefundFee() {
+		return refundFee;
+	}
+
+	public void setRefundFee(Double refundFee) {
+		this.refundFee = refundFee;
+	}
+
+	public String getImage1() {
+		return image1;
+	}
+
+	public void setImage1(String image1) {
+		this.image1 = image1;
+	}
+
+	public String getImage2() {
+		return image2;
+	}
+
+	public void setImage2(String image2) {
+		this.image2 = image2;
+	}
+
+	public String getImage3() {
+		return image3;
+	}
+
+	public void setImage3(String image3) {
+		this.image3 = image3;
+	}
+
+	public String getImage4() {
+		return image4;
+	}
+
+	public void setImage4(String image4) {
+		this.image4 = image4;
+	}
+
+	public String getImage5() {
+		return image5;
+	}
+
+	public void setImage5(String image5) {
+		this.image5 = image5;
+	}
+
+	public String getReviewImage1() {
+		return reviewImage1;
+	}
+
+	public void setReviewImage1(String reviewImage1) {
+		this.reviewImage1 = reviewImage1;
+	}
+
+	public String getReviewImage2() {
+		return reviewImage2;
+	}
+
+	public void setReviewImage2(String reviewImage2) {
+		this.reviewImage2 = reviewImage2;
+	}
+
+	public String getReviewImage3() {
+		return reviewImage3;
+	}
+
+	public void setReviewImage3(String reviewImage3) {
+		this.reviewImage3 = reviewImage3;
+	}
+
+	public String getReviewImage4() {
+		return reviewImage4;
+	}
+
+	public void setReviewImage4(String reviewImage4) {
+		this.reviewImage4 = reviewImage4;
+	}
+
+	public String getReviewImage5() {
+		return reviewImage5;
+	}
+
+	public void setReviewImage5(String reviewImage5) {
+		this.reviewImage5 = reviewImage5;
+	}
+
+	public String getReviewRemarks() {
+		return reviewRemarks;
+	}
+
+	public void setReviewRemarks(String reviewRemarks) {
+		this.reviewRemarks = reviewRemarks;
+	}
+
+	public String getReturnTime() {
+		return returnTime;
+	}
+
+	public void setReturnTime(String returnTime) {
+		this.returnTime = returnTime;
+	}
+
+	public String getConfirmReturnTime() {
+		return confirmReturnTime;
+	}
+
+	public void setConfirmReturnTime(String confirmReturnTime) {
+		this.confirmReturnTime = confirmReturnTime;
+	}
+}

src/main/java/com/caimei/entity/NewCmFinanceReceipts.java

@@ -1,305 +0,0 @@
-package com.caimei.entity;
-
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- * 进账信息Entity
- *
- * @author 李俊
- * @version 2019-12-17
- */
-public class NewCmFinanceReceipts implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-    private Integer id;
-    private String status;        // 状态 1待支付 2待财务确认 3已收到款 4未收到款 9交易关闭
-    private Integer orderId;        // 订单ID
-    private Integer userId;        // 用户ID
-    private Integer clubId;        // 机构ID
-    private String orderSequence;        //订单序列号-- 订单编号(主订单)+序列ID
-    private Integer orderSubmitType;        // :个人自己下单 1:企业自己下单 2:员工帮机构下单 3:协销帮机构下单  4:后台下单 5:采美豆订单
-    private Integer orderType;        // 订单类型 协销订单 0 普通订单 1
-    private String transactionNum;        // 交易号
-    private String orderProductIds;        // 订单商品ID，多个用逗号隔开
-    private String payWay;          // 支付方式
-    private Double totalAmount;        // 总金额/总价
-    private Double deductionAmount;        // 抵扣总额
-    private Double shouldPayAmount;        // 应付总额
-    private Integer bankID;             //银行卡ID
-    private String bankCode;            //银行卡号
-    private Integer kuaiQianPayTypeID;      //快钱支付类型ID
-    private Integer kuaiQianPayerID;        //块钱支付ID
-    private String rePayFlag;               //支付状态 1支付成功
-    private String delFlag;
-    private Date receiptsDate;        // 进账时间
-    private Date auditDate;        // 审核时间
-    private Double actualAmount;    //支付金额
-    private Double useBalanceAmount;//余额支付金额
-    private Double refundAmount;    //可退金额
-    private Double preferential;    //优惠金额
-    private String formData;        //支付返回数据
-    private String proberlem;       //支付问题
-
-    private String createBy;
-    private String createDate;
-    private String updateBy;
-    private String updateDate;
-
-    public Integer getId() {
-        return id;
-    }
-
-    public void setId(Integer id) {
-        this.id = id;
-    }
-
-    public String getStatus() {
-        return status;
-    }
-
-    public void setStatus(String status) {
-        this.status = status;
-    }
-
-    public String getOrderSequence() {
-        return orderSequence;
-    }
-
-    public void setOrderSequence(String orderSequence) {
-        this.orderSequence = orderSequence;
-    }
-
-
-    public String getTransactionNum() {
-        return transactionNum;
-    }
-
-    public void setTransactionNum(String transactionNum) {
-        this.transactionNum = transactionNum;
-    }
-
-    public String getOrderProductIds() {
-        return orderProductIds;
-    }
-
-    public void setOrderProductIds(String orderProductIds) {
-        this.orderProductIds = orderProductIds;
-    }
-
-    public String getPayWay() {
-        return payWay;
-    }
-
-    public void setPayWay(String payWay) {
-        this.payWay = payWay;
-    }
-
-    public Date getReceiptsDate() {
-        return receiptsDate;
-    }
-
-    public void setReceiptsDate(Date receiptsDate) {
-        this.receiptsDate = receiptsDate;
-    }
-
-    public Date getAuditDate() {
-        return auditDate;
-    }
-
-    public void setAuditDate(Date auditDate) {
-        this.auditDate = auditDate;
-    }
-
-    public Integer getBankID() {
-        return bankID;
-    }
-
-    public void setBankID(Integer bankID) {
-        this.bankID = bankID;
-    }
-
-    public String getBankCode() {
-        return bankCode;
-    }
-
-    public void setBankCode(String bankCode) {
-        this.bankCode = bankCode;
-    }
-
-    public Integer getKuaiQianPayTypeID() {
-        return kuaiQianPayTypeID;
-    }
-
-    public void setKuaiQianPayTypeID(Integer kuaiQianPayTypeID) {
-        this.kuaiQianPayTypeID = kuaiQianPayTypeID;
-    }
-
-    public Integer getKuaiQianPayerID() {
-        return kuaiQianPayerID;
-    }
-
-    public void setKuaiQianPayerID(Integer kuaiQianPayerID) {
-        this.kuaiQianPayerID = kuaiQianPayerID;
-    }
-
-    public String getRePayFlag() {
-        return rePayFlag;
-    }
-
-    public void setRePayFlag(String rePayFlag) {
-        this.rePayFlag = rePayFlag;
-    }
-
-    public String getDelFlag() {
-        return delFlag;
-    }
-
-    public void setDelFlag(String delFlag) {
-        this.delFlag = delFlag;
-    }
-
-    public Integer getOrderId() {
-        return orderId;
-    }
-
-    public void setOrderId(Integer orderId) {
-        this.orderId = orderId;
-    }
-
-    public Integer getUserId() {
-        return userId;
-    }
-
-    public void setUserId(Integer userId) {
-        this.userId = userId;
-    }
-
-    public Integer getClubId() {
-        return clubId;
-    }
-
-    public void setClubId(Integer clubId) {
-        this.clubId = clubId;
-    }
-
-    public Integer getOrderSubmitType() {
-        return orderSubmitType;
-    }
-
-    public void setOrderSubmitType(Integer orderSubmitType) {
-        this.orderSubmitType = orderSubmitType;
-    }
-
-    public Integer getOrderType() {
-        return orderType;
-    }
-
-    public void setOrderType(Integer orderType) {
-        this.orderType = orderType;
-    }
-
-    public Double getTotalAmount() {
-        return totalAmount;
-    }
-
-    public void setTotalAmount(Double totalAmount) {
-        this.totalAmount = totalAmount;
-    }
-
-    public Double getDeductionAmount() {
-        return deductionAmount;
-    }
-
-    public void setDeductionAmount(Double deductionAmount) {
-        this.deductionAmount = deductionAmount;
-    }
-
-    public Double getShouldPayAmount() {
-        return shouldPayAmount;
-    }
-
-    public void setShouldPayAmount(Double shouldPayAmount) {
-        this.shouldPayAmount = shouldPayAmount;
-    }
-
-    public Double getActualAmount() {
-        return actualAmount;
-    }
-
-    public void setActualAmount(Double actualAmount) {
-        this.actualAmount = actualAmount;
-    }
-
-    public Double getRefundAmount() {
-        return refundAmount;
-    }
-
-    public void setRefundAmount(Double refundAmount) {
-        this.refundAmount = refundAmount;
-    }
-
-    public Double getPreferential() {
-        return preferential;
-    }
-
-    public void setPreferential(Double preferential) {
-        this.preferential = preferential;
-    }
-
-    public String getFormData() {
-        return formData;
-    }
-
-    public void setFormData(String formData) {
-        this.formData = formData;
-    }
-
-    public String getProberlem() {
-        return proberlem;
-    }
-
-    public void setProberlem(String proberlem) {
-        this.proberlem = proberlem;
-    }
-
-    public Double getUseBalanceAmount() {
-        return useBalanceAmount;
-    }
-
-    public void setUseBalanceAmount(Double useBalanceAmount) {
-        this.useBalanceAmount = useBalanceAmount;
-    }
-
-    public String getCreateBy() {
-        return createBy;
-    }
-
-    public void setCreateBy(String createBy) {
-        this.createBy = createBy;
-    }
-
-    public String getCreateDate() {
-        return createDate;
-    }
-
-    public void setCreateDate(String createDate) {
-        this.createDate = createDate;
-    }
-
-    public String getUpdateBy() {
-        return updateBy;
-    }
-
-    public void setUpdateBy(String updateBy) {
-        this.updateBy = updateBy;
-    }
-
-    public String getUpdateDate() {
-        return updateDate;
-    }
-
-    public void setUpdateDate(String updateDate) {
-        this.updateDate = updateDate;
-    }
-}

src/main/java/com/caimei/mapper/order/OrderMapper.java

@@ -24,4 +24,14 @@ public interface OrderMapper {
     CmOrganizeProducts findCommodity(@Param("productIDs") String productIDs, @Param("shopID") Integer shopID);
 
     BpOrderUserInfo findUserInfo(Integer orderID);
+
+    CmOrder findOrder(Integer orderID);
+
+    List<CmShopOrder> findAllShopOrder(String[] shopOrderIDs);
+
+    List<CmOrderProduct> findOrderProduct(Integer shopOrderID);
+
+    List<CmDiscernReceipt> findDiscernReceipt(Integer orderID);
+
+    List<CmReturnedPurchase> findReturnedPurchase(Integer orderID);
 }

src/main/java/com/caimei/service/order/impl/OrderServiceImpl.java

@@ -119,9 +119,36 @@ public class OrderServiceImpl implements OrderService {
         Map<String, Object> map = new HashMap();
         //收货地址
         BpOrderUserInfo userInfo = orderMapper.findUserInfo(orderID);
-        //订单信息
-
+        //订单信息,运费
+        CmOrder order = orderMapper.findOrder(orderID);
+        order.setOrderMark("#" + order.getOrderID() + "#");
+        //商品信息
+        String[] ShopOrderIDs = {};
+        if (order.getShopOrderIDs().contains(",")) {
+            ShopOrderIDs = order.getShopOrderIDs().split(",");
+        } else {
+            ShopOrderIDs = new String[]{order.getShopOrderIDs()};
+        }
+        List<CmShopOrder> shopOrderList = orderMapper.findAllShopOrder(ShopOrderIDs);
+        for (CmShopOrder shopOrder : shopOrderList) {
+            List<CmOrderProduct> orderProductList = orderMapper.findOrderProduct(shopOrder.getShopOrderID());
+            for (CmOrderProduct orderProduct : orderProductList) {
+                orderProduct.setProductImage(AppUtils.getImageURL("product", orderProduct.getProductImage(), 0, domain));
+            }
+            shopOrder.setCmOrderProducts(orderProductList);
+        }
+        //发票信息
+        UserInvoiceInfo invoice = personalMapper.findInvoice(order.getUserID());
+        //支付记录
+        List<CmDiscernReceipt> discernReceiptList = orderMapper.findDiscernReceipt(orderID);
+        //退款记录
+        List<CmReturnedPurchase> returnedPurchaseList = orderMapper.findReturnedPurchase(orderID);
+        map.put("order", order);
         map.put("userInfo", userInfo);
-        return null;
+        map.put("shopOrderList", shopOrderList);
+        map.put("invoice", invoice);
+        map.put("discernReceiptList", discernReceiptList);
+        map.put("returnedPurchaseList", returnedPurchaseList);
+        return map;
     }
 }

src/main/resources/mapper/OrderMapper.xml

@@ -112,4 +112,68 @@
         WHERE
           orderId = #{orderId}
     </select>
+
+    <select id="findOrder" parameterType="int" resultType="com.caimei.entity.CmOrder">
+        SELECT
+          *
+        FROM
+          cm_order
+        WHERE
+          orderID = #{orderID}
+          AND delFlag = '0'
+    </select>
+
+    <select id="findAllShopOrder" resultType="com.caimei.entity.CmShopOrder">
+        SELECT 
+          cso.*, 
+          s.name AS shopName 
+        FROM 
+          cm_shop_order cso 
+          LEFT JOIN shop s ON cso.shopID = s.shopID 
+        WHERE 
+          cso.shopOrderID IN
+          <foreach collection="array" item="shopOrderID" index="index" open="(" separator="," close=")">
+              #{shopOrderID}
+          </foreach>
+          AND cso.delFlag = '0'
+    </select>
+
+    <select id="findOrderProduct" resultType="com.caimei.entity.CmOrderProduct" parameterType="int">
+        SELECT
+          cop.*,
+          p.mainImage AS productImage
+        FROM
+          cm_order_product cop
+          LEFT JOIN product p ON cop.productID = p.productID
+        WHERE
+          shopOrderID = #{shopOrderID}
+    </select>
+
+    <select id="findDiscernReceipt" parameterType="int" resultType="com.caimei.entity.CmDiscernReceipt">
+        SELECT
+          cdr.*
+        FROM
+          cm_receipt_order_relation cror
+          LEFT JOIN cm_discern_receipt cdr ON cror.receiptID = cdr.id
+        WHERE
+          cror.orderID = #{orderID}
+          AND cror.relationType = '2'
+          AND cror.delFlag = '0'
+          AND cdr.delFlag = '0'
+          AND cdr.receiptStatus = '3'
+        ORDER BY
+          cdr.receiptDate DESC
+    </select>
+
+    <select id="findReturnedPurchase" resultType="com.caimei.entity.CmReturnedPurchase" parameterType="int">
+        SELECT
+          *
+        FROM
+          cm_returned_purchase
+        WHERE
+          orderID = #{orderID}
+          AND STATUS = '2'
+        ORDER BY
+          confirmReturnTime DESC
+    </select>
 </mapper>