导表/付款抵扣修改

src/main/java/com/caimei/modules/order/entity/CmMainReceiptExport.java

@@ -4,6 +4,7 @@ public class CmMainReceiptExport {
 	private String orderID;		// 主订单ID
 
 	private String userName;	//客户名
+	private String productNames; //商品名称
 	private String receiptDate;	//收款时间
 	private String payType;		//收款账号
 	private Double associateAmount;	//收款金额
@@ -11,6 +12,7 @@ public class CmMainReceiptExport {
 	private String status;      //订单状态
 	private String relationType; //关系类型：1返佣订单（返佣款）、2非返佣订单（订单款或者非订单款）
 	private String receiptAmount; //返佣订单收款金额
+	private String receiptType;		// 收款类型
 
 	public String getReceiptAmount() {
 		return receiptAmount;
@@ -83,4 +85,20 @@ public class CmMainReceiptExport {
 	public void setShopOrderID(String shopOrderID) {
 		this.shopOrderID = shopOrderID;
 	}
+
+	public String getProductNames() {
+		return productNames;
+	}
+
+	public void setProductNames(String productNames) {
+		this.productNames = productNames;
+	}
+
+	public String getReceiptType() {
+		return receiptType;
+	}
+
+	public void setReceiptType(String receiptType) {
+		this.receiptType = receiptType;
+	}
 }

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

@@ -246,13 +246,20 @@ public class CmDiscernReceiptController extends BaseController {
 
             List<CmMainReceiptExport> list = cmDiscernReceiptService.exportTest(cmDiscernReceipt);
             for (CmMainReceiptExport bean : list) {
+                String productNames = bean.getProductNames();
+                String[] productNameArr = productNames.split(",");
+                for (int i = 0; i < productNameArr.length; i++) {
+                    productNameArr[i] = (i + 1) + "." + productNameArr[i] + "\r\n";
+                    productNames = i==0?productNameArr[i]:productNames + productNameArr[i];
+                }
+                bean.setProductNames(productNames);
                 bean.setPayType(OrderUtil.getPayTypeStr(bean.getPayType()));
             }
             //返佣数据
             List<CmMainReceiptExport> list1 = cmDiscernReceiptService.exportRebate(cmDiscernReceipt);
             for (CmMainReceiptExport export : list1) {
                 export.setPayType(OrderUtil.getPayTypeStr(export.getPayType()));
-                export.setOrderID(export.getOrderID() + "(返佣订单)");
+                export.setOrderID(export.getOrderID() + ("5".equals(export.getReceiptType())?"(供应商退款订单)":"(返佣订单)"));
                 list.add(export);
             }
             //非订单款
@@ -291,15 +298,15 @@ public class CmDiscernReceiptController extends BaseController {
             List<CmReceiptExportData> ListExportData2 = getListExportData(cmDiscernReceipt);
 
             objects.add(list);
-            objects.add(ListExportData1);
+            /*objects.add(ListExportData1);
             objects.add(ListExportData2);
             objects.add(getListOrderPayment(cmDiscernReceipt));
-            objects.add(purchases);
+            objects.add(purchases);*/
             listSheetNames.add("收款表");
-            listSheetNames.add("部分收款");
+            /*listSheetNames.add("部分收款");
             listSheetNames.add("已收款");
             listSheetNames.add("返佣订单");
-            listSheetNames.add("退款记录表");
+            listSheetNames.add("退款记录表");*/
 
             new ExcelUtil().createMultipleSheetsExcel(templateFileName, fileName, listSheetNames, objects, response);
         } catch (Exception e) {

src/main/resources/mappings/modules/order/CmDiscernReceiptMapper.xml

@@ -163,6 +163,7 @@
     <select id="exportTest" resultType="com.caimei.modules.order.entity.CmMainReceiptExport">
         SELECT
         r.orderID,
+        (select group_concat(distinct p.name) from product p left join cm_order_product cop on p.productID = cop.productID where cop.orderID = o.orderID group by cop.orderID) as productNames,
         IF(u.userIdentity = 2,u.name,u.userName) AS userName,
         d.receiptDate,
         d.payType,

src/main/webapp/WEB-INF/views/modules/cmpage/cmPageBeautyForm.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 ;">建议图片尺寸1920*510px</label>
+        <label style="color:#D0D0D0 ;">建议图片尺寸1920*480px</label>
         </div>
     </div>
     <div class="control-group">
@@ -89,7 +89,7 @@
             <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 ;">建议图片尺寸750px*366px</label>
+            <label style="color:#D0D0D0 ;">建议图片尺寸1000px*450px</label>
         </div>
     </div>
     <div class="control-group">

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

@@ -297,10 +297,10 @@
 			</c:if>
 			<div>
 				<label>欠款抵扣：</label>
-				总欠款：<span id="rebateAmount">${empty cmPayShop.rebateAmount ? 0 : cmPayShop.rebateAmount}</span>，
-				可抵扣欠款：<span id="ableRebateAmount">${empty cmPayShop.ableRebateAmount ? 0 : cmPayShop.ableRebateAmount}</span>，
+				总欠款：<span id="rebateAmount">${empty cmPayShop.rebateAmount ? (cmPayShop.status == '1'?cmPayShop.balancePayFee:0) : cmPayShop.rebateAmount + (cmPayShop.status == '1'?cmPayShop.balancePayFee:0)}</span>，
+				可抵扣欠款：<span id="ableRebateAmount">${empty cmPayShop.ableRebateAmount ? 0 : cmPayShop.ableRebateAmount }</span>，
 				使用：${cmPayShop.balancePayFee}，
-				剩余：<span id="remainingBalance">${(empty cmPayShop.rebateAmount ? 0 : cmPayShop.rebateAmount) - (empty cmPayShop.balancePayFee ? 0 : cmPayShop.balancePayFee)}</span>
+				剩余：<span id="remainingBalance"> ${cmPayShop.status == '2'?((empty cmPayShop.ableRebateAmount ? 0:cmPayShop.ableRebateAmount)-cmPayShop.balancePayFee): (empty cmPayShop.ableRebateAmount ? 0 : cmPayShop.ableRebateAmount)}</span>
 			</div>
 			<c:if test="${cmPayShop.payType ne '6'}">
 				<div>

src/main/webapp/WEB-INF/views/modules/product/cmSecondHandDetailForm.jsp

@@ -348,9 +348,9 @@
 		<label class="control-label"><font color="red">*</font>商品可见度：</label>
 		<div class="controls">
 			<form:select path="visibility" class="input-large required" id="visibility">
-				<form:option value="3" label="所有人可见"/>
-				<form:option value="2" label="所有机构可见"/>
 				<form:option value="1" label="仅会员机构可见"/>
+				<form:option value="2" label="所有机构可见"/>
+				<form:option value="3" label="所有人可见"/>
 			</form:select>
 		</div>
 	</div>