修改退款收货人机构名取值

src/main/java/com/caimei/modules/bulkpurchase/web/CmRefundsProductController.java

@@ -243,13 +243,16 @@ public class CmRefundsProductController extends BaseController {
             cmReturnedPurchase.setRefundFee(refundFee);
             //针对订金订单处理
             Double ableUserMoney = 0d;
-            if (newOrder.getRechargeGoods() != null) {
-                CmUser user = cmUserDao.get(newOrder.getUserID().toString());
-                if (user != null && user.getAbleUserMoney() != null) {
-                    ableUserMoney = user.getAbleUserMoney();
-                }
-                if (ableUserMoney < refundFee) {
-                    cmReturnedPurchase.setRefundFee(ableUserMoney);
+            CmUser user = cmUserDao.get(newOrder.getUserID().toString());
+            if (user != null) {
+                newOrder.setBuyer(user.getName());
+                if (newOrder.getRechargeGoods() != null) {
+                    if (user.getAbleUserMoney() != null) {
+                        ableUserMoney = user.getAbleUserMoney();
+                    }
+                    if (ableUserMoney < refundFee) {
+                        cmReturnedPurchase.setRefundFee(ableUserMoney);
+                    }
                 }
             }
             BpClause bpClause = new BpClause();

src/main/java/com/caimei/modules/order/service/NewOrderService.java

@@ -866,6 +866,13 @@ public class NewOrderService extends CrudService<NewOrderDao, NewOrder> {
     @Override
     public NewOrder get(String id) {
         NewOrder newOrder = super.get(id);
+        CmUser user = cmUserDao.get(newOrder.getUserID().toString());
+        if (user != null) {
+            //查询用户余额,机构名
+            newOrder.setBuyer(user.getName());
+            Double ableUserMoney = user.getAbleUserMoney() == null ? 0d : user.getAbleUserMoney();
+            newOrder.setAbleUserMoney(ableUserMoney);
+        }
         List<Integer> l = new ArrayList<>();
         l.add(newOrder.getOrderID());
         List<Integer> orderIds = cmDiscernReceiptDao.findRebateOrderID(l);

src/main/java/com/caimei/modules/order/web/NewOrderController.java

@@ -1211,11 +1211,6 @@ public class NewOrderController extends BaseController {
                 }
             }
         }
-        //查询用户余额
-        CmUser user = cmUserDao.get(order.getUserID().toString());
-        Double ableUserMoney = user.getAbleUserMoney() == null ? 0d : user.getAbleUserMoney();
-        order.setAbleUserMoney(ableUserMoney);
-        order.setBuyer(user.getName());
 
         model.addAttribute("order", order);
         if ("0".equals(order.getStatus())) {

src/main/webapp/WEB-INF/views/modules/bulkpurchase/applyRefoundForm.jsp

@@ -415,7 +415,7 @@
         </tr>
         <tr>
             <td>
-            机构：${order.bpOrderUserinfo.name}<c:if test="${order.organizeID == 3}"><em class="weishaIcon">维沙</em></c:if>
+            机构：${order.buyer}<c:if test="${order.organizeID == 3}"><em class="weishaIcon">维沙</em></c:if>
             </td>
             <td>
             收货人：${order.bpOrderUserinfo.shouHuoRen}(${order.bpOrderUserinfo.mobile})

src/main/webapp/WEB-INF/views/modules/bulkpurchase/orderConfirmReturnRecord.jsp

@@ -115,104 +115,13 @@
 
 </ul>
 <br/>
-<%--<c:if test="${cmReturnedPurchaseList[0].status eq 1}">--%>
-<%--<input type="button" onclick="cancelApply1(${cmReturnedPurchase.id});" name="cancelApply" id="cancelApply" value="取消申请"/>--%>
-<%--<input id="btnSubmit" class="btn btn-primary" type="submit" value="审核"/>--%>
 <div class="refund-btn-top">
     <input type="button" class="btn btn-primary" onclick="window.location.href='${ctx}/order/cmReturnedPurchase/'"
            value="返回">
     <input type="button" class="btn btn-primary print-now" value="打印">
 </div>
-<%--</c:if>--%>
 <p style="text-align: center"><font size="5px" bold="1" style="align-content: center"><b>退款单</b></font></p>
 <c:forEach items="${cmReturnedPurchaseList}" var="cmReturnedPurchase" varStatus="cmReturnedPurchaseStatus">
-    <%--审核模块--%>
-    <%--<c:if test="${not empty cmReturnedPurchase.confirmReturnTime}">
-        <table id="contentTable" class="table table-striped table-bordered table-condensed">
-            <tr>
-                <td colspan="2">
-                    <b>审核信息</b>
-                </td>
-            </tr>
-            <tr>
-                <td>
-                    审核人：${cmReturnedPurchase.reviewUserName}<br>
-                    审核时间：${cmReturnedPurchase.confirmReturnTime}<br>
-                    &lt;%&ndash;<textarea id='remarks' readonly name='reviewRemarks' rows='4' cols='50' style="width: 709px" maxlength="200" >${cmReturnedPurchase.reviewRemarks}</textarea><br>&ndash;%&gt;
-                    审核备注：
-                    <c:if test="${not empty cmReturnedPurchase.reviewRemarks}">
-                        ${cmReturnedPurchase.reviewRemarks}
-                    </c:if>
-                    <c:if test="${empty cmReturnedPurchase.reviewRemarks}">
-                        无
-                    </c:if>
-                    <br>
-                    <c:if test="${not empty cmReturnedPurchase.reviewImage1 || not empty cmReturnedPurchase.reviewImage2  || not empty cmReturnedPurchase.reviewImage3  || not empty cmReturnedPurchase.reviewImage4  || not empty cmReturnedPurchase.reviewImage5}">
-                        审核凭证：
-                        <c:if test="${not empty cmReturnedPurchase.reviewImage1}">
-                            <img class="enlarge-pic" style="height: 70px;width: 65px" src="${cmReturnedPurchase.reviewImage1}">
-                        </c:if>
-                        <c:if test="${not empty cmReturnedPurchase.reviewImage2}">
-                            <img class="enlarge-pic" style="height: 70px;width: 65px" src="${cmReturnedPurchase.reviewImage2}">
-                        </c:if>
-                        <c:if test="${not empty cmReturnedPurchase.reviewImage3}">
-                            <img class="enlarge-pic" style="height: 70px;width: 65px" src="${cmReturnedPurchase.reviewImage3}">
-                        </c:if>
-                        <c:if test="${not empty cmReturnedPurchase.reviewImage4}">
-                            <img class="enlarge-pic" style="height: 70px;width: 65px" src="${cmReturnedPurchase.reviewImage4}">
-                        </c:if>
-                        <c:if test="${not empty cmReturnedPurchase.reviewImage5}">
-                            <img class="enlarge-pic" style="height: 70px;width: 65px" src="${cmReturnedPurchase.reviewImage5}">
-                        </c:if>
-                    </c:if>
-                </td>
-            </tr>
-        </table>
-    </c:if>
-
-    &lt;%&ndash;申请模块&ndash;%&gt;
-    <table id="contentTable" class="table table-striped table-bordered table-condensed">
-        <tr>
-            <td colspan="2">
-                <b>申请信息</b>
-            </td>
-        </tr>
-        <tr>
-            <td>
-            申请人：${cmReturnedPurchase.applicationUserName}<br>
-            申请时间：${cmReturnedPurchase.returnTime}<br>
-
-            退款备注：
-                <c:if test="${empty cmReturnedPurchase.remarks}">
-                    无
-                </c:if>
-                <c:if test="${not empty cmReturnedPurchase.remarks}">
-                    &lt;%&ndash;<textarea id='remarks' readonly name='remarks' rows='4' cols='50' style="width: 709px" maxlength="200" >${cmReturnedPurchase.remarks}</textarea>&ndash;%&gt;
-                    ${cmReturnedPurchase.remarks}
-                </c:if>
-                <br>
-                <c:if test="${not empty cmReturnedPurchase.image1 || not empty cmReturnedPurchase.image2 || not empty cmReturnedPurchase.image3 || not empty cmReturnedPurchase.image4 || not empty cmReturnedPurchase.image5}">
-                    申请凭证：
-                    <c:if test="${not empty cmReturnedPurchase.image1}">
-                        <img class="enlarge-pic" style="height: 70px;width: 65px" src="${cmReturnedPurchase.image1}">
-                    </c:if>
-                    <c:if test="${not empty cmReturnedPurchase.image2}">
-                        <img class="enlarge-pic" style="height: 70px;width: 65px" src="${cmReturnedPurchase.image2}">
-                    </c:if>
-                    <c:if test="${not empty cmReturnedPurchase.image3}">
-                        <img class="enlarge-pic" style="height: 70px;width: 65px" src="${cmReturnedPurchase.image3}">
-                    </c:if>
-                    <c:if test="${not empty cmReturnedPurchase.image4}">
-                        <img class="enlarge-pic" style="height: 70px;width: 65px" src="${cmReturnedPurchase.image4}">
-                    </c:if>
-                    <c:if test="${not empty cmReturnedPurchase.image5}">
-                        <img class="enlarge-pic" style="height: 70px;width: 65px" src="${cmReturnedPurchase.image5}">
-                    </c:if>
-                </c:if>
-            </td>
-        </tr>
-    </table>
---%>
     <div id="enlarge-box">
         <img src="" alt="">
     </div>
@@ -413,7 +322,7 @@
     </tr>
     <tr>
         <td>
-            机构：${order.bpOrderUserinfo.name}<c:if test="${order.organizeID == 3}"><em class="weishaIcon">维沙</em></c:if>
+            机构：${order.buyer}<c:if test="${order.organizeID == 3}"><em class="weishaIcon">维沙</em></c:if>
         </td>
         <td>
             收货人：${order.bpOrderUserinfo.shouHuoRen}(${order.bpOrderUserinfo.mobile})

src/main/webapp/WEB-INF/views/modules/bulkpurchase/orderReturnRecord.jsp

@@ -439,7 +439,7 @@
             </tr>
             <tr>
                 <td>
-                    买家：${order.bpOrderUserinfo.name}<c:if test="${order.organizeID == 3}"><em class="weishaIcon">维沙</em></c:if>
+                    机构：${order.buyer}<c:if test="${order.organizeID == 3}"><em class="weishaIcon">维沙</em></c:if>
                 </td>
                 <td>
                     收货人：${order.bpOrderUserinfo.shouHuoRen}(${order.bpOrderUserinfo.mobile})

src/main/webapp/WEB-INF/views/modules/bulkpurchase/orderReviewReturnRecord.jsp

@@ -401,7 +401,7 @@
     </tr>
     <tr>
         <td>
-            买家：${order.bpOrderUserinfo.name}<c:if test="${order.organizeID == 3}"><em class="weishaIcon">维沙</em></c:if>
+            机构：${order.buyer}<c:if test="${order.organizeID == 3}"><em class="weishaIcon">维沙</em></c:if>
         </td>
         <td>
             收货人：${order.bpOrderUserinfo.shouHuoRen}(${order.bpOrderUserinfo.mobile})

src/main/webapp/WEB-INF/views/modules/order/newOrderList.jsp

@@ -1029,7 +1029,7 @@
                 <div class="operation-block">
                     <shiro:hasPermission name="order:order:edit">
                         <%--包含订单充值商品就不显示--%>
-                        <c:if test="${!order.rechargeGoods}">
+                        <c:if test="${empty order.rechargeGoods}">
                             <c:if test="${order.status == 11 || order.status == 12 || order.status == 21 || order.status == 22 || order.status == 31 || order.status == 32}">
                                 <a href="${ctx}/order/toDeliveryPage?id=${order.orderID}">发货</a>
                             </c:if>
@@ -1054,7 +1054,7 @@
 				            order.status eq 23 || order.status eq 0}">
                                 <c:if test="${empty order.rechargeGoods && (order.ableUserMoney > 0 || order.status eq 0)}">
                                     <c:if test="${order.postageOrderFlag == 0 && order.secondHandOrderFlag != 1}">
-                                        <a href="${ctx}/order/form?id=${order.orderID}">修改订单${order.rechargeGoods}</a>
+                                        <a href="${ctx}/order/form?id=${order.orderID}">修改订单</a>
                                     </c:if>
                                     <c:if test="${order.postageOrderFlag == 0 && order.secondHandOrderFlag == 1}">
                                         <a href="${ctx}/order/secondeProductOrderForm?id=${order.orderID}">修改订单</a>
@@ -1122,7 +1122,7 @@
                         <a href="${ctx}/order/cmOrderRemark/remarksViewNew.rpc?orderID=${order.orderID}&source=1">订单备注</a>
                         <%--                        <a href="javascript:void(0);" onclick="remarks('${order.orderID}','')">备注</a>--%>
                         <%--包含订单充值商品就不显示--%>
-                        <c:if test="${!order.rechargeGoods}">
+                        <c:if test="${empty order.rechargeGoods}">
                             <c:if test="${order.status ne 0 && order.status ne 11 && order.status ne 21 && order.status ne 6 && order.status ne 4}">
                                 <a href="${ctx}/order/logisticsDetails?orderID=${order.orderID}">发货记录</a>
                             </c:if>

src/main/webapp/WEB-INF/views/modules/order/orderDetail.jsp

@@ -277,7 +277,7 @@
             <div class="operation-block">
                 <shiro:hasPermission name="order:order:edit">
                     <%--包含订单充值商品就不显示--%>
-                    <c:if test="${!order.rechargeGoods}">
+                    <c:if test="${empty order.rechargeGoods}">
                         <c:if test="${order.status == 11 || order.status == 12 || order.status == 21 || order.status == 22 || order.status == 31 || order.status == 32}">
                             <a href="${ctx}/order/toDeliveryPage?id=${order.orderID}">发货</a>
                         </c:if>
@@ -363,7 +363,7 @@
                     <%--                        <a href="javascript:void(0);" onclick="remarks('${order.orderID}','')">备注</a>--%>
                     <a href="${ctx}/order/cmOrderRemark/remarksViewNew.rpc?orderID=${order.orderID}&source=2">订单备注</a>
                     <%--包含订单充值商品就不显示--%>
-                    <c:if test="${!order.rechargeGoods}">
+                    <c:if test="${empty order.rechargeGoods}">
                         <c:if test="${order.status ne 0 && order.status ne 11 && order.status ne 21 && order.status ne 6 && order.status ne 4}">
                             <a href="${ctx}/order/logisticsDetails?orderID=${order.orderID}">发货记录</a>
                         </c:if>