订单。用户信息

src/main/java/com/izouma/awesomeadmin/dao/UserOrderMapper.xml

@@ -789,6 +789,11 @@
     <resultMap id="AllInfoForGetOne" type="com.izouma.awesomeadmin.model.UserOrder" extends="BaseResultMap">
 
 
+        <association property="userInfo"
+                     javaType="com.izouma.awesomeadmin.model.UserInfo"
+                     select="com.izouma.awesomeadmin.dao.UserInfoMapper.queryUserInfo"
+                     column="{ id = user_id }"/>
+
         <association property="productInfo"
                      javaType="com.izouma.awesomeadmin.model.ProductInfo"
                      select="com.izouma.awesomeadmin.dao.ProductInfoMapper.queryProductInfo"

src/main/java/com/izouma/awesomeadmin/model/UserOrder.java

@@ -52,6 +52,8 @@ public class UserOrder {
 
     private List<OrderRepair> orderRepairList;
 
+    private UserInfo userInfo;
+
     private String searchKey;
 
     /**
@@ -351,5 +353,13 @@ public class UserOrder {
     public void setOrderRepairList(List<OrderRepair> orderRepairList) {
         this.orderRepairList = orderRepairList;
     }
+
+    public UserInfo getUserInfo() {
+        return userInfo;
+    }
+
+    public void setUserInfo(UserInfo userInfo) {
+        this.userInfo = userInfo;
+    }
 }
 

src/main/java/com/izouma/awesomeadmin/service/impl/UserOrderServiceImpl.java

@@ -278,6 +278,7 @@ public class UserOrderServiceImpl implements UserOrderService {
                 //积分兑换区 只能用商城积分
                 MemberPoint memberPoint = new MemberPoint();
                 memberPoint.setCreateUser("系统");
+                memberPoint.setOrderId(orderId);
                 memberPoint.setUserId(userOrder.getUserId() + "");
                 memberPoint.setMoney(String.valueOf(-point + 0.0));
                 memberPoint.setBalance(String.valueOf(moneyPoint - point));
@@ -294,6 +295,7 @@ public class UserOrderServiceImpl implements UserOrderService {
 
                 MemberCoin memberCoin = new MemberCoin();
                 memberCoin.setCreateUser("系统");
+                memberCoin.setOrderId(orderId);
                 memberCoin.setUserId(userOrder.getUserId() + "");
                 memberCoin.setMoney(String.valueOf(-coin + 0.0));
                 memberCoin.setBalance(String.valueOf(moneyCoin - coin));