Merge branch 'master' of http://git.iamberry.com/liuzhiwei/iamberry-common-tooth

tooth-wechat-service/src/main/java/com/iamberry/wechat/service/mapper/channelRebateMapper.xml

@@ -130,7 +130,9 @@
         update
         tb_iamberry_channel_rebate t
         SET
-                reback_status = 3
+            t.reback_status = 3,
+            t.reback_time = now()
+
         where t.rebate_id IN(
         <foreach collection="rebates" item="item" separator=",">
             ${item}

tooth-wechat-web/src/main/webapp/WEB-INF/views/admin/adminChannel/channelRebate_list.jsp

@@ -64,7 +64,7 @@
                 <th scope="col" colspan="11">积分记录列表</th>
             </tr>
             <tr class="text-c">
-                <th width="150"></th>
+                <th width="50"></th>
                 <th width="150">订单编号</th>
                 <th width="150">订单金额</th>
                 <th width="90">支付金额</th>
@@ -74,6 +74,7 @@
                 <th width="100">返利金额</th>
                 <th width="100">返利状态</th>
                 <th width="100">返利日期</th>
+                <th width="100">创建日期</th>
                 <th width="100">操作</th>
             </tr>
             </thead>
@@ -87,14 +88,15 @@
                     </c:if>
                 </td>
                 <td>${infolist.salesOrderid }</td>
-                <td>${infolist.salesAmount }</td>
-                <td>${infolist.salesYetAmount }</td>
+                <td>${infolist.salesAmount/100 }元</td>
+                <td>${infolist.salesYetAmount/100 }元</td>
                 <td><fmt:formatDate value="${infolist.salesTransactionDate}" pattern="yyyy-MM-dd"/></td>
                 <td>${infolist.colorName}</td>
                 <td>${infolist.itemNum}</td>
-                <td>${infolist.rebackAmount}</td>
+                <td>${infolist.rebackAmount/100}元</td>
                 <td>${infolist.rebackStatus==1?'待返利':''}${infolist.rebackStatus==2?'已返利，待打款':''}${infolist.rebackStatus==3?'已返利，已打款':''}${infolist.rebackStatus==4?'已取消':''}</td>
                 <td><fmt:formatDate value="${infolist.rebackTime}" pattern="yyyy-MM-dd"/></td>
+                <td><fmt:formatDate value="${infolist.rebackCreateTime}" pattern="yyyy-MM-dd"/></td>
                 <td>
                     <c:if test="${infolist.rebackStatus == 2 }">
                         <a onclick="update_status(${infolist.rebateId})">标记已打款</a>
@@ -202,7 +204,7 @@
                     $("#layui-layer4").show();
                     if(channelType == 1){
                         $("#channelName").html(data.data.channel.mainChannelName);
-                        $("#rebackAmount").html(data.data.channel.rebackAmount+"元");
+                        $("#rebackAmount").html((data.data.channel.rebackAmount/100)+"元");
                         $("#channelBank").html(data.data.channel.mainChannelBank);
                         $("#channelBankAccount").html(data.data.channel.mainChannelBankAccount);
                         $("#channelBankName").html(data.data.channel.mainChannelBankName);
@@ -210,7 +212,7 @@
                     }
                     if(channelType == 2){
                         $("#channelName").html(data.data.channel.childChannelName);
-                        $("#rebackAmount").html(data.data.channel.rebackAmount+"元");
+                        $("#rebackAmount").html((data.data.channel.rebackAmount/100)+"元");
                         $("#channelBank").html(data.data.channel.childChannelBank);
                         $("#channelBankAccount").html(data.data.channel.childChannelBankAccount);
                         $("#channelBankName").html(data.data.channel.childChannelBankName);

tooth-wechat-web/src/main/webapp/WEB-INF/views/admin/adminChannel/child_channel_list.jsp

@@ -72,7 +72,7 @@
                 <td>${infolist.mainChannelName }</td>
                 <td>${infolist.childChannelDockingName }</td>
                 <td>${infolist.childChannelDockingTel }</td>
-                <td>${infolist.rebackAmount }</td>
+                <td>${infolist.rebackAmount/100 }元</td>
                 <td>${infolist.childChannelBank }</td>
                 <td>${infolist.childChannelBankAccount}</td>
                 <td>${infolist.childChannelBankName}</td>
@@ -94,56 +94,6 @@
             <%@include file="/common/other/paper/pager.jsp"%>
         </div>
     </form>
-    <div class="layui-layer layui-anim layui-layer-iframe" id="layui-layer4" times="4" showtime="0" contype="string" style="display:none;z-index: 19891018; width: 550px; height: 360px; position: absolute; top: 100px; left: 379px;">
-        <div class="layui-layer-title" id="sendOrderNote" style="cursor: move;" move="ok">结算</div>
-        <br>
-        <div class="row cl">
-            <label class="form-label col-2">&nbsp;&nbsp;渠道名称：</label>
-            <div class="formControls col-3">
-                <b><span id="channelName">
-
-					</span></b>
-            </div>
-        </div>
-        <div class="row cl" style="margin-top: 10px;">
-            <label class="form-label col-2">&nbsp;&nbsp;本次金额：</label>
-            <div class="formControls col-3">
-                        <span id="rebackAmount">
-
-                        </span>
-            </div>
-        </div>
-        <br>
-        <div class="row cl">
-            <div class="formControls col-5">
-                <table class="table table-border table-bordered table-bg" style="width: 450px;margin-left: 10px;">
-                    <thead>
-                    <tr class="text-c">
-                        <th width="150" >账户银行</th>
-                        <th width="150" >收款账号</th>
-                        <th width="150" >开户名称</th>
-                        <th width="90">开户支行</th>
-                    </tr>
-                    </thead>
-                    <tbody>
-                    <tr class="text-c">
-                        <td id="channelBank"></td>
-                        <td id="channelBankAccount"></td>
-                        <td id="channelBankName"></td>
-                        <td id="channelBankBranch"></td>
-                    </tbody>
-                </table>
-            </div>
-        </div>
-        <br>
-        <span style="margin-left: 10px;">请在打款后，点击”确认已结算“按钮，系统将对应的返利记录标记为已打款。</span>
-        <div class="col-9 col-offset-3" style="margin-top: 10px;">
-            <input class="btn btn-danger" type="button" onclick="getChannel()" value="&nbsp;&nbsp;确认已结算&nbsp;&nbsp;">
-        </div>
-        <span class="layui-layer-setwin">
-			<a class="layui-layer-ico layui-layer-close layui-layer-close1" onclick="exitWindowsDiv(this)" href="javascript:;"></a>
-		</span>
-    </div>
 </div>
 <script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/lib/jquery/1.9.1/jquery.min.js"></script>
 <script type="text/javascript" src="${pageContext.request.contextPath }/common/admin/lib/layer/1.9.3/layer.js"></script>

tooth-wechat-web/src/main/webapp/WEB-INF/views/admin/adminChannel/main_channel_list.jsp

@@ -71,7 +71,7 @@
                 <td>${infolist.mainChannelName }</td>
                 <td>${infolist.mainChannelDockingName }</td>
                 <td>${infolist.mainChannelDockingTel }</td>
-                <td>${infolist.rebackAmount }</td>
+                <td>${infolist.rebackAmount/100 }元</td>
                 <td>${infolist.mainChannelBank }</td>
                 <td>${infolist.mainChannelBankAccount}</td>
                 <td>${infolist.mainChannelBankName}</td>