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

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);
@@ -904,6 +911,10 @@ public class NewOrderService extends CrudService<NewOrderDao, NewOrder> {
                                 orderProduct.setOrderProductLadderPriceList(ladderPriceList);
                             }
                         }
+                        //充值定金商品
+                        if (6060 == orderProduct.getProductID()) {
+                            newOrder.setRechargeGoods(1);
+                        }
                     });
                     list.addAll(pList);
                     shopOrder.setNewOrderProducts(pList);
@@ -1573,6 +1584,13 @@ public class NewOrderService extends CrudService<NewOrderDao, NewOrder> {
                 if (null != newShopOrder) {
                     shopOrder.setFee(newShopOrder.getFee());
                     shopOrder.setShouldPayProduct(newShopOrder.getShouldPayProduct());
+                    List<NewOrderProduct> pList = newOrderProductDao.findListByShopOrderID(shopOrderID);
+                    pList.forEach(orderProduct -> {
+                        //充值定金商品
+                        if (6060 == orderProduct.getProductID()) {
+                            order.setRechargeGoods(1);
+                        }
+                    });
                 } else {
                     shopOrder.setFee(0d);
                     shopOrder.setShouldPayProduct(0d);

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

@@ -93,6 +93,7 @@ public class CmDiscernReceiptController extends BaseController {
         //获取组织列表
         List<CmUserOrganize> cmUserOrganizeList = cmUserOrganizeService.findOrganize();
         model.addAttribute("cmUserOrganizeList", cmUserOrganizeList);
+        //
         model.addAttribute("page", page);
         return "modules/order/cmDiscernReceiptList";
     }

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

@@ -1211,10 +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);
 
         model.addAttribute("order", order);
         if ("0".equals(order.getStatus())) {

src/main/java/com/caimei/modules/weisha/service/CmOrganizeProductService.java

@@ -46,6 +46,7 @@ public class CmOrganizeProductService extends CrudService<CmOrganizeProductDao,
 		List<CmOrganizeProduct> productList = cmOrganizeProductDao.findList(cmOrganizeProduct);
 		DecimalFormat decimalFormat = new DecimalFormat("0000");
 		productList.forEach(product->{
+			product.setProductImage(AppUtils.getImageURL("product", product.getProductImage(), 0, ""));
 			//格式化组织商品Id
 			product.setId(decimalFormat.format(Integer.parseInt(product.getId())));
 			//比例成本价加上机构税费处理

src/main/java/com/caimei/modules/zplm/entity/CmBrandAuthProduct.java

@@ -24,6 +24,8 @@ public class CmBrandAuthProduct extends DataEntity<CmBrandAuthProduct> {
 	private Date createTime;		// 创建时间
 	private String createUserName;	//创建人名称
 
+	private String displaySnCode; 	//二维码展示SN码
+
 
     private List<CmBrandProductParam> paramList;      //商品参数列表
 	
@@ -103,4 +105,12 @@ public class CmBrandAuthProduct extends DataEntity<CmBrandAuthProduct> {
     public void setParamList(List<CmBrandProductParam> paramList) {
         this.paramList = paramList;
     }
+
+	public String getDisplaySnCode() {
+		return displaySnCode;
+	}
+
+	public void setDisplaySnCode(String displaySnCode) {
+		this.displaySnCode = displaySnCode;
+	}
 }

src/main/java/com/caimei/modules/zplm/service/CmBrandAuthProductService.java

@@ -41,7 +41,17 @@ public class CmBrandAuthProductService extends CrudService<CmBrandAuthProductDao
 	}
 	
 	public Page<CmBrandAuthProduct> findPage(Page<CmBrandAuthProduct> page, CmBrandAuthProduct cmBrandAuthProduct) {
-		return super.findPage(page, cmBrandAuthProduct);
+		Page<CmBrandAuthProduct> productPage = super.findPage(page, cmBrandAuthProduct);
+		productPage.getList().forEach(product->{
+			String displaySnCode = product.getSnCode();
+			if (displaySnCode.length() > 6) {
+				String prefixStr = displaySnCode.substring(0, 2);
+				String suffixStr = displaySnCode.substring(displaySnCode.length() - 4);
+				displaySnCode = prefixStr + "******" + suffixStr;
+			}
+			product.setDisplaySnCode(displaySnCode);
+		});
+		return productPage;
 	}
 	
 	@Transactional(readOnly = false)

src/main/java/com/caimei/modules/zplm/web/CmBrandAuthProductController.java

@@ -6,7 +6,9 @@ import javax.servlet.http.HttpServletResponse;
 
 import com.caimei.modules.live.entity.NewPageLive;
 import com.caimei.modules.zplm.dao.CmBrandAuthProductDao;
+import com.caimei.modules.zplm.entity.CmBrandAuth;
 import com.caimei.modules.zplm.entity.CmBrandProductParam;
+import com.caimei.modules.zplm.service.CmBrandAuthService;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
@@ -37,6 +39,8 @@ public class CmBrandAuthProductController extends BaseController {
 
 	@Autowired
 	private CmBrandAuthProductService cmBrandAuthProductService;
+	@Autowired
+	private CmBrandAuthService cmBrandAuthService;
 	@Resource
 	private CmBrandAuthProductDao cmBrandAuthProductDao;
 	
@@ -54,7 +58,12 @@ public class CmBrandAuthProductController extends BaseController {
 	
 	@RequestMapping(value = {"list", ""})
 	public String list(CmBrandAuthProduct cmBrandAuthProduct, HttpServletRequest request, HttpServletResponse response, Model model) {
-		Page<CmBrandAuthProduct> page = cmBrandAuthProductService.findPage(new Page<CmBrandAuthProduct>(request, response), cmBrandAuthProduct); 
+		Page<CmBrandAuthProduct> page = cmBrandAuthProductService.findPage(new Page<CmBrandAuthProduct>(request, response), cmBrandAuthProduct);
+		CmBrandAuth cmBrandAuth = new CmBrandAuth();
+		if (cmBrandAuthProduct.getAuthId() != null) {
+			cmBrandAuth = cmBrandAuthService.get(cmBrandAuthProduct.getAuthId().toString());
+		}
+		model.addAttribute("cmBrandAuth", cmBrandAuth);
 		model.addAttribute("page", page);
 		return "modules/zplm/cmBrandAuthProductList";
 	}
@@ -104,9 +113,7 @@ public class CmBrandAuthProductController extends BaseController {
 		}
 		CmBrandAuthProduct sameProduct = cmBrandAuthProductDao.findSameProduct(cmBrandAuthProduct);
 		if (null != sameProduct) {
-			if (cmBrandAuthProduct.getName().equals(sameProduct.getName())) {
-				model.addAttribute("errorMsg", "该品牌授权下的"+sameProduct.getName()+"商品名称已存在，请勿重复添加");
-			}else if (cmBrandAuthProduct.getSnCode().equals(sameProduct.getSnCode())) {
+			if (cmBrandAuthProduct.getSnCode().equals(sameProduct.getSnCode())) {
 				model.addAttribute("errorMsg", "该品牌授权下的"+sameProduct.getSnCode()+"商品SN码已存在，请勿重复添加");
 			}
 			return true;

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

@@ -90,6 +90,9 @@
             <if test="payWay != null and payWay != ''">
                 AND a.payWay = #{payWay}
             </if>
+            <if test="payType != null and payType != ''">
+                AND a.payType = #{payType}
+            </if>
             <if test="receiptType != null and receiptType != ''">
                 AND a.receiptType = #{receiptType}
             </if>

src/main/resources/mappings/modules/zplm/CmBrandAuthProductMapper.xml

@@ -73,7 +73,7 @@
 	</select>
 	<select id="findSameProduct" resultType="com.caimei.modules.zplm.entity.CmBrandAuthProduct">
 		select name,snCode from cm_brand_auth_product
-		where (name = #{name} or snCode = #{snCode}) and authId = #{authId}
+		where snCode = #{snCode} and authId = #{authId}
 		<if test="id != null and id != ''">
 			and id != #{id}
 		</if>

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

@@ -189,7 +189,7 @@
            class="form-horizontal">
 
     <form:hidden path="orderID" value="${order.orderID}"/>
-    <form:hidden path="userID" value="${order.bpOrderUserinfo.userId}"/>
+    <form:hidden path="userID" value="${order.userID}"/>
     <form:hidden path="id" value="${cmReturnedPurchase.id}"/>
     <%--订单收款状态：1待收款，2部分收款，3已收款--%>
     <input type="hidden" id="receiptStatus" value="${order.receiptStatus}"/>
@@ -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/checkPaymentOrder.jsp

@@ -187,30 +187,34 @@
                         <c:if test="${s.status eq 0 || s.status eq 4 || s.status eq 5 || s.status eq 6 || s.status eq 7}">${fns:getDictLabel(s.status,"order_detail_status","" )}</c:if>
                     </td>
                     <td>
-                        <c:if test="${s.receiptStatus == 1}">
-                            <font color="red">待收款</font>
-                        </c:if>
-                        <c:if test="${s.receiptStatus == 2}">
-                            <font color="#ff8c00">部分收款</font>
-                        </c:if>
-                        <c:if test="${s.receiptStatus == 3}">
-                            <font color="green">已收款</font>
-                        </c:if>
-                        <c:if test="${s.receiptStatus == 4}">
-                            ----
-                        </c:if>
+                        <a href="${ctx}/bulkpurchase/cmRefundsProduct/toRefundRecord.rpc?orderID=${s.orderID}&from=1"  style="text-decoration: underline">
+                            <c:if test="${s.receiptStatus == 1}">
+                                <font color="red">待收款</font>
+                            </c:if>
+                            <c:if test="${s.receiptStatus == 2}">
+                                <font color="#ff8c00">部分收款</font>
+                            </c:if>
+                            <c:if test="${s.receiptStatus == 3}">
+                                <font color="green">已收款</font>
+                            </c:if>
+                            <c:if test="${s.receiptStatus == 4}">
+                                ----
+                            </c:if>
+                        </a>
                     </td>
                     <td>
                         <fmt:formatNumber value="${s.payableAmount}" type="number" pattern="#,##0.00"/>
                         (余额抵扣:<fmt:formatNumber value="${s.balancePayFee}" type="number" pattern="#,##0.00"/>)
                     </td>
                     <td>
-                        <c:if test="${s.alreadyReceipt eq '----'}">
-                            ${s.alreadyReceipt}
-                        </c:if>
-                        <c:if test="${s.alreadyReceipt ne '----'}">
-                            <fmt:formatNumber value="${s.alreadyReceipt}" type="number" pattern="#,##0.00"/>
-                        </c:if>
+                        <a href="${ctx}/bulkpurchase/cmRefundsProduct/toRefundRecord.rpc?orderID=${s.orderID}&from=1"  style="text-decoration: underline">
+                            <c:if test="${s.alreadyReceipt eq '----'}">
+                                ${s.alreadyReceipt}
+                            </c:if>
+                            <c:if test="${s.alreadyReceipt ne '----'}">
+                                <fmt:formatNumber value="${s.alreadyReceipt}" type="number" pattern="#,##0.00"/>
+                            </c:if>
+                        </a>
                     </td>
                     <td>
                         <c:if test="${s.payStatus == 1 || empty s.payStatus || s.payStatus == 0}"><font

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

@@ -32,7 +32,7 @@
 
         #btnSubmit {
             width: 128px;
-            margin-left: 489px;
+            margin-left: 200px;
         }
 
         .select-ele {
@@ -90,16 +90,12 @@
             <form:input path="id" htmlEscape="false" maxlength="20" class="input-medium" onchange="onlynum(this)"/>
             <label>订单ID：</label>
             <form:input path="orderID" htmlEscape="false" maxlength="20" class="input-medium" onchange="onlynum(this)"/>
-            <label>收款时间：</label>
-            <form:input path="startTime" type="text" maxlength="20" class="input-medium Wdate" value="${startTime}"
-                        onclick="WdatePicker({dateFmt:'yyyy-MM-dd',isShowClear:false});"/>
-            <span class="time-space-symbols">至</span>
-            <form:input path="endTime" type="text" maxlength="20" class="input-medium Wdate" value="${endTime}"
-                        onclick="WdatePicker({dateFmt:'yyyy-MM-dd',isShowClear:false});"/>
-        </div>
-        <div>
             <label>订单编号：</label>
             <form:input path="orderNo" htmlEscape="false" maxlength="50" class="input-medium"/>
+            <label>机构名称：</label>
+            <form:input path="userName" htmlEscape="false" maxlength="25" class="input-medium"/>
+        </div>
+        <div>
             <label>收款方式：</label>
             <form:select path="payWay" class="select-ele input-medium">
                 <form:option value="" label="全部"/>
@@ -118,6 +114,12 @@
                 <form:options items="${fns:getDictList('discernReceiptStatus')}" itemLabel="label" itemValue="value"
                               htmlEscape="false"/>
             </form:select>
+            <label>收款账号：</label>
+            <form:select path="payType" class="select-ele input-medium">
+                <form:option value="" label="全部"/>
+                <form:options items="${fns:getDictList('payType')}" itemLabel="label" itemValue="value"
+                              htmlEscape="false"/>
+            </form:select>
         </div>
         <div>
             <label>收款进度：</label>
@@ -138,12 +140,7 @@
                 <form:options items="${fns:getDictList('associationNum')}" itemLabel="label" itemValue="value"
                               htmlEscape="false"/>
             </form:select>
-            <label>机构名称：</label>
-            <form:input path="userName" htmlEscape="false" maxlength="25" class="input-medium"/>
-            <div class="clearfix"></div>
 
-        </div>
-        <div class="check-btn-wrapper">
             <label>组织：</label>
             <form:select path="organizeID" class="input-medium">
                 <form:option value="" label="请选择"/>
@@ -151,6 +148,15 @@
                 <form:options items="${cmUserOrganizeList}" itemLabel="organizeName" itemValue="id"
                               htmlEscape="false"/>
             </form:select>
+            <div class="clearfix"></div>
+        </div>
+        <div class="check-btn-wrapper">
+            <label>收款时间：</label>
+            <form:input path="startTime" type="text" maxlength="20" class="input-medium Wdate" value="${startTime}"
+                        onclick="WdatePicker({dateFmt:'yyyy-MM-dd',isShowClear:false});"/>
+            <span class="time-space-symbols">至</span>
+            <form:input path="endTime" type="text" maxlength="20" class="input-medium Wdate" value="${endTime}"
+                        onclick="WdatePicker({dateFmt:'yyyy-MM-dd',isShowClear:false});"/>
             <input id="btnSubmit" class="btn btn-primary" type="submit" value="查询"/>
             <input id="export" class="btn btn-primary" value="导出筛选结果"/>
         </div>

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

@@ -101,10 +101,11 @@
 						<td colspan="2">${s.payTotalFee}</td>
 						<td colspan="3">${s.orderTime}</td>
 						<%--此处对应订单列表收款状态--%>
-						<td><c:if test="${s.receiptStatus == 1}"><font color="red">待收款</font></c:if>
-							<c:if test="${s.receiptStatus == 2}"><font color="#ff8c00">部分收款</font></c:if>
-							<c:if test="${s.receiptStatus == 3}"><font color="green">已收款</font></c:if></td>
-						<td>${s.receiptTotalFee}</td>
+						<td><a href="${ctx}/bulkpurchase/cmRefundsProduct/toRefundRecord.rpc?orderID=${s.orderID}&from=1" style="text-decoration: underline">
+                        <c:if test="${s.receiptStatus == 1}"><font color="red">待收款</font></c:if>
+                        <c:if test="${s.receiptStatus == 2}"><font color="#ff8c00">部分收款</font></c:if>
+                        <c:if test="${s.receiptStatus == 3}"><font color="green">已收款</font></c:if></a></td>
+						<td><a href="${ctx}/bulkpurchase/cmRefundsProduct/toRefundRecord.rpc?orderID=${s.orderID}&from=1" style="text-decoration: underline">${s.receiptTotalFee}</a></td>
 						<td colspan="2">
 							<c:if test="${s.discountTotalFee gt 0}">
 								<c:if test="${s.discountTotalFee gt s.returnedPurchaseTotalFee}">

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

@@ -108,10 +108,11 @@
 					<td colspan="2">${s.payTotalFee}</td>
 					<td colspan="3">${s.orderTime}</td>
 					<%--此处对应订单列表收款状态--%>
-					<td><c:if test="${s.receiptStatus == 1}"><font color="red">待收款</font></c:if>
-						<c:if test="${s.receiptStatus == 2}"><font color="#ff8c00">部分收款</font></c:if>
-						<c:if test="${s.receiptStatus == 3}"><font color="green">已收款</font></c:if></td>
-					<td>${s.receiptTotalFee}</td>
+					<td><a href="${ctx}/bulkpurchase/cmRefundsProduct/toRefundRecord.rpc?orderID=${s.orderID}&from=1" style="text-decoration: underline">
+                        <c:if test="${s.receiptStatus == 1}"><font color="red">待收款</font></c:if>
+                        <c:if test="${s.receiptStatus == 2}"><font color="#ff8c00">部分收款</font></c:if>
+                        <c:if test="${s.receiptStatus == 3}"><font color="green">已收款</font></c:if></a></td>
+					<td><a href="${ctx}/bulkpurchase/cmRefundsProduct/toRefundRecord.rpc?orderID=${s.orderID}&from=1" style="text-decoration: underline">${s.receiptTotalFee}</a></td>
 					<td colspan="2">
 						<c:if test="${s.discountTotalFee gt 0}">
 							<c:if test="${s.discountTotalFee gt s.returnedPurchaseTotalFee}">

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

@@ -106,10 +106,11 @@
                         <td colspan="2">${s.payTotalFee}</td>
                         <td colspan="3">${s.orderTime}</td>
                         <%--此处对应订单列表收款状态--%>
-                        <td><c:if test="${s.receiptStatus == 1}"><font color="red">待收款</font></c:if>
-                            <c:if test="${s.receiptStatus == 2}"><font color="#ff8c00">部分收款</font></c:if>
-                            <c:if test="${s.receiptStatus == 3}"><font color="green">已收款</font></c:if></td>
-                        <td>${s.receiptTotalFee}</td>
+                        <td><a href="${ctx}/bulkpurchase/cmRefundsProduct/toRefundRecord.rpc?orderID=${s.orderID}&from=1" style="text-decoration: underline">
+                        <c:if test="${s.receiptStatus == 1}"><font color="red">待收款</font></c:if>
+                        <c:if test="${s.receiptStatus == 2}"><font color="#ff8c00">部分收款</font></c:if>
+                        <c:if test="${s.receiptStatus == 3}"><font color="green">已收款</font></c:if></a></td>
+                        <td><a href="${ctx}/bulkpurchase/cmRefundsProduct/toRefundRecord.rpc?orderID=${s.orderID}&from=1" style="text-decoration: underline">${s.receiptTotalFee}</a></td>
                         <td colspan="2">
                             <c:if test="${s.discountTotalFee gt 0}">
                                 <c:if test="${s.discountTotalFee gt s.returnedPurchaseTotalFee}">

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

@@ -123,10 +123,11 @@
 					<td colspan="2">${s.payTotalFee}</td>
 					<td colspan="3">${s.orderTime}</td>
 					<%--此处对应订单列表收款状态--%>
-					<td><c:if test="${s.receiptStatus == 1}"><font color="red">待收款</font></c:if>
-						<c:if test="${s.receiptStatus == 2}"><font color="#ff8c00">部分收款</font></c:if>
-						<c:if test="${s.receiptStatus == 3}"><font color="green">已收款</font></c:if></td>
-					<td>${s.receiptTotalFee}</td>
+					<td><a href="${ctx}/bulkpurchase/cmRefundsProduct/toRefundRecord.rpc?orderID=${s.orderID}&from=1" style="text-decoration: underline">
+                        <c:if test="${s.receiptStatus == 1}"><font color="red">待收款</font></c:if>
+                        <c:if test="${s.receiptStatus == 2}"><font color="#ff8c00">部分收款</font></c:if>
+                        <c:if test="${s.receiptStatus == 3}"><font color="green">已收款</font></c:if></a></td>
+					<td><a href="${ctx}/bulkpurchase/cmRefundsProduct/toRefundRecord.rpc?orderID=${s.orderID}&from=1" style="text-decoration: underline">${s.receiptTotalFee}</a></td>
 					<td colspan="2">
 						<c:if test="${s.discountTotalFee gt 0}">
 							<c:if test="${s.discountTotalFee gt s.returnedPurchaseTotalFee}">

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

@@ -408,10 +408,12 @@
                     <td colspan="2"><fmt:formatNumber value="${s.payTotalFee}" type="number" pattern="#,##0.00"/></td>
                     <td colspan="3">${s.orderTime}</td>
                         <%--此处对应订单列表收款状态--%>
-                    <td><c:if test="${s.receiptStatus == 1}"><font color="red">待收款</font></c:if>
+                    <td><a href="${ctx}/bulkpurchase/cmRefundsProduct/toRefundRecord.rpc?orderID=${s.orderID}&from=1" style="text-decoration: underline">
+                        <c:if test="${s.receiptStatus == 1}"><font color="red">待收款</font></c:if>
                         <c:if test="${s.receiptStatus == 2}"><font color="#ff8c00">部分收款</font></c:if>
-                        <c:if test="${s.receiptStatus == 3}"><font color="green">已收款</font></c:if></td>
-                    <td>${s.receiptTotalFee}</td>
+                        <c:if test="${s.receiptStatus == 3}"><font color="green">已收款</font></c:if></a>
+                    </td>
+                    <td><a href="${ctx}/bulkpurchase/cmRefundsProduct/toRefundRecord.rpc?orderID=${s.orderID}&from=1" style="text-decoration: underline">${s.receiptTotalFee}</a></td>
                     <td colspan="3">
                         <c:if test="${s.discountTotalFee gt 0}">
                             <c:if test="${s.discountTotalFee gt s.returnedPurchaseTotalFee}">

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

@@ -186,10 +186,11 @@
 					<td colspan="2"><fmt:formatNumber value="${s.payTotalFee}" type="number" pattern="#,##0.00"/></td>
 					<td colspan="3">${s.orderTime}</td>
 					<%--此处对应订单列表收款状态--%>
-					<td><c:if test="${s.receiptStatus == 1}"><font color="red">待收款</font></c:if>
-						<c:if test="${s.receiptStatus == 2}"><font color="#ff8c00">部分收款</font></c:if>
-						<c:if test="${s.receiptStatus == 3}"><font color="green">已收款</font></c:if></td>
-					<td>${s.receiptTotalFee}</td>
+					<td><a href="${ctx}/bulkpurchase/cmRefundsProduct/toRefundRecord.rpc?orderID=${s.orderID}&from=1" style="text-decoration: underline">
+                        <c:if test="${s.receiptStatus == 1}"><font color="red">待收款</font></c:if>
+                        <c:if test="${s.receiptStatus == 2}"><font color="#ff8c00">部分收款</font></c:if>
+                        <c:if test="${s.receiptStatus == 3}"><font color="green">已收款</font></c:if></a></td>
+					<td><a href="${ctx}/bulkpurchase/cmRefundsProduct/toRefundRecord.rpc?orderID=${s.orderID}&from=1" style="text-decoration: underline">${s.receiptTotalFee}</a></td>
 					<td colspan="3">
 						<c:if test="${s.discountTotalFee gt 0}">
 							<c:if test="${s.discountTotalFee gt s.returnedPurchaseTotalFee}">

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

@@ -100,10 +100,11 @@
 							<td colspan="3"><a href="${ctx}/order/detail?id=${s.orderID}">${s.orderNo}(${s.orderID})</a></td>
 							<td colspan="2">${s.payTotalFee}</td>
 							<td colspan="3">${s.orderTime}</td>
-							<td><c:if test="${s.receiptStatus == 1}"><font color="red">待收款</font></c:if>
-								<c:if test="${s.receiptStatus == 2}"><font color="#ff8c00">部分收款</font></c:if>
-								<c:if test="${s.receiptStatus == 3}"><font color="green">已收款</font></c:if></td>
-							<td>${s.receiptTotalFee}</td>
+							<td><a href="${ctx}/bulkpurchase/cmRefundsProduct/toRefundRecord.rpc?orderID=${s.orderID}&from=1" style="text-decoration: underline">
+                        <c:if test="${s.receiptStatus == 1}"><font color="red">待收款</font></c:if>
+                        <c:if test="${s.receiptStatus == 2}"><font color="#ff8c00">部分收款</font></c:if>
+                        <c:if test="${s.receiptStatus == 3}"><font color="green">已收款</font></c:if></a></td>
+							<td><a href="${ctx}/bulkpurchase/cmRefundsProduct/toRefundRecord.rpc?orderID=${s.orderID}&from=1" style="text-decoration: underline">${s.receiptTotalFee}</a></td>
 							<td colspan="3">
 								<c:if test="${s.discountTotalFee gt 0}">
 									<c:if test="${s.discountTotalFee gt s.returnedPurchaseTotalFee}">

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

@@ -105,10 +105,11 @@
 						<td colspan="3"><a href="${ctx}/order/detail?id=${s.orderID}">${s.orderNo}(${s.orderID})</a></td>
 						<td colspan="2">${s.payTotalFee}</td>
 						<td colspan="3">${s.orderTime}</td>
-						<td><c:if test="${s.receiptStatus == 1}"><font color="red">待收款</font></c:if>
-							<c:if test="${s.receiptStatus == 2}"><font color="#ff8c00">部分收款</font></c:if>
-							<c:if test="${s.receiptStatus == 3}"><font color="green">已收款</font></c:if></td>
-						<td>${s.receiptTotalFee}</td>
+						<td><a href="${ctx}/bulkpurchase/cmRefundsProduct/toRefundRecord.rpc?orderID=${s.orderID}&from=1" style="text-decoration: underline">
+                        <c:if test="${s.receiptStatus == 1}"><font color="red">待收款</font></c:if>
+                        <c:if test="${s.receiptStatus == 2}"><font color="#ff8c00">部分收款</font></c:if>
+                        <c:if test="${s.receiptStatus == 3}"><font color="green">已收款</font></c:if></a></td>
+						<td><a href="${ctx}/bulkpurchase/cmRefundsProduct/toRefundRecord.rpc?orderID=${s.orderID}&from=1" style="text-decoration: underline">${s.receiptTotalFee}</a></td>
 						<td colspan="3">
 							<c:if test="${s.discountTotalFee gt 0}">
 								<c:if test="${s.discountTotalFee gt s.returnedPurchaseTotalFee}">

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>
@@ -1052,9 +1052,9 @@
                             </c:if>
                             <c:if test="${order.status eq 11 || order.status eq 12 || order.status eq 13 ||order.status eq 21 ||order.status eq 22 ||
 				            order.status eq 23 || order.status eq 0}">
-                                <c:if test="${(empty order.rechargeGoods && order.ableUserMoney > 0) || 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

@@ -188,7 +188,7 @@
                 </c:if>
             </td>
         </c:if>
-        <td>机构：${order.bpOrderUserinfo.name}<c:if test="${order.organizeID == 3}"><em class="weishaIcon">维沙</em></c:if></td>
+        <td>机构：${order.buyer}<c:if test="${order.organizeID == 3}"><em class="weishaIcon">维沙</em></c:if></td>
         <td>收货人: ${order.bpOrderUserinfo.shouHuoRen}</td>
     </tr>
     <tr>
@@ -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>
@@ -296,7 +296,7 @@
                         </c:if>
                     <c:if test="${order.status eq 11 || order.status eq 12 || order.status eq 13 ||order.status eq 21 ||order.status eq 22 ||
 				            order.status eq 23 || order.status eq 0}">
-                        <c:if test="${(empty order.rechargeGoods && order.ableUserMoney > 0) || 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}">修改订单</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>

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

@@ -68,10 +68,11 @@
             <td colspan="3"><a href="${ctx}/order/detail?id=${s.orderID}">${s.orderNo}(${s.orderID})</a></td>
             <td colspan="2">${s.payTotalFee}</td>
             <td colspan="3">${s.orderTime}</td>
-            <td><c:if test="${s.receiptStatus == 1}"><font color="red">待收款</font></c:if>
-                <c:if test="${s.receiptStatus == 2}"><font color="#ff8c00">部分收款</font></c:if>
-                <c:if test="${s.receiptStatus == 3}"><font color="green">已收款</font></c:if></td>
-            <td>${s.receiptTotalFee}</td>
+            <td><a href="${ctx}/bulkpurchase/cmRefundsProduct/toRefundRecord.rpc?orderID=${s.orderID}&from=1" style="text-decoration: underline">
+                        <c:if test="${s.receiptStatus == 1}"><font color="red">待收款</font></c:if>
+                        <c:if test="${s.receiptStatus == 2}"><font color="#ff8c00">部分收款</font></c:if>
+                        <c:if test="${s.receiptStatus == 3}"><font color="green">已收款</font></c:if></a></td>
+            <td><a href="${ctx}/bulkpurchase/cmRefundsProduct/toRefundRecord.rpc?orderID=${s.orderID}&from=1" style="text-decoration: underline">${s.receiptTotalFee}</a></td>
             <td colspan="3">
                 <c:if test="${s.discountTotalFee gt 0}">
                     <c:if test="${s.discountTotalFee gt s.returnedPurchaseTotalFee}">

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

@@ -122,30 +122,34 @@
                     <c:if test="${order.status eq 0 || order.status eq 4 || order.status eq 5 || order.status eq 6 || order.status eq 7}">${fns:getDictLabel(order.status,"order_detail_status","" )}</c:if>
                 </td>
                 <td>
-                    <c:if test="${order.receiptStatus == 1}">
-                        <font color="red">待收款</font>
-                    </c:if>
-                    <c:if test="${order.receiptStatus == 2}">
-                        <font color="#ff8c00">部分收款</font>
-                    </c:if>
-                    <c:if test="${order.receiptStatus == 3}">
-                        <font color="green">已收款</font>
-                    </c:if>
-                    <c:if test="${order.receiptStatus == 4}">
-                        ----
-                    </c:if>
+                    <a href="${ctx}/bulkpurchase/cmRefundsProduct/toRefundRecord.rpc?orderID=${order.orderID}&from=1"  style="text-decoration: underline">
+                        <c:if test="${order.receiptStatus == 1}">
+                            <font color="red">待收款</font>
+                        </c:if>
+                        <c:if test="${order.receiptStatus == 2}">
+                            <font color="#ff8c00">部分收款</font>
+                        </c:if>
+                        <c:if test="${order.receiptStatus == 3}">
+                            <font color="green">已收款</font>
+                        </c:if>
+                        <c:if test="${order.receiptStatus == 4}">
+                            ----
+                        </c:if>
+                    </a>
                 </td>
                 <td>
                     <fmt:formatNumber value="${order.payableAmount}" type="number" pattern="#,##0.00"/>
                     (余额抵扣:<fmt:formatNumber value="${order.balancePayFee}" type="number" pattern="#,##0.00"/>)
                 </td>
                 <td>
-                    <c:if test="${order.alreadyReceipt eq '----'}">
-                        ${order.alreadyReceipt}
-                    </c:if>
-                    <c:if test="${order.alreadyReceipt ne '----'}">
-                        <fmt:formatNumber value="${order.alreadyReceipt}" type="number" pattern="#,##0.00"/>
-                    </c:if>
+                    <a href="${ctx}/bulkpurchase/cmRefundsProduct/toRefundRecord.rpc?orderID=${order.orderID}&from=1"  style="text-decoration: underline">
+                        <c:if test="${order.alreadyReceipt eq '----'}">
+                            ${order.alreadyReceipt}
+                        </c:if>
+                        <c:if test="${order.alreadyReceipt ne '----'}">
+                            <fmt:formatNumber value="${order.alreadyReceipt}" type="number" pattern="#,##0.00"/>
+                        </c:if>
+                    </a>
                 </td>
                 <td>
                     <c:if test="${order.payStatus == 1 || empty order.payStatus || order.payStatus == 0}"><font

src/main/webapp/WEB-INF/views/modules/zplm/cmBrandAuthProductList.jsp

@@ -1,12 +1,17 @@
 <%@ page contentType="text/html;charset=UTF-8" %>
-<%@ include file="/WEB-INF/views/include/taglib.jsp"%>
+<%@ include file="/WEB-INF/views/include/taglib.jsp" %>
 <html>
 <head>
-	<title>品牌授权商品管理</title>
-	<meta name="decorator" content="default"/>
-	<style type="text/css">
-		.table th{text-align: center;}
-		.table td{text-align: center;}
+    <title>品牌授权商品管理</title>
+    <meta name="decorator" content="default"/>
+    <style type="text/css">
+        .table th {
+            text-align: center;
+        }
+
+        .table td {
+            text-align: center;
+        }
 
         .qrcodeBox-content {
             width: 100%;
@@ -21,8 +26,8 @@
 
         .content-box {
             border-radius: 5px;
-            width: 260px;
-            height: 300px;
+            width: 300px;
+            height: 400px;
             background-color: #FFF;
             border: 1px solid #ebebeb;
             position: absolute;
@@ -33,12 +38,11 @@
             margin: auto;
             z-index: 999;
             box-sizing: border-box;
-            padding: 20px;
         }
 
         .qrcodeBox {
-            width: 220px;
-            height: 220px;
+            width: 300px;
+            height: 400px;
         }
 
         .qrcodeBox-colse {
@@ -47,6 +51,7 @@
             display: inline;
             float: right;
         }
+
         .qrcodeBox-download {
             width: 50%;
             height: 50px;
@@ -81,139 +86,260 @@
             margin-top: 10px;
             cursor: pointer;
         }
-	</style>
-	<script type="text/javascript">
-		$(document).ready(function() {
-			
-		});
-		function page(n,s){
-			$("#pageNo").val(n);
-			$("#pageSize").val(s);
-			$("#searchForm").submit();
-        	return false;
+    </style>
+    <script type="text/javascript">
+        $(document).ready(function () {
+
+        });
+
+        function page(n, s) {
+            $("#pageNo").val(n);
+            $("#pageSize").val(s);
+            $("#searchForm").submit();
+            return false;
         }
-	</script>
+    </script>
 
 </head>
 <body>
-	<ul class="nav nav-tabs">
-		<li><a href="${ctx}/zplm/cmBrandAuth/">品牌授权列表</a></li>
-		<li class="active"><a href="${ctx}/zplm/cmBrandAuthProduct/?authId=${cmBrandAuthProduct.authId}">商品列表</a></li>
-	</ul>
-	<form:form id="searchForm" modelAttribute="cmBrandAuthProduct" action="${ctx}/zplm/cmBrandAuthProduct/?authId=${cmBrandAuthProduct.authId}" method="post" class="breadcrumb form-search">
-		<input id="pageNo" name="pageNo" type="hidden" value="${page.pageNo}"/>
-		<input id="pageSize" name="pageSize" type="hidden" value="${page.pageSize}"/>
-		<div class="ul-form">
-			 <label>商品名称：</label>
-				<form:input path="name" htmlEscape="false" maxlength="50" class="input-medium"/>
-			 <label>商品sn码：</label>
-				<form:input path="snCode" htmlEscape="false" maxlength="255" class="input-medium"/>
-			&nbsp;&nbsp;<input id="btnSubmit" class="btn btn-primary" type="submit" value="查询"/>
-			  <a class="btn btn-primary" href="${ctx}/zplm/cmBrandAuthProduct/form?authId=${cmBrandAuthProduct.authId}">新增</a>
-			<div class="clearfix"></div>
-		</div>
-	</form:form>
-	<sys:message content="${message}"/>
-	<table id="contentTable" class="table table-striped table-bordered table-condensed">
-		<thead>
-			<tr>
-				<th>序号</th>
-				<th>商品名称</th>
-				<th>商品SN码</th>
-				<th>创建时间</th>
-				<th>创建人</th>
-				<th>操作</th>
-			</tr>
-		</thead>
-		<tbody>
-		<c:forEach items="${page.list}" var="product" varStatus="index">
-			<tr>
-				<td>
-					${index.index+1}
-				</td>
-				<td>
-					${product.name}
-				</td>
-				<td>
-					${product.snCode}
-				</td>
-				<td>
-					<fmt:formatDate value="${product.createTime}" pattern="yyyy-MM-dd HH:mm:ss"/>
-				</td>
-				<td>
-					${product.createUserName}
-				</td>
-				<td>
-    				<a href="${ctx}/zplm/cmBrandAuthProduct/form?id=${product.id}&authId=${cmBrandAuthProduct.authId}">编辑</a>
-					<a href="${ctx}/zplm/cmBrandAuthProduct/delete?id=${product.id}&authId=${cmBrandAuthProduct.authId}" onclick="return confirmx('确认要删除该品牌授权商品吗？', this.href)">删除</a>
-					<a href="javascript:;" onclick="show('${product.id}','${fns:getConfig('wwwServer')}')">二维码</a>
-				</td>
-			</tr>
-		</c:forEach>
-		</tbody>
-	</table>
-    <div class="qrcodeBox-content">
-        <div class="content-box">
-            <div class="qrcodeBox" id="qrcode">
-
-            </div>
-            <div class="qrcodeBox-colse">
-                <div class="close-btn">关闭</div>
-            </div>
-            <div class="qrcodeBox-download">
-                <div class="download-btn" onclick="downloadClick()">下载二维码</div>
-            </div>
+<ul class="nav nav-tabs">
+    <li><a href="${ctx}/zplm/cmBrandAuth/">品牌授权列表</a></li>
+    <li class="active"><a href="${ctx}/zplm/cmBrandAuthProduct/?authId=${cmBrandAuthProduct.authId}">商品列表</a></li>
+</ul>
+<form:form id="searchForm" modelAttribute="cmBrandAuthProduct"
+           action="${ctx}/zplm/cmBrandAuthProduct/?authId=${cmBrandAuthProduct.authId}" method="post"
+           class="breadcrumb form-search">
+    <input id="pageNo" name="pageNo" type="hidden" value="${page.pageNo}"/>
+    <input id="pageSize" name="pageSize" type="hidden" value="${page.pageSize}"/>
+    <div class="ul-form">
+        <label>商品名称：</label>
+        <form:input path="name" htmlEscape="false" maxlength="50" class="input-medium"/>
+        <label>商品sn码：</label>
+        <form:input path="snCode" htmlEscape="false" maxlength="255" class="input-medium"/>
+        &nbsp;&nbsp;<input id="btnSubmit" class="btn btn-primary" type="submit" value="查询"/>
+        <a class="btn btn-primary" href="${ctx}/zplm/cmBrandAuthProduct/form?authId=${cmBrandAuthProduct.authId}">新增</a>
+        <div class="clearfix"></div>
+    </div>
+</form:form>
+<sys:message content="${message}"/>
+<table id="contentTable" class="table table-striped table-bordered table-condensed">
+    <thead>
+    <tr>
+        <th>序号</th>
+        <th>商品名称</th>
+        <th>商品SN码</th>
+        <th>创建时间</th>
+        <th>创建人</th>
+        <th>操作</th>
+    </tr>
+    </thead>
+    <tbody>
+    <c:forEach items="${page.list}" var="product" varStatus="index">
+        <tr>
+            <td>
+                    ${index.index+1}
+            </td>
+            <td>
+                    ${product.name}
+            </td>
+            <td>
+                    ${product.snCode}
+            </td>
+            <td>
+                <fmt:formatDate value="${product.createTime}" pattern="yyyy-MM-dd HH:mm:ss"/>
+            </td>
+            <td>
+                    ${product.createUserName}
+            </td>
+            <td>
+                <a href="${ctx}/zplm/cmBrandAuthProduct/form?id=${product.id}&authId=${cmBrandAuthProduct.authId}">编辑</a>
+                <a href="${ctx}/zplm/cmBrandAuthProduct/delete?id=${product.id}&authId=${cmBrandAuthProduct.authId}"
+                   onclick="return confirmx('确认要删除该品牌授权商品吗？', this.href)">删除</a>
+                <a href="javascript:;"
+                   onclick="show('${product.id}','${fns:getConfig('wwwServer')}','${cmBrandAuth.agentFlag eq 1?cmBrandAuth.agentName:cmBrandAuth.brandName}','${product.displaySnCode}')">二维码</a>
+            </td>
+        </tr>
+    </c:forEach>
+    </tbody>
+</table>
+<div class="qrcodeBox-content">
+    <div class="content-box">
+        <div class="qrcodeBox" id="qrcode">
+
         </div>
+        <div class="qrcodeBox-colse">
+            <div class="close-btn">关闭</div>
+        </div>
+        <div class="qrcodeBox-download">
+            <div class="download-btn" onclick="downQRCode()">下载二维码</div>
+        </div>
+        <div id="downQrCode"></div>
     </div>
-    <a id="downloadLink"></a>
+</div>
+<a id="downloadLink"></a>
 
-	<div class="pagination">${page}</div>
-    <script type="text/javascript" src="${ctxStatic}/QRCode/qrcode.js"></script>
-    <script type="text/javascript">
-        $(document).ready(function () {
-            //弹出框去滚动条
-            top.$('#jbox-content').css("overflow-y", "hidden");
-            show_title(30);
-            $('.close-btn').click(function () {
-                closeAlert();
-            })
-        });
+<div class="pagination">${page}</div>
+<%--    <script type="text/javascript" src="${ctxStatic}/QRCode/qrcode.js"></script>--%>
+<script type="text/javascript">
+    $(document).ready(function () {
+        //弹出框去滚动条
+        top.$('#jbox-content').css("overflow-y", "hidden");
+        show_title(30);
+        $('.close-btn').click(function () {
+            closeAlert();
+        })
+    });
 
-        function show(id, wwwServer) {
-            $('.qrcodeBox-content').show(100);
-            new QRCode(document.getElementById("qrcode"), {
-                width: 220, //生成的二维码的宽度
-                height: 220, //生成的二维码的高度
-				text: wwwServer + "product/auth/product-" + id + ".html", //任意内容
-                colorDark : "#000000", // 生成的二维码的深色部分
-                colorLight : "#ffffff", //生成二维码的浅色部分
-                correctLevel : QRCode.CorrectLevel.H
-            });
+    function show(id, wwwServer, agentName, snCode) {
+        var qrText = wwwServer + "product/auth/product-" + id + ".html",//要生成二维码的信息,文本或URL
+            strHeader = agentName + '品牌授权',//顶部文字描述
+            strFooter1 = "仪器SN码：";//底部文字描述
+        strFooter2 = snCode;//底部文字描述
+        $('.qrcodeBox-content').show(100);
+        //生成展示二维码
+        var qrcode = $('#qrcode').qrcode({
+            render: 'canvas',
+            text: qrText,
+            width: 182,
+            height: 182,
+            background: '#ffffff',
+            foreground: '#000000',
+        }).show();
+        var canvas = qrcode.find('canvas').get(0);
+        //设置展示二维码
+        var img = new Image();
+        var bgImg = new Image();
+        img.src = canvas.toDataURL('image/png');
+        bgImg.src = "/static/images/qrCodeBackground.png";
+        bgImg.onload = function () {
+            //重新绘制画布
+            var w = bgImg.width, h = bgImg.height;
+            canvas.width = w;
+            canvas.height = h;
+            var ctx = canvas.getContext('2d');
+            //设置画布背景
+            ctx.fillStyle = '#fffefe';
+            ctx.fillRect(0, 0, canvas.width, canvas.height);
+            //设置文字样式
+            ctx.fillStyle = 'white';
+            ctx.font = 'bold 18px MicrosoftYaHei';
+            ctx.textAlign = 'center';
+            // ctx.fillText(strHeader, w / 2, picHeight[i] / 3);
+            ctx.drawImage(bgImg, 0, 0);
+            //绘制二维码
+            ctx.drawImage(img, 60, 167);
+            //绘制顶部文字描述
+            var chr = strHeader.split("");
+            var temp = "";
+            var row = [];
+            for (var a = 0; a < chr.length; a++) {
+                if (ctx.measureText(temp).width < (w - 50)) {
+                } else {
+                    row.push(temp);
+                    temp = "";
+                }
+                temp += chr[a];
+            }
+            row.push(temp);
+            if (row.length == 1) {
+                ctx.fillText(row[0], w / 2, 48);
+            } else {
+                for (var b = 0; b < row.length; b++) {
+                    ctx.fillText(row[b], w / 2, 58 - (row.length - b - 1) * 25);
+                }
+            }
+            //绘制底部文字
+            ctx.fillStyle = '#0e9ef0';
+            ctx.font = 'bold 14px MicrosoftYaHei';
+            ctx.textAlign = 'left';
+            ctx.fillText(strFooter1, 68, 91);
+            ctx.font = '14px MicrosoftYaHei';
+            ctx.fillText(strFooter2, w / 2 - 5, 91);
         }
 
-        function closeAlert() {
-            $('.qrcodeBox-content').hide(100);
-            $('#qrcode').empty();
+        //生成下载二维码
+        var downQrCode = $('#downQrCode').qrcode({
+            render: 'canvas',
+            text: qrText,
+            width: 660,
+            height: 660,
+            background: '#ffffff',
+            foreground: '#000000',
+        }).hide();
+        //设置下载二维码
+        var downCanvas = downQrCode.find('canvas').get(0);
+        var downImg = new Image();
+        var downBgImg = new Image();
+        downImg.src = downCanvas.toDataURL('image/png');
+        downBgImg.src = "/static/images/downQrCodeBackground.png";
+        downBgImg.onload = function () {
+            //重新绘制画布
+            var w = downBgImg.width, h = downBgImg.height;
+            downCanvas.width = w;
+            downCanvas.height = h;
+            var ctx = downCanvas.getContext('2d');
+            //设置画布背景
+            ctx.fillStyle = '#ffffff';
+            ctx.fillRect(0, 0, downCanvas.width, downCanvas.height);
+            //设置文字样式
+            ctx.fillStyle = '#ffffff';
+            ctx.font = 'bold 52px MicrosoftYaHei';
+            ctx.textAlign = 'center';
+            ctx.drawImage(downBgImg, 0, 0);
+            //绘制二维码
+            ctx.drawImage(downImg, 215, 402);
+            //绘制顶部文字描述
+            var chr = strHeader.split("");
+            var temp = "";
+            var row = [];
+            for (var a = 0; a < chr.length; a++) {
+                if (ctx.measureText(temp).width < (w - 290)) {
+                } else {
+                    row.push(temp);
+                    temp = "";
+                }
+                temp += chr[a];
+            }
+            row.push(temp);
+            if (row.length == 1) {
+                ctx.fillText(row[0], w / 2, 122);
+            } else {
+                for (var b = 0; b < row.length; b++) {
+                    ctx.fillText(row[b], w / 2, 160 - (row.length - b - 1) * 65);
+                }
+            }
+            //绘制底部文字
+            ctx.fillStyle = '#42aaff';
+            ctx.font = 'bold 33px MicrosoftYaHei';
+            ctx.textAlign = 'center';
+            ctx.fillText(strFooter1 + strFooter2, w / 2, 238);
         }
+    }
 
-        //jquery
-        function downloadClick () {
-            // 获取base64的图片节点
-            debugger
-            var img = document.getElementById('qrcode').getElementsByTagName('img')[0];
-            // 构建画布
-            var canvas = document.createElement('canvas');
-            canvas.width = img.width;
-            canvas.height = img.height;
-            canvas.getContext('2d').drawImage(img, 0, 0);
-            // 构造url
-            url = canvas.toDataURL('image/png');
-            // 构造a标签并模拟点击
-            var downloadLink = document.getElementById('downloadLink');
-            downloadLink.setAttribute('href', url);
-            downloadLink.setAttribute('download', '二维码.png');
-            downloadLink.click();
-        }
-    </script>
+    function closeAlert() {
+        $('.qrcodeBox-content').hide(100);
+        $('#qrcode').empty();
+        $('#downQrCode').empty();
+    }
+
+    //jquery
+    function downQRCode() {
+        // 获取base64的图片节点
+        var img = document.getElementById('downQrCode').getElementsByTagName('canvas')[0];
+        // 构建画布
+        var canvas = document.createElement('canvas');
+        canvas.width = img.width;
+        canvas.height = img.height;
+        canvas.getContext('2d').drawImage(img, 0, 0);
+        // 构造url
+        var url = canvas.toDataURL('image/png');
+        // 构造a标签并模拟点击
+        var downloadLink = document.getElementById('downloadLink');
+        downloadLink.setAttribute('href', url);
+        downloadLink.setAttribute('download', '二维码.png');
+        downloadLink.click();
+    }
+</script>
+<script type="text/javascript" src="${ctxStatic}/QRCode/jquery.qrcode.min.js"></script>
 </body>
 </html>