1.转派分配消息推送2.修改bug

fengjin

2022-10-18 dbe7bf87ee1188694f5029a6dd2351df09770c0c

1.转派分配消息推送2.修改bug

 flower_city/src/main/java/com/dg/core/api/GuideRepairOrderAppletsController.java

@@ -1,7 +1,6 @@
package com.dg.core.api;


import com.alibaba.fastjson.JSON;
import com.dg.core.ResultData;
import com.dg.core.annotation.Authorization;
import com.dg.core.annotation.CurrentUser;
@@ -9,7 +8,6 @@
import com.dg.core.db.gen.entity.GuideEvolveEntity;
import com.dg.core.db.gen.entity.GuideRepairOrder;
import com.dg.core.db.gen.entity.SysUser;
import com.dg.core.db.manual.mapper.util.ConstantPropertiesUtil;
import com.dg.core.service.IGuideEvolveService;
import com.dg.core.service.IGuideRepairOrderService;
import com.dg.core.util.SmsUtil;
@@ -21,11 +19,8 @@
import org.springframework.web.bind.annotation.*;

import javax.annotation.Resource;
import java.io.IOException;
import java.time.LocalDateTime;
import java.util.Map;

import static com.dg.core.util.WxUtil.httpGet;


/**
@@ -128,12 +123,11 @@
        GuideEvolveEntity entity=new GuideEvolveEntity();
        entity.setCreateTime(LocalDateTime.now());
        entity.setUpdateTime(LocalDateTime.now());
        entity.setState("12");
        entity.setState("10");
        entity.setDepartmentalId(order.getGuideDepartmentId());
        entity.setToUserId(order.getGuideUserId());
        entity.setFromUserId(sysUser.getUserId()+"");
        entity.setFromDepartmentalId(sysUser.getDepartmentId());

        iGuideEvolveService.insertConfig(entity);
        iGuideRepairOrderService.updateSysUserOrderNum(entity);


 flower_city/src/main/java/com/dg/core/controller/GuideRepairOrderController.java

@@ -128,7 +128,7 @@
        GuideEvolveEntity entity=new GuideEvolveEntity();
        entity.setCreateTime(LocalDateTime.now());
        entity.setUpdateTime(LocalDateTime.now());
        entity.setState("13");
        entity.setState("11");
        entity.setDepartmentalId(sysUser.getDepartmentId());
        entity.setToUserId(sysUser.getUserId()+"");
        entity.setFromUserId(order.getGuideUserId());
@@ -173,7 +173,7 @@
        GuideEvolveEntity entity=new GuideEvolveEntity();
        entity.setCreateTime(LocalDateTime.now());
        entity.setUpdateTime(LocalDateTime.now());
        entity.setState("12");
        entity.setState("10");
        entity.setDepartmentalId(order.getGuideDepartmentId());
        entity.setToUserId(order.getGuideUserId());
        entity.setFromUserId(sysUser.getUserId()+"");

 flower_city/src/main/java/com/dg/core/db/gen/entity/GuideEvolveEntity.java

@@ -54,7 +54,7 @@
    private String fromUserId;

    /**
     * 状态（1待分配  2 待办结 3 已办结 4 待评价 5 已取消  7未解决  8已解决  9 系统自动分配  10 回复   11转派    12手动分配）
     * state", value = "状态（1待分配  2 待办结 3 已办结 4 待评价 5 已取消 6未解决  7已解决  8 系统自动分配 9 回复 10转派 11手动分配）
     */
    @ApiModelProperty(name = "state", value = "状态（1待分配  2 待办结 3 已办结 4 待评价 5 已取消 6未解决  7已解决  8 系统自动分配 9 回复 10转派 11手动分配）")
    private String state;

 flower_city/src/main/java/com/dg/core/service/IGuideRepairOrderService.java

@@ -93,4 +93,11 @@
     */
    GuideRepairOrder setTimeoutTim(GuideRepairOrder guideRepairOrder);


    /**
     * 导办人员有新订单推送消息
     * @return
     */
    void  sendGuideRepairOrderSubmit (String openid,GuideRepairOrder guideRepairOrder);

}

 flower_city/src/main/java/com/dg/core/service/impl/GuideRepairOrderServiceImpl.java

@@ -101,6 +101,7 @@
                    sysUserMapper.updateById(sysUser);
                    guideRepairOrder.setGuideUserId(sysUser.getUserId().toString());
                    guideRepairOrder.setGuideDepartmentId(sysUser.getDepartmentId());
                    guideRepairOrder.setGuideUserPhone(sysUser.getPhonenumber());
                    //新增分配记录
                    GuideEvolveEntity entity = new GuideEvolveEntity();
                    entity.setCreateTime(LocalDateTime.now());
@@ -115,15 +116,7 @@
                    guideRepairOrder=this.setTimeoutTim(guideRepairOrder);
                    //超时时间设置业务结束
                    //消息推送
                    WxUtil wxUtil=new WxUtil();
                    String accessToken="0";
                    try {
                        accessToken= wxUtil.getBatteryCarAccessToken();
                    } catch (Exception e) {
                        throw new RuntimeException(e);
                    }
                    wxUtil.sendGuideRepairOrderSubmit(sysUser.getOpenid(),accessToken,"WggWK_yG7_qfrTj8bQe-2co4ATgpXamLzT1xvrTu4K0",guideRepairOrder);
//                    smsUtil.sendSmsOvertime(sysUser.getPhonenumber(),guideRepairOrder.getMatterName());
                    this.sendGuideRepairOrderSubmit(sysUser.getOpenid(),guideRepairOrder);
                    guideEvolveMapper.insertConfig(entity);
                }
            } else {//如果该办事指南用户所选所属地区无导半部门则为特殊单据需要手动分配
@@ -133,6 +126,7 @@

            guideRepairOrder.setCreateTime(LocalDateTime.now());
            guideRepairOrder.setUpdateTime(LocalDateTime.now());
            guideRepairOrder.setIsPush(2);
            transactionEvent.setTransactionNum(transactionEvent.getTransactionNum() + 1);
            //保存图片地址
            if (guideRepairOrder.getImages() != null) {
@@ -219,16 +213,26 @@

    @Override
    public int updateSysUserOrderNum(GuideEvolveEntity order) {
        if (order.getState().equals("13")) {
        if (order.getState().equals("11")) {
            SysUser sysUser = sysUserMapper.selectOne(new QueryWrapper<SysUser>().lambda().eq(SysUser::getUserId, order.getToUserId()));
            GuideRepairOrder guideRepairOrder = baseMapper.selectOne(new QueryWrapper<GuideRepairOrder>().lambda()
                    .eq(GuideRepairOrder::getId, order.getGuideId()));
            if (guideRepairOrder!=null){
                this.sendGuideRepairOrderSubmit(sysUser.getOpenid(),guideRepairOrder);
            }
            sysUser.setTransactionNum(sysUser.getTransactionNum() + 1);
            return sysUserMapper.updateById(sysUser);
        } else if (order.getState().equals("12")) {
        } else if (order.getState().equals("10")) {
            SysUser sysUserTo = sysUserMapper.selectOne(new QueryWrapper<SysUser>().lambda().eq(SysUser::getUserId, order.getToUserId()));
            SysUser sysUserFrom = sysUserMapper.selectOne(new QueryWrapper<SysUser>().lambda().eq(SysUser::getUserId, order.getFromUserId()));
            sysUserTo.setTransactionNum(sysUserTo.getTransactionNum() + 1);
            sysUserFrom.setTransactionNum(sysUserFrom.getTransactionNum() - 1);
            sysUserMapper.updateById(sysUserFrom);
            GuideRepairOrder guideRepairOrder = baseMapper.selectOne(new QueryWrapper<GuideRepairOrder>().lambda()
                    .eq(GuideRepairOrder::getId, order.getGuideId()));
            if (guideRepairOrder!=null){
                this.sendGuideRepairOrderSubmit(sysUserTo.getOpenid(),guideRepairOrder);
            }
            return sysUserMapper.updateById(sysUserTo);
        } else if (order.getState().equals("7")) {
            SysUser sysUserFrom = sysUserMapper.selectOne(new QueryWrapper<SysUser>().lambda().eq(SysUser::getUserId, order.getFromUserId()));
@@ -305,5 +309,18 @@
        return guideRepairOrder;
    }

    @Override
    public void  sendGuideRepairOrderSubmit (String openid,GuideRepairOrder guideRepairOrder){
        WxUtil wxUtil=new WxUtil();
        String accessToken="0";
        try {
            accessToken= wxUtil.getBatteryCarAccessToken();
        } catch (Exception e) {
            throw new RuntimeException(e);
        }
        wxUtil.sendGuideRepairOrderSubmit(openid,accessToken,"WggWK_yG7_qfrTj8bQe-2co4ATgpXamLzT1xvrTu4K0",guideRepairOrder);
//                    smsUtil.sendSmsOvertime(sysUser.getPhonenumber(),guideRepairOrder.getMatterName());
    }


}