xuhy
2023-03-23 e44562ed22567fd05f3e1c9be8fe336990eeab6e
代理商客服电话
6个文件已修改
52 ■■■■ 已修改文件
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TAgentController.java 23 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TAgent.java 14 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TAgentServiceImpl.java 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
management/guns-admin/src/main/webapp/WEB-INF/view/system/tAgent/tAgentDetail.html 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
management/guns-admin/src/main/webapp/WEB-INF/view/system/tAgent/tAgent_add.html 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
management/guns-admin/src/main/webapp/static/modular/system/tAgent/tAgent.js 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TAgentController.java
@@ -249,7 +249,7 @@
            DateFormat format = new SimpleDateFormat("yyyyMMdd");
            String time1 = format.format(date);
            String fileName = "Agent"+time1+".xls";
            String[] title = new String[] {"时间","姓名","联系电话","代理区域","订单数量",
            String[] title = new String[] {"时间","姓名","联系电话","代理区域","客服电话","订单数量",
                    "有效订单","已发放优惠券","已使用优惠券","累计优惠券金额","司机充值","司机数","状态"};
            EntityWrapper<TAgent> wrapper = tAgentService.getAgentWrapper(principal,principalPhone,createTime);
            // 是否异常
@@ -265,20 +265,21 @@
                values[i][1] = d.getPrincipal();
                values[i][2] = d.getPrincipalPhone();
                values[i][3] = d.getProvinceName()+d.getCityName();
                values[i][4] = String.valueOf(d.getOrderSum());
                values[i][5] = String.valueOf(d.getValidOrder());
                values[i][6] = String.valueOf(d.getIssuedCoupon());
                values[i][7] = String.valueOf(d.getUsedCoupon());
                values[i][8] = String.valueOf(d.getCouponPriceSum());
                values[i][9] = String.valueOf(d.getDriverRecharge() == null ? "0":d.getDriverRecharge());
                values[i][10] = String.valueOf(d.getDriverCount());
                values[i][4] = StringUtils.hasLength(d.getServiceCalls())?d.getServiceCalls():"";
                values[i][5] = String.valueOf(d.getOrderSum());
                values[i][6] = String.valueOf(d.getValidOrder());
                values[i][7] = String.valueOf(d.getIssuedCoupon());
                values[i][8] = String.valueOf(d.getUsedCoupon());
                values[i][9] = String.valueOf(d.getCouponPriceSum());
                values[i][10] = String.valueOf(d.getDriverRecharge() == null ? "0":d.getDriverRecharge());
                values[i][11] = String.valueOf(d.getDriverCount());
                Integer status1 = d.getStatus();
                if(1 == status1){
                    values[i][11] = "正常";
                    values[i][12] = "正常";
                }else if(2 == status1){
                    values[i][11] = "冻结";
                    values[i][12] = "冻结";
                }else {
                    values[i][11] = "删除";
                    values[i][12] = "删除";
                }
            }
            HSSFWorkbook wb = ExcelUtil.getHSSFWorkbook("Variance"+time1, title, values, null);
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TAgent.java
@@ -79,6 +79,12 @@
    @ApiModelProperty(value = "银行账户")
    private String bankAccount;
    @TableField(value = "serviceCalls")
    @ApiModelProperty(value = "客服电话")
    private String serviceCalls;
    @TableField(exist = false)
    @ApiModelProperty(value = "区域")
@@ -88,6 +94,14 @@
    @ApiModelProperty(value = "区域id")
    private String areaId;
    public String getServiceCalls() {
        return serviceCalls;
    }
    public void setServiceCalls(String serviceCalls) {
        this.serviceCalls = serviceCalls;
    }
    public String getAreaId() {
        return areaId;
    }
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TAgentServiceImpl.java
@@ -89,6 +89,7 @@
        model.addAttribute("principal",tAgent.getPrincipal());
        model.addAttribute("principalPhone",tAgent.getPrincipalPhone());
        model.addAttribute("email",tAgent.getEmail());
        model.addAttribute("serviceCalls",tAgent.getServiceCalls());
        model.addAttribute("area",tAgent.getProvinceName()+tAgent.getCityName());
        // 订单信息
        // 订单总量
management/guns-admin/src/main/webapp/WEB-INF/view/system/tAgent/tAgentDetail.html
@@ -38,6 +38,13 @@
                            </div>
                        </div>
                        <div class="initialLevel col-sm-12 control-label form-group"  >
                            <div class="initialLevel col-sm-3 control-label form-group"  >
                                <label class="control-label" >客服电话:</label>
                                <label>${serviceCalls}</label>
                            </div>
                        </div>
                        <hr/>
                        <div class="initialLevel col-sm-12 control-label form-group"  >
                            <div style="background-color: gray;height: 35px;line-height: 35px">
management/guns-admin/src/main/webapp/WEB-INF/view/system/tAgent/tAgent_add.html
@@ -49,6 +49,12 @@
                            <input id="bankAccount" name="bankAccount" type="number" maxlength="20" placeholder="请输入" style="height: 30px">
                        </div>
                    </div>
                    <div class="initialLevel col-sm-12 control-label form-group">
                        <div class="initialLevel col-sm-6 control-label form-group"  >
                            <label class="control-label" >客服电话:</label>
                            <input id="serviceCalls" name="serviceCalls" type="number" maxlength="20" placeholder="请输入" style="height: 30px">
                        </div>
                    </div>
                </div>
management/guns-admin/src/main/webapp/static/modular/system/tAgent/tAgent.js
@@ -19,6 +19,7 @@
            {title: '姓名', field: 'principal', visible: true, align: 'center', valign: 'middle'},
            {title: '联系电话', field: 'principalPhone', visible: true, align: 'center', valign: 'middle'},
            {title: '代理区域', field: 'area', visible: true, align: 'center', valign: 'middle'},
            {title: '客服电话', field: 'serviceCalls', visible: true, align: 'center', valign: 'middle'},
            {title: '订单数量', field: 'orderSum', visible: true, align: 'center', valign: 'middle'},
            {title: '有效订单', field: 'validOrder', visible: true, align: 'center', valign: 'middle'},
            {title: '已发放优惠券', field: 'issuedCoupon', visible: true, align: 'center', valign: 'middle'},