Merge remote-tracking branch 'origin/master'

xuhy

2025-01-13 98de7181a8e13420734f75d2eba62f1aef298643

Merge remote-tracking branch 'origin/master'

 ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/request/ChangeDispatchRequest.java

@@ -26,5 +26,6 @@
    private List<String> cityList;
    private String [] siteIds;
    private String reservationAddress;
    private String reservationPhone;

}

 ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/GaoDeMapUtil.java

@@ -193,6 +193,8 @@
        String queryResult = getResponse(queryUrl);
        GaoDeAddressInfoVO data = JSONObject.parseObject(queryResult, GaoDeAddressInfoVO.class);
        List<Geocodes> geocodes = data.getGeocodes();
        if (geocodes==null||geocodes.isEmpty())
            return Result.failed(null, "计算失败");
        Geocodes info = geocodes.get(0);
        String adcode = info.getAdcode();
        String city = info.getCity();

 ruoyi-modules/ruoyi-system/src/main/resources/bootstrap.yml

@@ -21,7 +21,7 @@
        server-addr: 127.0.0.1:8848
        service: ${spring.application.name}
        group: DEFAULT_GROUP
        namespace: 5b0cc96f-d058-4986-a46f-64644ff8a467
        namespace: c203d220-3f0c-43f7-88e1-f298717e61e4
        # 线上nacos需要鉴权
#        username: nacos
#        password: jdhs_nacos!
@@ -31,7 +31,7 @@
        # 配置中心地址
        server-addr: 127.0.0.1:8848
        group: DEFAULT_GROUP
        namespace: 5b0cc96f-d058-4986-a46f-64644ff8a467
        namespace: c203d220-3f0c-43f7-88e1-f298717e61e4
        # 线上nacos需要鉴权
#        username: nacos
#        password: jdhs_nacos!

 ruoyi-service/pom.xml

@@ -8,7 +8,6 @@
        <artifactId>ruoyi</artifactId>
        <version>3.6.4</version>
    </parent>

    <artifactId>ruoyi-service</artifactId>
    <packaging>pom</packaging>


 ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/ChangeDispatchController.java

@@ -64,12 +64,13 @@
            @ApiImplicitParam(value = "预约人名称", name = "reservationName", dataType = "String"),
            @ApiImplicitParam(value = "订单编号", name = "orderNumber", dataType = "String"),
            @ApiImplicitParam(value = "下单用户名称", name = "userName", dataType = "String"),
            @ApiImplicitParam(value = "下单用户手机号", name = "reservationPhone", dataType = "String"),
            @ApiImplicitParam(value = "地址", name = "reservationAddress", dataType = "String"),
            @ApiImplicitParam(value = "页码", name = "pageNum", dataType = "Integer", required = true),
            @ApiImplicitParam(value = "每页条数", name = "pageSize", dataType = "Integer", required = true)
    })
    public R<Page<ChangeDispatch>> queryPageList(String workerName, String orderNumber, String userName,String reservationAddress,
                                                 String reservationName,
                                                 String reservationName,String reservationPhone,
                                                 @RequestParam(name = "pageNum", defaultValue = "1") Integer pageNum,
                                                 @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize) {
        LoginUser loginUser = tokenService.getLoginUser();
@@ -86,6 +87,7 @@
        changeDispatchRequest.setPageSize(pageSize);
        changeDispatchRequest.setCityList(cityList);
        changeDispatchRequest.setReservationName(reservationName);
        changeDispatchRequest.setReservationPhone(reservationPhone);
        Integer franchiseeId = loginUser.getSysUser().getFranchiseeId();
        if (franchiseeId!=null) {
            Franchisee byId = franchiseeService.getById(franchiseeId);

 ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/FranchiseeController.java

@@ -122,10 +122,13 @@
            @ApiImplicitParam(value = "管理员", name = "head", dataType = "String"),
            @ApiImplicitParam(value = "手机号码", name = "phone", dataType = "String"),
            @ApiImplicitParam(value = "管辖城市", name = "city", dataType = "String"),
            @ApiImplicitParam(value = "充值/扣款起始时间", name = "date1", dataType = "String"),
            @ApiImplicitParam(value = "充值/扣款结束时间", name = "date2", dataType = "String"),
            @ApiImplicitParam(value = "页码", name = "pageNum", dataType = "Integer", required = true),
            @ApiImplicitParam(value = "每页条数", name = "pageSize", dataType = "Integer", required = true)
    })
    public R<RencentBalance> recentmoney(String name, String head, String phone, String city,
                                         String date1,String date2,
                                         @RequestParam(name = "pageNum", defaultValue = "1") Integer pageNum,
                                         @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize) {
        BigDecimal balance = new BigDecimal(0);
@@ -140,11 +143,11 @@
        for (Franchisee franchisee : list) {
            balance = balance.add(franchisee.getBalance());
        }

        //充值的金额
        BigDecimal balance1 = new BigDecimal(0);
        List<TFranchiseeBalanceChange> list1 = balanceChangeService.lambdaQuery()
                .in(TFranchiseeBalanceChange::getFranchiseeId,collect)
                .between(date1!=null,TFranchiseeBalanceChange::getCreateTime, date1, date2)
                .eq(TFranchiseeBalanceChange::getType, 1).list();
        for (TFranchiseeBalanceChange franchiseeBalanceChange : list1) {
            balance1 = balance1.add(franchiseeBalanceChange.getAmount());
@@ -154,6 +157,7 @@
        List<TFranchiseeBalanceChange> list2 = balanceChangeService.lambdaQuery()
                .in(TFranchiseeBalanceChange::getFranchiseeId,collect)
                .eq(TFranchiseeBalanceChange::getType, 2)
                .between(date1!=null,TFranchiseeBalanceChange::getCreateTime, date1, date2)
                .eq(TFranchiseeBalanceChange::getIs_pay,1).list();
        for (TFranchiseeBalanceChange franchiseeBalanceChange : list2) {
            balance2 = balance2.add(franchiseeBalanceChange.getAmount());
@@ -167,13 +171,14 @@
        return R.ok(balance3);
    }


    @ApiOperation(value = "详情",tags = {"师傅段2.0-统一充值扣款列表"})
    @PostMapping(value = "/change/detail")
    public R<TFranchiseeBalanceChange> detail1(@RequestParam Integer id) throws AlipayApiException {
        TFranchiseeBalanceChange byId = balanceChangeService.getById(id);
        return R.ok(byId);

        TFranchiseeBalanceChange balanceChange = balanceChangeService.getById(id);
        if (balanceChange.getType()==2){
            balanceChange.setPayStr("微信支付");
        }
        return R.ok(balanceChange);
    }


@@ -184,9 +189,10 @@
        SysUser sysUser = sysUserService.getById(userid);
        Page<TFranchiseeBalanceChange> page = balanceChangeService.lambdaQuery().eq(moneyRecentQuery.getType() != null, TFranchiseeBalanceChange::getType, moneyRecentQuery.getType())
                .eq(sysUser.getFranchiseeId() != null, TFranchiseeBalanceChange::getFranchiseeId, sysUser.getFranchiseeId())
                .eq(moneyRecentQuery.getName() != null && !"".equals(moneyRecentQuery.getName()), TFranchiseeBalanceChange::getFranchiseeName, moneyRecentQuery.getName())
                .like(moneyRecentQuery.getName() != null && !"".equals(moneyRecentQuery.getName()), TFranchiseeBalanceChange::getFranchiseeName, moneyRecentQuery.getName())
                .ge(moneyRecentQuery.getDate1() != null, TFranchiseeBalanceChange::getCreateTime, moneyRecentQuery.getDate1())
                .le(moneyRecentQuery.getDate2() != null, TFranchiseeBalanceChange::getCreateTime, moneyRecentQuery.getDate2())
                .eq(moneyRecentQuery.getFranchId()!=null, TFranchiseeBalanceChange::getFranchiseeId, moneyRecentQuery.getFranchId())
                .eq(TFranchiseeBalanceChange::getIs_pay,1)
                .orderByDesc(TFranchiseeBalanceChange::getCreateTime)
                .page(Page.of(moneyRecentQuery.getPageNum(), moneyRecentQuery.getPageSize()));
@@ -198,12 +204,17 @@
                String siteIds = franchisee.getSiteIds();
                List<Site> list1 = siteService.lambdaQuery().in(Site::getId, siteIds.split(",")).list();
                record.setList1(list1);

            }
            String cityCode = franchisee.getCityCode();
            List<Region> list = regionService.lambdaQuery().in(Region::getCode, cityCode.split(",")).list();
            record.setList(list);
            record.setFranchiseeName(franchisee.getName());
            if (record.getType()==1){
                record.setPayStr("扣除旧机款");
            }
            if (record.getType()==2){
                record.setPayStr("充值");
            }
        }
        return R.ok(page);
    }
@@ -219,6 +230,7 @@
                    .eq(moneyRecentQuery.getName() != null && !"".equals(moneyRecentQuery.getName()), TFranchiseeBalanceChange::getFranchiseeName, moneyRecentQuery.getName())
                    .ge(moneyRecentQuery.getDate1() != null, TFranchiseeBalanceChange::getCreateTime, moneyRecentQuery.getDate1())
                    .le(moneyRecentQuery.getDate2() != null, TFranchiseeBalanceChange::getCreateTime, moneyRecentQuery.getDate2())
                    .eq(moneyRecentQuery.getFranchId()!=null, TFranchiseeBalanceChange::getFranchiseeId, moneyRecentQuery.getFranchId())
                    .eq(TFranchiseeBalanceChange::getIs_pay,1)
                    .orderByDesc(TFranchiseeBalanceChange::getCreateTime)
                    .list();
@@ -337,7 +349,7 @@
        map.put("p4_Cur", "1"); /**交易币种 */
        map.put("q5_OpenId", openId);
        map.put("p5_ProductName", "加盟商充值"); /** 商品名称 */
        map.put("p9_NotifyUrl", "https://v7ro848ar5jx.ngrok.xiaomiqiu123.top/admin/franchisee/callBack"); /** 服务器异步通知地址 */
        map.put("p9_NotifyUrl", "http://101.34.55.62:9100/admin/franchisee/callBack"); /** 服务器异步通知地址 */
        map.put("q1_FrpCode", "WEIXIN_APP3"); /** 交易类型*/
        map.put("q7_AppId", "wx1a4a7760be53a835"); /** 交易类型*/
        map.put("qa_TradeMerchantNo", "777165000859101"); /** 777开头的报备商户号   必填！*/
@@ -447,7 +459,7 @@
        map.put("p5_ProductName", "充值"); /** 商品名称 */
        map.put("p6_ProductDesc", "加盟商充值"); /** 商品名称 */
//        map.put("p7_Mp", ""); /** 如果商户请求时传递了该参数，则返回给商户时会原值传 回。 */
        map.put("p9_NotifyUrl", "https://v7ro848ar5jx.ngrok.xiaomiqiu123.top/admin/franchisee/callBack"); /** 服务器异步通知地址 */
        map.put("p9_NotifyUrl", "http://101.34.55.62:9100/admin/franchisee/callBack"); /** 服务器异步通知地址 */
        map.put("q1_FrpCode", "WEIXIN_NATIVE"); /** 微信扫码（主扫）【注：此为用户主扫，商户被扫】*/
        map.put("q4_IsShowPic", "1"); /** 是否展示二 维码图片 1表示输出*/
        map.put("q7_AppId", "wx1a4a7760be53a835"); /** 交易类型*/

 ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/OrderController.java

@@ -191,13 +191,13 @@


        Page<Order> data = orderClient.queryPage(orderQueryRequest).getData();
        List<MasterWorker> list = masterWorkerService.lambdaQuery()
                .eq(MasterWorker::getIsDelete, 0).list();
        if (null != data) {
            for (Order record : data.getRecords()) {
                // 回收服务信息
                Integer serverId = record.getServerId();
                MasterWorker masterWorker = masterWorkerService.lambdaQuery()
                        .eq(MasterWorker::getId, serverId)
                        .eq(MasterWorker::getIsDelete, 0).one();
                MasterWorker masterWorker = list.stream().filter(e -> e.getId().equals(serverId)).findFirst().orElse(null);
                if (null != masterWorker) {
                    record.setServerName(masterWorker.getRealName());
                    record.setServerPhone(masterWorker.getPhone());
@@ -863,9 +863,15 @@
                throw new ServiceException("上门时间格式错误");
            }

            if(!StringUtils.hasLength(address)){
                return R.fail("详细地址不能为空");
            }
            // 解析地址经纬度
            CityInfoVO cityInfoVO = GaoDeMapUtil.getAddressInfo(province + city + area + address).getDatas();
            if(Objects.isNull(cityInfoVO.getLongitude()) || Objects.isNull(cityInfoVO.getLatitude())){
            CityInfoVO cityInfoVO = GaoDeMapUtil.getAddressInfo((province==null?"":province)
                    + (city==null?"":city)
                    + (area==null?"":area)
                    + address).getDatas();
            if(cityInfoVO==null||Objects.isNull(cityInfoVO.getLongitude()) || Objects.isNull(cityInfoVO.getLatitude())){
                return R.fail("地址输入不正确");
            }
            String areaCode = cityInfoVO.getCode();
@@ -876,7 +882,9 @@
            order.setAreaCode(areaCode);
            order.setLongitude(cityInfoVO.getLongitude());
            order.setLatitude(cityInfoVO.getLatitude());

            if (!StringUtils.hasLength(city)){
                order.setCity(cityInfoVO.getCity());
            }
            // 站点信息
            Site site = sites.stream().filter(e -> e.getSiteName().equals(frozenBuckleImportDTO.getSiteName())).findFirst().orElse(null);
            if(Objects.nonNull(site)){
@@ -929,7 +937,6 @@
                System.out.println("服务端发送消息到: " + order.getServerId());
                NettyWebSocketController.sendMsgToClient(context, "您有一条新的订单，请注意查收！");
            }
            return data ? R.ok() : R.fail();
        }
        return R.ok();
    }

 ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/RoleController.java

@@ -65,6 +65,7 @@
    public R<IPage<Role>> queryPageList(@RequestParam(name = "pageNum", defaultValue = "1") Integer pageNum,
                                        @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize) {
        return R.ok(roleService.lambdaQuery().eq(Role::getDelFlag, 0)
                        .ne(Role::getRoleName,"加盟商")
                .orderByDesc(Role::getCreateTime).page(Page.of(pageNum, pageSize)));
    }


 ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/entity/TFranchiseeBalanceChange.java

@@ -86,7 +86,7 @@
    @TableLogic
    private Integer isDelete;
    @TableField(exist = false)
    private String payStr = "扣除旧机款";
    private String payStr;
    @TableField(exist = false)
    private List<Region> list;
    @TableField(exist = false)

 ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/utils/TencentCosUtil.java

@@ -94,7 +94,7 @@
            //上传文件
            PutObjectResult putResult = getCosClient().putObject(bucketName, key, inputStream, objectMetadata);
            // 创建文件的网络访问路径
            String url = "https://huishou-1323682843.cos.ap-nanjing.myqcloud.com/" + key;
            String url = rootSrc + key;
            //关闭 cosClient，并释放 HTTP 连接的后台管理线程
            getCosClient().shutdown();
            return url;

 ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/utils/util/CreateLinkStringByGet1.java

@@ -12,7 +12,6 @@
 */
public class CreateLinkStringByGet1 {
    public static String createLinkStringByGet(Map<String, String> params){
        // TODO Auto-generated method stub
        List<String> keys = new ArrayList<String>(params.keySet());
        Collections.sort(keys);
        String str1 ="";

 ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/utils/util/HttpRespons.java

@@ -132,8 +132,7 @@
        
        
        public static String post(String params,String requestUrl) throws IOException {  
            // TODO Auto-generated method stub  
//            try {       
//            try {
               //HttpRequester request = new HttpRequester();  
               // request.setDefaultContentEncoding("utf-8");     
                byte[] requestBytes = params.getBytes("utf-8"); // 将参数转为二进制流

 ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/vo/MoneyRecentQuery.java

@@ -11,7 +11,7 @@
    @ApiModelProperty("加盟商id")
    private Integer franchId;
    @ApiModelProperty("加盟商名字，查询用")
    private Integer name;
    private String name;
    @ApiModelProperty("1扣款2充值")
    private Integer type;
    @ApiModelProperty("扣款时间1")

 ruoyi-service/ruoyi-admin/src/main/resources/template/导表录单导入模板 .xlsx

Binary files differ

 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/OrderController.java

@@ -592,7 +592,8 @@
                                     @RequestParam("siteIds") List<String> siteIds
    ) {
        Page<Order> page = orderService.lambdaQuery().eq(Order::getUserId, userId)
                .eq(Order::getIsDelete, 0).in(!siteIds.isEmpty(),Order::getSiteId, siteIds).in(!cityList.isEmpty(),Order::getCityCode, cityList).page(Page.of(pageNum, pageSize));
                .eq(Order::getIsDelete, 0)
                .in(!cityList.isEmpty(),Order::getCityCode, cityList).page(Page.of(pageNum, pageSize));
        return R.ok(page);
    }


 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/entity/Order.java

@@ -177,6 +177,31 @@
    @TableField(exist = false)
    private String applyReason;

    @ApiModelProperty("代派单")
    @TableField(exist = false)
    private Integer toBeDispatched=0;
    @ApiModelProperty("待上门")
    @TableField(exist = false)
    private Integer stayDoorstep=0;
    @ApiModelProperty("带完工")
    @TableField(exist = false)
    private Integer toBeCompleted=0;
    @ApiModelProperty("已完结")
    @TableField(exist = false)
    private Integer completed=0;
    @ApiModelProperty("已取消")
    @TableField(exist = false)
    private Integer canceled =0;
    @ApiModelProperty("再投数量")
    @TableField(exist = false)
    private Integer reInvestment=0;







    @ApiModelProperty("是否为再投单")
    @TableField("is_reinvest")
    private Integer isReinvest;

 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/mapper/OrderMapper.java

@@ -112,7 +112,7 @@
     * @param orderQueryRequest 筛选参数
     * @return 统计数量
     */
    List<Order> orderPageCount(@Param("data") OrderQueryRequest orderQueryRequest);
    Order orderPageCount(@Param("data") OrderQueryRequest orderQueryRequest);

    /**
     * 根据所选id查询

 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderServiceImpl.java

@@ -1,4 +1,5 @@
package com.ruoyi.order.service.impl;
import java.util.Date;

import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -131,12 +132,12 @@
        Page<Order> page = Page.of(orderQueryRequest.getPageNum(), orderQueryRequest.getPageSize());
        // 基础查询
        Page<Order> pageList = baseMapper.queryPage(orderQueryRequest, page);
        List<ChangeDispatch> list = changeDispatchService.lambdaQuery()
                .eq(ChangeDispatch::getIsDelete, 0)
                .orderByDesc(ChangeDispatch::getCreateTime).list();
        for (Order order : pageList.getRecords()) {
            ChangeDispatch changeDispatch = changeDispatchService.lambdaQuery()
                    .eq(ChangeDispatch::getOrderId, order.getId())
                    .eq(ChangeDispatch::getIsDelete, 0)
                    .orderByDesc(ChangeDispatch::getCreateTime)
                    .last("limit 1").one();
            ChangeDispatch changeDispatch = list.stream().filter(e -> e.getOrderId().equals(order.getId()))
                    .findFirst().orElse(null);
            if (null != changeDispatch) {
                order.setApplyReason(changeDispatch.getApplyReason());
            }
@@ -160,34 +161,18 @@

    @Override
    public OrderPageCountVO orderPageCount(OrderQueryRequest orderQueryRequest) {
        List<Order> orderList = baseMapper.orderPageCount(orderQueryRequest);
        int total = 0;
        int toBeDispatched = 0;
        int stayDoorstep = 0;
        int toBeCompleted = 0;
        int completed = 0;
        int canceled = 0;
        int reInvestment = 0;
        for (Order order : orderList) {
            total++;
            Integer state = order.getState();
            if (Constants.ZERO.equals(state)) {
                toBeDispatched++;
            } else if (Constants.ONE.equals(state)) {
                stayDoorstep++;
            } else if (Constants.TWO.equals(state)) {
                toBeCompleted++;
            } else if (Constants.THREE.equals(state)) {
                completed++;
            } else if (Constants.FOUR.equals(state)) {
                canceled++;
            }
            if (order.getState().equals(Constants.SIX)) {
                reInvestment++;
            }
        }
        return new OrderPageCountVO(total, toBeDispatched, stayDoorstep,
                toBeCompleted, completed, canceled, reInvestment);
        Order order = baseMapper.orderPageCount(orderQueryRequest);

            Integer toBeDispatched = order.getToBeDispatched();
            Integer stayDoorstep = order.getStayDoorstep();
            Integer toBeCompleted = order.getToBeCompleted();
            Integer completed = order.getCompleted();
            Integer canceled = order.getCanceled();
            Integer reInvestment = order.getReInvestment();
            int total = toBeDispatched + stayDoorstep + toBeCompleted + completed + canceled + reInvestment;
            return new OrderPageCountVO(total, toBeDispatched, stayDoorstep,
                    toBeCompleted, completed, canceled, reInvestment);

    }

    @Override

 ruoyi-service/ruoyi-order/src/main/resources/mapper/order/OrderMapper.xml

@@ -377,8 +377,14 @@
        order by o.createTime desc
    </select>

    <select id="orderPageCount" resultMap="BaseResultMap">
        select o.*
    <select id="orderPageCount" resultType="com.ruoyi.order.entity.Order">
        select
        sum(case when o.state = 0 then 1 end) as toBeDispatched,
        sum(case when o.state = 1 then 1 end) as stayDoorstep,
        sum(case when o.state = 2 then 1 end) as toBeCompleted,
        sum(case when o.state = 3 then 1 end) as completed,
        sum(case when o.state = 4 then 1 end) as canceled,
        sum(case when o.state = 6 then 1 end) as reInvestment
        from t_order o
        <where>
            o.is_delete = 0