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

src/main/java/com/caimei/modules/coupon/entity/CmCoupon.java

@@ -53,6 +53,7 @@ public class CmCoupon extends DataEntity<CmCoupon> {
     private Double moneyCouponPrice; //价值优惠券购买金额
     private NewCmShop shop;
     private List<Integer> productIdList;
+    private Integer couponPayWay;  //购买方式 1.直接购买 2.采美豆抵扣
 
     private Date receiveDate;   // 领取时间
     private Date useEndDate;    // 使用截止时间
@@ -65,6 +66,14 @@ public class CmCoupon extends DataEntity<CmCoupon> {
         super(id);
     }
 
+    public Integer getCouponPayWay() {
+        return couponPayWay;
+    }
+
+    public void setCouponPayWay(Integer couponPayWay) {
+        this.couponPayWay = couponPayWay;
+    }
+
     public Integer getMoneyCouponFlag() {
         return moneyCouponFlag;
     }

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

@@ -1225,10 +1225,16 @@ public class NewOrderService extends CrudService<NewOrderDao, NewOrder> {
             //获取订单商品
             List<NewOrderProduct> list = new ArrayList<>();
             List<NewShopOrder> shopOrders = newShopOrderDao.findListByOrderID(newOrder.getOrderID());
+            if (shopOrders.size() > 1) {
+                newOrder.setRechargeGoods(3);
+            }
             if (CollectionUtils.isNotEmpty(shopOrders)) {
                 for (NewShopOrder shopOrder : shopOrders) {
                     List<NewOrderProduct> pList = newOrderProductDao.findListByShopOrderID(shopOrder.getShopOrderID());
                     pList.forEach(orderProduct -> {
+                        if ("2".equals(orderProduct.getProductCategory())) {
+                            newOrder.setSecondHandOrderFlag("1");
+                        }
                         if (orderProduct.getLadderPriceFlag() == 1) {
                             // 查询订单商品阶梯价格
                             List<OrderProductLadderPrice> ladderPriceList = newOrderProductDao.findladderPriceList(orderProduct.getOrderProductID());

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

@@ -104,6 +104,7 @@ public class CmShopOrderController extends BaseController {
         return "modules/order/cmRefundRecordList";
     }
 
+    @RequiresPermissions("order:cmPayShop:split")
     @RequestMapping("splitList")
     public String SplitAccount(NewShopOrder newShopOrder, HttpServletRequest request, HttpServletResponse response, Model model){
         //1. 展示付款状态为待付款和部分付款状态的线上支付的子订单；

src/main/java/com/caimei/modules/user/entity/SplitCode.java

@@ -7,6 +7,7 @@ public class SplitCode extends DataEntity<SplitCode> {
     private String codeRemark;//账户备注
     private Integer shopId; //供应商ID
     private String email;
+    private Integer weChatFlag; // 微信开户意愿确认 1开通 2未开通
 
     public String getSplitCode() {
         return splitCode;
@@ -39,4 +40,12 @@ public class SplitCode extends DataEntity<SplitCode> {
     public void setEmail(String email) {
         this.email = email;
     }
+
+    public Integer getWeChatFlag() {
+        return weChatFlag;
+    }
+
+    public void setWeChatFlag(Integer weChatFlag) {
+        this.weChatFlag = weChatFlag;
+    }
 }

src/main/resources/mappings/modules/coupon/CmCouponMapper.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.caimei.modules.coupon.dao.CmCouponDao">
-    
+
 	<sql id="cmCouponColumns">
 		a.id AS "id",
 		a.name AS "name",
@@ -26,22 +26,23 @@
 		a.moneyCouponFlag AS "moneyCouponFlag",
 		a.moneyCouponType as "moneyCouponType",
 		a.createDate AS "createDate",
+		a.couponPayWay as "couponPayWay",
 		a.delFlag AS "delFlag"
 	</sql>
-	
+
 	<sql id="cmCouponJoins">
 	</sql>
-    
+
 	<select id="get" resultType="CmCoupon">
-		SELECT 
+		SELECT
 			<include refid="cmCouponColumns"/>
 		FROM cm_coupon a
 		<include refid="cmCouponJoins"/>
 		WHERE a.id = #{id}
 	</select>
-	
+
 	<select id="findList" resultType="CmCoupon">
-		SELECT 
+		SELECT
 			<include refid="cmCouponColumns"/>,
 			u.name AS "clubName",
 			s.name AS "shopName"
@@ -58,8 +59,11 @@
 		    <if test="moneyCouponFlag != null and moneyCouponFlag > 0">
 				AND a.moneyCouponFlag = #{moneyCouponFlag}
 			</if>
+		    <if test="couponPayWay != null">
+				AND a.couponPayWay = #{couponPayWay}
+			</if>
 			<if test="name != null and name != ''">
-				AND a.name LIKE 
+				AND a.name LIKE
 					<if test="dbName == 'oracle'">'%'||#{name}||'%'</if>
 					<if test="dbName == 'mssql'">'%'+#{name}+'%'</if>
 					<if test="dbName == 'mysql'">concat('%',#{name},'%')</if>
@@ -119,15 +123,15 @@
 			</otherwise>
 		</choose>
 	</select>
-	
+
 	<select id="findAllList" resultType="CmCoupon">
-		SELECT 
+		SELECT
 			<include refid="cmCouponColumns"/>
 		FROM cm_coupon a
 		<include refid="cmCouponJoins"/>
 		<where>
-			
-		</where>		
+
+		</where>
 		<choose>
 			<when test="page !=null and page.orderBy != null and page.orderBy != ''">
 				ORDER BY ${page.orderBy}
@@ -136,10 +140,11 @@
 			</otherwise>
 		</choose>
 	</select>
-	
+
 	<insert id="insert" parameterType="CmCoupon"  keyProperty="id" useGeneratedKeys="true">
 		INSERT INTO cm_coupon(
 			name,
+			couponPayWay,
 			couponAmount,
 			touchPrice,
 			startDate,
@@ -164,6 +169,7 @@
 			delFlag
 		) VALUES (
 			#{name},
+		    #{couponPayWay},
 			#{couponAmount},
 			#{touchPrice},
 			#{startDate},
@@ -188,10 +194,11 @@
 			#{delFlag}
 		)
 	</insert>
-	
+
 	<update id="update">
-		UPDATE cm_coupon SET 	
+		UPDATE cm_coupon SET
 			name = #{name},
+			couponPayWay = #{couponPayWay},
 			couponAmount = #{couponAmount},
 			touchPrice = #{touchPrice},
 			startDate = #{startDate},
@@ -213,7 +220,7 @@
 			moneyCouponType = #{moneyCouponType}
 		WHERE id = #{id}
 	</update>
-	
+
 	<delete id="delete">
 		DELETE FROM cm_coupon
 		WHERE id = #{id}
@@ -366,7 +373,7 @@
 	<select id="findRedemptionCodeNum" resultType="integer">
 		SELECT COUNT(id) FROM cm_coupon_redemption_code WHERE couponId = #{couponId}
 	</select>
-	
+
 	<select id="findByRedemptionCode" resultType="com.caimei.modules.coupon.entity.CmCouponRedemptionCode">
 		SELECT
 		  `id`,
@@ -557,5 +564,5 @@
 		WHERE
 		  id = #{clubCouponId}
 	</update>
-	
+
 </mapper>

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

@@ -112,9 +112,6 @@
 			<if test="orderType == 2">
 				AND co.orderType = 2
 			</if>
-			<if test="orderType != 2">
-				AND co.orderType != 2
-			</if>
             <if test="id != null and id != ''">
                 AND a.id = #{id}
             </if>

src/main/resources/mappings/modules/user/CmUserBalanceRecordMapper.xml

@@ -49,7 +49,7 @@
 				 and a.name LIKE concat('%',#{name},'%')
 			</if>
 			and a.registerUserTypeID in (3,4)
-			AND a.validFlag = 1 AND a.clubStatus in (40,90)
+			AND a.validFlag = 1
 		</where>
 		<choose>
 			<when test="page !=null and page.orderBy != null and page.orderBy != ''">

src/main/resources/mappings/modules/user/NewCmShopMapper.xml

@@ -149,7 +149,7 @@
 		</choose>
 	</select>
 	<select id="findSplitCode" resultType="com.caimei.modules.user.entity.SplitCode">
-		select shopId,commercialCode as splitCode,codeDetail as codeRemark,email as email
+		select shopId,commercialCode as splitCode,codeDetail as codeRemark,email as email,weChatFlag
 		from cm_shop_splitcode
 		where shopId = #{shopID}
 	</select>
@@ -265,8 +265,8 @@
 	</insert>
 	<insert id="insertSplitCode">
 		insert into cm_shop_splitcode
-		(shopId, commercialCode, codeDetail,email)
-		values (#{shopId},#{splitCode},#{codeRemark},#{email})
+		(shopId, commercialCode, codeDetail,email,weChatFlag)
+		values (#{shopId},#{splitCode},#{codeRemark},#{email},#{weChatFlag})
 	</insert>
 	<insert id="insertSepcial" parameterType="NewCmShop"  keyProperty="shopID" useGeneratedKeys="true">
 		insert into shop(name,linkMan,contractMobile,status,addTime,shopType)

src/main/webapp/WEB-INF/views/modules/coupon/MoneyCouponForm.jsp

@@ -117,6 +117,7 @@
     <form:hidden path="id"/>
     <form:hidden path="productInfo" id="productInfo"/>
     <sys:message content="${message}"/>
+    &nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp<b style="color: red">&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp价值优惠券需要客户购买或者使用采美豆抵扣后才能正常使用。</b>
     <div class="control-group">
         <label class="control-label"><font color="red">*</font>优惠券名称：</label>
         <div class="controls">
@@ -136,9 +137,31 @@
         </div>
     </div>
     <div class="control-group">
-        <label class="control-label"><font color="red">*</font>购买价格：</label>
+        <label class="control-label"><font color="red">*</font>购买方式：</label>
+        <div class="controls">
+            <form:radiobutton path="couponPayWay" value="1" label="直接购买" class="required" onclick="nameChange(1)"/>
+            <form:radiobutton path="couponPayWay" value="2" label="采美豆抵扣" class="required" onclick="nameChange(2)"/>
+        </div>
+    </div>
+    <div class="control-group">
+        <c:if test="${cmCoupon.couponPayWay eq 1}">
+            <label id ="gmjg" class="control-label"><font color="red">*</font>购买价格：</label>
+            <label id="dksl" class="control-label" style="display: none"><font color="red">*</font>抵扣数量：</label>
+        </c:if>
+        <c:if test="${cmCoupon.couponPayWay eq 2}">
+            <label id ="gmjg" class="control-label" style="display: none"><font color="red">*</font>购买价格：</label>
+            <label id="dksl" class="control-label"><font color="red">*</font>抵扣数量：</label>
+        </c:if>
         <div class="controls">
             <input type="number" id="moneyCouponPrice" name="moneyCouponPrice" value="${cmCoupon.moneyCouponPrice}" min="0" required>
+            <c:if test="${cmCoupon.couponPayWay eq 1}">
+                <span id="yuan">元</span>
+                <span id="ge" hidden>个</span>
+            </c:if>
+            <c:if test="${cmCoupon.couponPayWay eq 2}">
+                <span id="yuan" hidden>元</span>
+                <span id="ge">个</span>
+            </c:if>
         </div>
     </div>
     <div class="control-group">
@@ -202,15 +225,16 @@
         <div class="controls">
             <form:radiobutton path="moneyCouponType" value="1" label="意向券" class="required" onclick="moneyCouponShow()"/>
             <form:radiobutton path="moneyCouponType" value="2" label="定向券" class="required" onclick="moneyCouponShow()"/>
+            <b style="color: red">(意向券表示全商城通用或者支持多款商品，并且支持退款；定向券表示只支持一款商品，并且不能退款)</b>
         </div>
     </div>
     <div class="control-group" id="yxq">
         <label class="control-label"><font color="red">*</font>优惠券类型：</label>
         <div class="controls">
-                <form:radiobutton name="hdq" path="couponType" value="0" label="活动券" class="required" onclick="couponShow()"/>
-                <form:radiobutton id="plq" path="couponType" value="1" style="display:${cmCoupon.moneyCouponType eq 2 ? 'none':''}" label="品类券" class="required" onclick="couponShow()"/>
-                <form:radiobutton id="zxq" path="couponType" value="2" style="display:${cmCoupon.moneyCouponType eq 2 ? 'none':''}" label="用户专享券" class="required" onclick="couponShow()"/>
-                <form:radiobutton id="dpq" path="couponType" value="3" style="display:${cmCoupon.moneyCouponType eq 2 ? 'none':''}" label="店铺券" class="required" onclick="couponShow()"/>
+            <form:radiobutton name="hdq" path="couponType" value="0" label="活动券" class="required" onclick="couponShow()"/>
+            <form:radiobutton id="plq" path="couponType" value="1" style="display:${cmCoupon.moneyCouponType eq 2 ? 'none':''}" label="品类券" class="required" onclick="couponShow()"/>
+            <form:radiobutton id="zxq" path="couponType" value="2" style="display:${cmCoupon.moneyCouponType eq 2 ? 'none':''}" label="用户专享券" class="required" onclick="couponShow()"/>
+            <form:radiobutton id="dpq" path="couponType" value="3" style="display:${cmCoupon.moneyCouponType eq 2 ? 'none':''}" label="店铺券" class="required" onclick="couponShow()"/>
         </div>
     </div>
     <div id="eventVoucher" class="yxq">
@@ -451,6 +475,20 @@
         }
     });
 
+    function nameChange(val){
+        if(1===val){
+            $("#ge").hide();
+            $("#yuan").show();
+            $("#dksl").hide();
+            $("#gmjg").show();
+
+        }else{
+            $("#yuan").hide();
+            $("#ge").show();
+            $("#gmjg").hide();
+            $("#dksl").show();
+        }
+    }
     //点击添加商品
     function showSelectProduct() {
         var url = "${ctx}/coupon/cmCoupon/toAddProduct?productIds=" + productIds;

src/main/webapp/WEB-INF/views/modules/coupon/cmCouponClubList.jsp

@@ -105,7 +105,7 @@
 					${cmCouponClub.clubName}
 				</td>
 				<td>
-					${cmCouponClub.source eq "1" ? "网站": cmCouponClub.source eq "2" ? "小程序" :cmCouponClub.source eq "3" ? "订单退回":cmCouponClub.source eq "4" ? "后台":"购买优惠券商品兑换"}
+					${cmCouponClub.source eq "2" ? "网站": cmCouponClub.source eq "1" ? "小程序" :cmCouponClub.source eq "3" ? "订单退回":cmCouponClub.source eq "4" ? "后台":"购买优惠券商品兑换"}
 				</td>
 				<td>
 					<c:if test="${cmCouponClub.status eq '1'}">

src/main/webapp/WEB-INF/views/modules/coupon/cmMoneyCouponList.jsp

@@ -40,13 +40,13 @@
 				<form:option value="3" label="已下架"/>
 				<form:option value="2" label="已关闭"/>
 			</form:select>
-<%--			 <label>优惠时间：</label>--%>
-<%--				<input name="startDate" type="text" readonly="readonly" maxlength="20" class="input-medium Wdate"--%>
-<%--					value="<fmt:formatDate value="${cmCoupon.startDate}" pattern="yyyy-MM-dd HH:mm:ss"/>"--%>
-<%--					onclick="WdatePicker({dateFmt:'yyyy-MM-dd',isShowClear:false});"/> ---%>
-<%--				<input name="endDate" type="text" readonly="readonly" maxlength="20" class="input-medium Wdate"--%>
-<%--					value="<fmt:formatDate value="${cmCoupon.endDate}" pattern="yyyy-MM-dd HH:mm:ss"/>"--%>
-<%--					onclick="WdatePicker({dateFmt:'yyyy-MM-dd',isShowClear:false});"/>--%>
+			<label>购买方式：</label>
+			<form:select path="couponPayWay" class="input-medium required">
+				<form:option value="" label="全部"/>
+				<form:option value="1" label="直接购买"/>
+				<form:option value="2" label="采美豆抵扣"/>
+			</form:select>
+
 			&nbsp;&nbsp;<input id="btnSubmit" class="btn btn-primary" type="submit" value="查询"/>
 			<input class="btn btn-primary" style="width: 120px" onclick="window.location='${ctx}/coupon/cmCoupon/moneyCouponForm'" value="添加价值优惠券"/>
 			<div class="clearfix"></div>
@@ -86,7 +86,8 @@
 					满${cmCoupon.touchPrice}
 				</td>
 				<td>
-					${cmCoupon.moneyCouponPrice}
+					<c:if test="${cmCoupon.couponPayWay == 1}">￥${cmCoupon.moneyCouponPrice}</c:if>
+					<c:if test="${cmCoupon.couponPayWay == 2}">${cmCoupon.moneyCouponPrice}采美豆</c:if>
 				</td>
 				<td>
 					<fmt:formatDate value="${cmCoupon.startDate}" pattern="yyyy-MM-dd HH:mm:ss"/>

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

@@ -43,7 +43,9 @@
             <li onclick="sessionStorage.removeItem('checkedIndexArr')"><a href="${ctx}/shopOrder/payOrderList?operatingMode=1">申请付款</a></li>
 			<li onclick="sessionStorage.removeItem('checkedIndexArr')"><a href="${ctx}/shopOrder/payOrderList?operatingMode=3">已付款子订单</a></li>
         </shiro:hasPermission>
+		<shiro:hasPermission name="order:cmPayShop:split">
 			<li><a href="${ctx}/shopOrder/splitList">子订单手动分账</a></li>
+		</shiro:hasPermission>
 	</ul>
 	<form:form id="searchForm" modelAttribute="cmPayShop" action="${ctx}/order/cmPayShop/" method="post" class="breadcrumb form-search">
 		<input id="pageNo" name="pageNo" type="hidden" value="${page.pageNo}"/>

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

@@ -301,7 +301,9 @@
         <li><a href="${ctx}/order/cmRefundShop/">退款列表</a></li>
         <li class="active tab-li"><a href="${ctx}/shopOrder/refundRecordList?operatingMode=2">记录退款</a></li>
     </c:if>
+    <shiro:hasPermission name="order:cmPayShop:split">
         <li><a href="${ctx}/shopOrder/splitList">子订单手动分账</a></li>
+    </shiro:hasPermission>
 </ul>
 <form:form id="searchForm" onsubmit="submitFunc()" modelAttribute="newShopOrder"
            action="${ctx}/shopOrder/payOrderList?operatingMode=${operatingMode

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

@@ -295,14 +295,16 @@
      <li><a href="${ctx}/order/cmPayShop">付款列表</a></li>
      <li><a href="${ctx}/shopOrder/payOrderList?operatingMode=1">申请付款</a></li>
      <li><a href="${ctx}/shopOrder/payOrderList?operatingMode=3">已付款子订单</a></li>
-     <li class="active tab-li"><a href="${ctx}/shopOrder/splitList">子订单手动分账</a></li>
+     <shiro:hasPermission name="order:cmPayShop:split">
+         <li class="active tab-li"><a href="${ctx}/shopOrder/splitList">子订单手动分账</a></li>
+     </shiro:hasPermission>
 </ul>
 <form:form id="searchForm"
            action="${ctx}/splitAccount/split" 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="pay-status">
-        <span style="color: red">点击右侧分账按钮，可将以下展示的所有订单的收款金额进行分账，将应付供应商款项金额分账给对应供应商。</span>
+        <span style="color: red">点击右侧分账按钮，可将以下展示的所有子订单金额进行分账，将佣金分账给采美。 </span>
         <input id="btnSubmit" class="btn btn-primary" type="submit" onclick="return confirmx('确定将展示的子订单全部分账吗？', '${ctx}/splitAccount/split')" value="手动分账"/>
     </div>
 </form:form>

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

@@ -658,7 +658,7 @@
                         <a href="javascript:void(0);"
                            onclick="modelShow('${order.orderID}')">编辑经理折扣</a>
                     </c:if>
-                    <c:if test="${order.rebateFlag eq 0 && order.receiptStatus eq 1 && order.payStatus eq 1}">
+                    <c:if test="${order.rebateFlag eq 0 && order.receiptStatus eq 1 && order.payStatus eq 1 && order.secondHandOrderFlag ne 1 && order.rechargeGoods ne 1 && order.rechargeGoods ne 3}">
                         <a href="${ctx}/order/modifyRebate?orderId=${order.orderID}"
                            onclick="return confirmx('确定将订单转为返佣订单吗？', this.href)">转为返佣订单</a>
                     </c:if>

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

@@ -252,7 +252,9 @@
     <li><a href="${ctx}/order/cmPayShop">付款列表</a></li>
     <li><a href="${ctx}/shopOrder/payOrderList?operatingMode=1">申请付款</a></li>
     <li class="active tab-li"><a href="${ctx}/shopOrder/payOrderList?operatingMode=3">已付款子订单</a></li>
+    <shiro:hasPermission name="order:cmPayShop:split">
     <li><a href="${ctx}/shopOrder/splitList">子订单手动分账</a></li>
+    </shiro:hasPermission>
 </ul>
 <form:form id="searchForm" onsubmit="submitFunc()" modelAttribute="newShopOrder"
            action="${ctx}/shopOrder/payOrderList?operatingMode=${operatingMode

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

@@ -399,9 +399,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="1" label="仅会员机构可见"/>
                 <form:option value="3" label="所有人可见"/>
                 <form:option value="2" label="所有机构可见"/>
-                <form:option value="1" label="仅会员机构可见"/>
                 <form:option value="4" label="仅医美机构可见"/>
             </form:select>
         </div>

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

@@ -1,3 +1,4 @@
+<%@ taglib prefix="input" uri="/struts-tags" %>
 <%@ page contentType="text/html;charset=UTF-8" %>
 <%@ include file="/WEB-INF/views/include/taglib.jsp" %>
 <html>
@@ -29,9 +30,16 @@
 <body>
 <ul class="nav nav-tabs">
     <li><a href="${ctx}/user/newCmShop/special/new">新品供应商</a></li>
-    <li class="active"><a
-            href="${ctx}/user/newCmShop/special/new/edit?id=${newCmShop.shopID}&shopType=${newCmshop.shopType}">${not empty newCmShop.shopID?'编辑':'添加'}特殊供应商</a>
-    </li>
+    <c:if test="${newCmShop.shopType eq 2}">
+        <li class="active"><a
+                href="${ctx}/user/newCmShop/special/new/edit?id=${newCmShop.shopID}&shopType=2">${not empty newCmShop.shopID?'编辑':'添加'}特殊供应商</a>
+        </li>
+    </c:if>
+    <c:if test="${newCmShop.shopType eq 3}">
+        <li class="active"><a
+                href="${ctx}/user/newCmShop/special/new/edit?id=${newCmShop.shopID}&shopType=3">${not empty newCmShop.shopID?'编辑':'添加'}特殊供应商</a>
+        </li>
+    </c:if>
 </ul>
 <br/>
 <form:form id="inputForm" modelAttribute="newCmShop" action="${ctx}/user/newCmShop/special/new/save" method="post"
@@ -116,6 +124,7 @@
                             <form:input path="splitCodes[${varIndex.index}].codeRemark" id="paramsContent"
                                         maxlength="15" placeholder="请输入账户备注"
                                         class="input-small"/>
+                            <input name="splitCodes[${varIndex.index}].weChatFlag" type="checkbox" ${item.weChatFlag eq 1 ? 'checked':''} value="1">已确认微信支付开户意愿</input>
                             <span type="button" style="cursor: pointer;color: #0B61A4"
                                   onclick="deleteParams(this)">删除</span>
                         </div>
@@ -130,6 +139,7 @@
 
     <div class="form-actions">
         <input id="btnSubmit" class="btn btn-primary" type="submit" value="保 存"/>&nbsp;
+        <input id="btnCancel" class="btn" type="button" value="返 回" onclick="history.go(-1)"/>
     </div>
 </form:form>
 
@@ -145,6 +155,7 @@
         html += '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<input name="splitCodes[' + [productParametersIndex] + '].splitCode" id="splitCode" maxlength="15" placeholder="请输入分帐商户号" type="text" class="input-small"/>&nbsp;';
         html += '<input name="splitCodes[' + [productParametersIndex] + '].email" id="email" maxlength="15" placeholder="请输入对应邮箱号"  type="text"   class="input-small"/>&nbsp;';
         html += '<input name="splitCodes[' + [productParametersIndex] + '].codeRemark" id="codeRemark" maxlength="15" placeholder="请输入账户备注"  type="text"   class="input-small"/>&nbsp;';
+        html += '<input name="splitCodes[' + [productParametersIndex] + '].weChatFlag" id="weChatFlag" type="checkbox" class="input-small" value="1">已确认微信支付开户意愿</input>&nbsp;';
         html += '<span type="button" style="cursor: pointer;color: #0B61A4" onclick="deleteParams(this)"">删除</span>';
         html += '</div>';
         $("#addParamsItems").append(html).show();

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

@@ -53,6 +53,10 @@
 				<form:option value="12" label="登录奖励"/>
 				<form:option value="13" label="查看商品资料"/>
 				<form:option value="14" label="购买超级会员"/>
+				<form:option value="15" label="系统扣除"/>
+				<form:option value="16" label="系统退回"/>
+				<form:option value="17" label="购买优惠券"/>
+				<form:option value="18" label="购买优惠券退款"/>
 			</form:select>
 			&nbsp;&nbsp;<input id="btnSubmit" class="btn btn-primary" type="submit" value="查询"/>
 			<div class="clearfix"></div>
@@ -120,6 +124,18 @@
 					<c:if test="${userBeansHistory.beansType eq 14}">
 						购买超级会员
 					</c:if>
+					<c:if test="${userBeansHistory.beansType eq 15}">
+						系统扣除
+					</c:if>
+					<c:if test="${userBeansHistory.beansType eq 16}">
+						系统退回
+					</c:if>
+					<c:if test="${userBeansHistory.beansType eq 17}">
+						购买优惠券
+					</c:if>
+					<c:if test="${userBeansHistory.beansType eq 18}">
+						购买优惠券退款
+					</c:if>
 				</td>
 			</tr>
 		</c:forEach>

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

@@ -804,6 +804,7 @@
                             <form:input path="splitCodes[${varIndex.index}].codeRemark" id="paramsContent"
                                         maxlength="15" placeholder="请输入账户备注"
                                         class="input-small"/>
+                            <input name="splitCodes[${varIndex.index}].weChatFlag" type="checkbox" ${item.weChatFlag eq 1 ? 'checked':''} value="1">已确认微信支付开户意愿</input>
                             <span type="button" style="cursor: pointer;color: #0B61A4"
                                   onclick="deleteParams(this)">删除</span>
                         </div>
@@ -1209,8 +1210,9 @@
         productParametersIndex++;
         var html = '<div id="paramsItem" class="paramsItem">';
         html += '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<input name="splitCodes[' + [productParametersIndex] + '].splitCode" id="splitCode" maxlength="15" placeholder="请输入分帐商户号" type="text" class="input-small"/>&nbsp;';
-        html += '<input name="splitCodes[' + [productParametersIndex] + '].email" id="email"maxlength="15" placeholder="请输入对应邮箱号" class="input-small"/>&nbsp;'
+        html += '<input name="splitCodes[' + [productParametersIndex] + '].email" id="email"maxlength="15" placeholder="请输入对应邮箱号" type="text" class="input-small"/>&nbsp;'
         html += '<input name="splitCodes[' + [productParametersIndex] + '].codeRemark" id="codeRemark" maxlength="15" placeholder="请输入账户备注"  type="text"   class="input-small"/>&nbsp;';
+        html += '<input name="splitCodes[' + [productParametersIndex] + '].weChatFlag" id="weChatFlag" type="checkbox" class="input-small" value="1">已确认微信支付开户意愿</input>&nbsp;';
         html += '<span type="button" style="cursor: pointer;color: #0B61A4" onclick="deleteParams(this)"">删除</span>';
         html += '</div>';
         $("#addParamsItems").append(html).show();