Merge remote-tracking branch 'remotes/origin/developer' into developerA

src/main/java/com/caimei/modules/newhome/web/NewPageFloorController.java

@@ -233,7 +233,7 @@ public class NewPageFloorController extends BaseController {
                     templateType = templateType - 50;
                 }
                 if (templateType == 1) {
-                    pcImageSize = "224px*224px";
+                    pcImageSize = "184px*184px";
                     appletsImageSize = "164px*164px";
                 } else if (templateType == 2) {
                     pcImageSize = "384px*268px";

src/main/java/com/caimei/modules/user/web/CmUserBalanceRecordController.java

@@ -1,5 +1,6 @@
 package com.caimei.modules.user.web;
 
+import com.caimei.modules.order.dao.CmDiscernReceiptDao;
 import com.caimei.modules.order.dao.NewOrderDao;
 import com.caimei.modules.order.entity.NewOrder;
 import com.caimei.modules.user.dao.CmUserDao;
@@ -55,6 +56,8 @@ public class CmUserBalanceRecordController extends BaseController {
     private CmUserDao cmUserDao;
     @Resource
     private NewOrderDao newOrderDao;
+    @Resource
+    private CmDiscernReceiptDao cmDiscernReceiptDao;
 
     @ModelAttribute
     public CmUserBalanceRecord get(@RequestParam(required = false) String id) {
@@ -79,6 +82,10 @@ public class CmUserBalanceRecordController extends BaseController {
                     balanceRecord.setCloseReason(order.getCloseReason());
                 }
             }
+            if ("6".equals(balanceRecord.getBalanceType()) || "7".equals(balanceRecord.getBalanceType())) {
+                Integer lastReceiptDetailId = cmDiscernReceiptDao.findOrderLastReceiptDetailId(balanceRecord.getOrderId().toString());
+                balanceRecord.setReceiptId(lastReceiptDetailId);
+            }
         }
         CmUser cmUser = cmNormalUserService.get(String.valueOf(cmUserBalanceRecord.getUserId()));
         model.addAttribute("page", page);

src/main/webapp/WEB-INF/views/modules/cmpage/cmPageActivityForm.jsp

@@ -79,7 +79,7 @@
             <sys:ckfinder input="headImage" type="images" uploadPath="/photo" selectMultiple="false" maxWidth="100" maxHeight="100"/>
         </div>
         <div class="controls" style="padding-top: 20px;">
-        <label style="color:#D0D0D0 ;">尺寸：1190 * 420 / PX(移动端:比例缩放)</label>
+        <label style="color:#D0D0D0 ;">建议图片尺寸1920*510px</label>
         </div>
     </div>
     <div class="control-group">
@@ -89,13 +89,13 @@
             <sys:ckfinder input="crmHeadImage" type="images" uploadPath="/photo" selectMultiple="false" maxWidth="100" maxHeight="100"/>
         </div>
         <div class="controls" style="padding-top: 20px;">
-            <label style="color:#D0D0D0 ;">尺寸：750 / PX</label>
+            <label style="color:#D0D0D0 ;">建议图片尺寸750px*366px</label>
         </div>
     </div>
     <div class="control-group">
         <label class="control-label"></span>banner跳转链接：</label>
         <div class="controls">
-            <form:input path="headLink" htmlEscape="false" maxlength="255" class="input-xlarge url"/>
+            <form:input path="headLink" htmlEscape="false" maxlength="255" placeholder="输入URL地址" class="input-xlarge url"/>
         </div>
     </div>
     <div class="control-group">

src/main/webapp/WEB-INF/views/modules/user/cmUserBalanceRecordList.jsp

@@ -140,7 +140,7 @@
 								<a href="${ctx}/order/detail?id=${cmUserBalanceRecord.orderId}">余额抵扣</a>
 							</c:if>
 							<c:if test="${cmUserBalanceRecord.balanceType eq 2 }">
-								<font  title="暂无详情，不可查看" >多收款退到余额</font>
+								<a href="${ctx}/order/cmDiscernReceipt/detail?id=${cmUserBalanceRecord.receiptId}">多收款退到余额</a>
 							</c:if>
 							<c:if test="${cmUserBalanceRecord.balanceType eq 3 }">
 								<a href="${ctx}/bulkpurchase/cmRefundsProduct/toRecturnRecord.rpc?id=${cmUserBalanceRecord.returnedId}&orderID=${cmUserBalanceRecord.orderId}">申请退款</a>
@@ -154,10 +154,10 @@
 								<a href="${ctx}/user/cmUserBalanceRecord/cancelWithdrawals?id=${cmUserBalanceRecord.id}" onclick="return confirmx('确定撤销本次提现吗?', this.href)"><font color="red">撤销提现</font></a>
 							</c:if>
 							<c:if test="${cmUserBalanceRecord.balanceType eq 6 }">
-								<a href="${ctx}/order/detail?id=${cmUserBalanceRecord.orderId}">订金订单充值</a>
+								<a href="${ctx}/order/cmDiscernReceipt/detail?id=${cmUserBalanceRecord.receiptId}">订金订单充值</a>
 							</c:if>
 							<c:if test="${cmUserBalanceRecord.balanceType eq 7 }">
-								<a href="${ctx}/order/detail?id=${cmUserBalanceRecord.orderId}">余额订单充值</a>
+								<a href="${ctx}/order/cmDiscernReceipt/detail?id=${cmUserBalanceRecord.receiptId}">余额订单充值</a>
 							</c:if>
 							<c:if test="${cmUserBalanceRecord.balanceType eq 8 }">
 								<a href="${ctx}/bulkpurchase/cmRefundsProduct/toRecturnRecord.rpc?id=${cmUserBalanceRecord.returnedId}&orderID=${cmUserBalanceRecord.orderId}">订金订单退款</a>