最新版本541200007

jiangping

2024-12-30 3af254f1b36e7722673fcebe110da524b276105c

 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/WmsServiceImpl.java

@@ -11,14 +11,17 @@
import com.doumee.core.wms.model.request.*;
import com.doumee.core.wms.model.response.WmsBaseDataResponse;
import com.doumee.core.wms.model.response.WmsBaseResponse;
import com.doumee.core.wms.model.response.WmsInventoryDataResponse;
import com.doumee.core.wx.wxPlat.WxPlatConstants;
import com.doumee.core.wx.wxPlat.WxPlatNotice;
import com.doumee.dao.business.*;
import com.doumee.dao.business.dao.MemberMapper;
import com.doumee.dao.business.dao.SmsConfigMapper;
import com.doumee.dao.business.dao.SmsEmailMapper;
import com.doumee.dao.business.model.*;

import com.doumee.dao.business.model.Member;
import com.doumee.dao.system.SystemUserMapper;
import com.doumee.dao.system.model.SystemUser;
import com.doumee.service.business.impl.SmsEmailServiceImpl;
import com.doumee.service.business.third.EmayService;
import com.doumee.service.business.third.WmsService;
@@ -50,6 +53,8 @@
    private CarsMapper carsMapper;
    @Autowired
    private MemberMapper memberMapper;
    @Autowired
    private SystemUserMapper systemUserMapper;
    @Autowired
    private PlatformJobMapper platformJobMapper;
    @Autowired
@@ -141,10 +146,10 @@
     * @return
     */
    @Override
    public WmsBaseResponse<WmsInventoryDataResponse> getInventoryList(){
    public WmsBaseResponse<WmsBaseDataResponse> getInventoryList(){
         String url =  systemDictDataBiz.queryByCode(Constants.WMS_PARAM,Constants.WMS_GET_INVENTORYLIST_URL).getCode() ;
         String name = "【WMS】库存查询" ;
         WmsBaseResponse<WmsInventoryDataResponse> response = sendHttpRequest(url,name,JSONObject.toJSONString(new JSONObject()),new TypeReference< WmsBaseResponse<WmsInventoryDataResponse>>(){});
         WmsBaseResponse<WmsBaseDataResponse> response = sendHttpRequest(url,name,JSONObject.toJSONString(new JSONObject()),new TypeReference< WmsBaseResponse<WmsBaseDataResponse>>(){});
        if(response!=null
                && response.getData() !=null
                && response.getData().size()>0
@@ -210,6 +215,7 @@
                return  result;
            }catch (Exception e){
                success = 1;
                e.printStackTrace();
                log.error("【"+name+"】================失败===="+ JSONObject.toJSONString(param));
            }finally {
                saveInterfaceLog(url,name,param,success,res,Constants.ZERO);
@@ -237,6 +243,7 @@
                return returnFailReuslt("请求参数不正确，参数不能为空");
            }
            List<PlatformJob> jobList = new ArrayList<>();
            List<Integer> jobIdList = new ArrayList<>();
            List<PlatformWmsDetail> details = new ArrayList<>();
            List<String> iocodeList = new ArrayList<>();
            for(WmsInboundNoticeRequest param : list.getData()){
@@ -272,6 +279,7 @@
                    platformWmsJobMapper.insert(job);
                    jobList.add(model);
                }
                jobIdList.add(job.getId());
                if(param.getDetails()!=null && param.getDetails().size()>0){
                    for(WmsInboundDetailRequest d :param.getDetails()){
                        PlatformWmsDetail entity = new PlatformWmsDetail();
@@ -303,6 +311,7 @@
                platformWmsDetailMapper.insert(details);
            }
            if(jobList.size()>0){
                list.setJobIdList(jobIdList);
                startEndNoticeToDriver(jobList);
            }
        }catch (Exception e){
@@ -315,7 +324,6 @@

    private void startEndNoticeToDriver(List<PlatformJob> jobList) {
        for(PlatformJob job : jobList){
            //-----TODO-----------任康，发送司机公众号和
            //短信通知
            if(Constants.equalsInteger(job.getStatus(),Constants.PlatformJobStatus.WAIT_CONFIRM.getKey())){
                SmsEmailServiceImpl.sendPlatformJobSms(systemDictDataBiz,
@@ -324,20 +332,23 @@
                );
                //查询司机信息 发送公众号通知
                if(Objects.nonNull(job.getDriverId())){
                    Member member = memberMapper.selectOne(new QueryWrapper<Member>().lambda().eq(Member::getPhone,job.getDriverId()));
                    if(Objects.nonNull(member) && StringUtils.isNotBlank(member.getOpenid())){
                    //发送公众号通知 给提交人
                    SystemUser driver = systemUserMapper.selectOne(new QueryWrapper<SystemUser>().lambda()
                            .eq(SystemUser::getDeleted, Constants.ZERO)
                            .eq(SystemUser::getType, Constants.ZERO)
                            .eq(SystemUser::getMobile,job.getDrivierPhone())
                            .last(" limit 1 "));
                    if(Objects.nonNull(driver) && StringUtils.isNotBlank(driver.getOpenid())){
                        WxPlatNotice wxPlatNotice = new WxPlatNotice();
                        wxPlatNotice.sendWmsTemplateNotice(
                        wxPlatNotice.sendWmsTemplateNotice(systemDictDataBiz,
                                wxNoticeConfigMapper,job,
                                WxPlatConstants.platformJobContent.platformJobNewJob,
                                systemDictDataBiz.queryByCode(Constants.WX_PLATFORM,Constants.WX_PLATFORM_ACCESS_TOKEN).getCode(),
                                Arrays.asList(member.getOpenid().split(","))
                                Arrays.asList(driver.getOpenid().split(","))
                        );
                    }
                }
            }


        }
    }

@@ -576,14 +587,20 @@
                        //公众号通知司机 任务取消
                        PlatformJob job = platformJobMapper.selectById(jobId);
                        if(Objects.nonNull(job)){
                             Member member = memberMapper.selectById(job.getDriverId());
                            if(Objects.nonNull(member) && StringUtils.isNotBlank(member.getOpenid())){

                            //发送公众号通知 给提交人
                            SystemUser driver = systemUserMapper.selectOne(new QueryWrapper<SystemUser>().lambda()
                                    .eq(SystemUser::getDeleted, Constants.ZERO)
                                    .eq(SystemUser::getType, Constants.ZERO)
                                    .eq(SystemUser::getMobile,job.getDrivierPhone())
                                    .last(" limit 1 "));
                            if(Objects.nonNull(driver) && StringUtils.isNotBlank(driver.getOpenid())){
                                WxPlatNotice wxPlatNotice = new WxPlatNotice();
                                wxPlatNotice.sendWmsCancelTemplateNotice(
                                wxPlatNotice.sendWmsCancelTemplateNotice(systemDictDataBiz,
                                        wxNoticeConfigMapper,job,
                                        WxPlatConstants.platformJobContent.platformJobCancel,
                                        systemDictDataBiz.queryByCode(Constants.WX_PLATFORM,Constants.WX_PLATFORM_ACCESS_TOKEN).getCode(),
                                        Arrays.asList(member.getOpenid().split(","))
                                        Arrays.asList(driver.getOpenid().split(","))
                                );
                            }
                        }
@@ -651,15 +668,19 @@

                        //公众号通知司机 任务取消
                        PlatformJob job = platformJobMapper.selectById(jobId);
                        if(Objects.nonNull(job)){
                             Member member = memberMapper.selectById(job.getDriverId());
                            if(Objects.nonNull(member) && StringUtils.isNotBlank(member.getOpenid())){
                        if(Objects.nonNull(job)){  //发送公众号通知 给提交人
                            SystemUser driver = systemUserMapper.selectOne(new QueryWrapper<SystemUser>().lambda()
                                    .eq(SystemUser::getDeleted, Constants.ZERO)
                                    .eq(SystemUser::getType, Constants.ZERO)
                                    .eq(SystemUser::getMobile,job.getDrivierPhone())
                                    .last(" limit 1 "));
                            if(Objects.nonNull(driver) && StringUtils.isNotBlank(driver.getOpenid())){
                                WxPlatNotice wxPlatNotice = new WxPlatNotice();
                                wxPlatNotice.sendWmsCancelTemplateNotice(
                                wxPlatNotice.sendWmsCancelTemplateNotice(systemDictDataBiz,
                                        wxNoticeConfigMapper,job,
                                        WxPlatConstants.platformJobContent.platformJobCancel,
                                        systemDictDataBiz.queryByCode(Constants.WX_PLATFORM,Constants.WX_PLATFORM_ACCESS_TOKEN).getCode(),
                                        Arrays.asList(member.getOpenid().split(","))
                                        Arrays.asList(driver.getOpenid().split(","))
                                );
                            }
                        }