黔云通
blame | 历史 | 补丁 | 提交 | 提交对比 | ignore whitespace
Pu Zhibing
7 天以前 8675ddc7e76f418ee47adc50ee7bac35171a9620 
 DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/server/impl/OrderCrossCityServiceImpl.java


@@ -6,7 +6,6 @@


import com.baomidou.mybatisplus.mapper.EntityWrapper;


import com.baomidou.mybatisplus.service.impl.ServiceImpl;


import com.stylefeng.guns.core.util.ToolUtil;


import com.stylefeng.guns.modular.account.controller.AppOrderController;


import com.stylefeng.guns.modular.account.unionpay.GetOpenBodySig;


import com.stylefeng.guns.modular.account.unionpay.QrCodeConfiguration;


import com.stylefeng.guns.modular.account.unionpay.Util;


@@ -21,7 +20,6 @@


import com.stylefeng.guns.modular.crossCity.warpper.OrderCrossCityWarpper;


import com.stylefeng.guns.modular.specialTrain.dao.OrderPrivateCarMapper;


import com.stylefeng.guns.modular.specialTrain.model.OrderPrivateCar;


import com.stylefeng.guns.modular.specialTrain.server.IOrderPrivateCarService;


import com.stylefeng.guns.modular.system.dao.PhoneMapper;


import com.stylefeng.guns.modular.system.dao.RegionMapper;


import com.stylefeng.guns.modular.system.dao.SysIntegralMapper;


@@ -33,25 +31,20 @@


import com.stylefeng.guns.modular.system.warpper.MerchantCouponListWarpper;


import com.stylefeng.guns.modular.taxi.dao.OrderTaxiMapper;


import com.stylefeng.guns.modular.taxi.model.OrderTaxi;


import com.stylefeng.guns.modular.taxi.service.IOrderTaxiService;


import io.swagger.models.auth.In;


import org.apache.commons.lang.time.DateFormatUtils;


import org.springframework.beans.factory.annotation.Autowired;


import org.springframework.beans.factory.annotation.Value;


import org.springframework.data.redis.core.RedisTemplate;


import org.springframework.stereotype.Service;


import org.springframework.transaction.annotation.Isolation;


import org.springframework.transaction.annotation.Propagation;


import org.springframework.transaction.annotation.Transactional;


import org.springframework.util.CollectionUtils;




import javax.annotation.Resource;


import java.io.File;


import java.io.FileWriter;


import java.io.PrintWriter;


import java.math.BigDecimal;


import java.math.MathContext;


import java.math.RoundingMode;


import java.text.SimpleDateFormat;


import java.util.*;


import java.util.stream.Collectors;




@@ -140,9 +133,9 @@




    @Autowired


    private IOrderAdditionalFeeService orderAdditionalFeeService;




    


    @Autowired


    private RedisUtil redisUtil;


    private RedisTemplate redisTemplate;




    @Autowired


    private IMerchantActivityService merchantActivityService;


@@ -368,13 +361,13 @@


                    }


                    merchantActivityService.updateBatchById(merchantActivities);


                }


                String value = redisUtil.getValue("merchantVoucher");


                String value = (String) redisTemplate.opsForValue().get("merchantVoucher");


                JSONObject jsonObject = JSON.parseObject(value);


                if(null == jsonObject){


                    jsonObject = new JSONObject();


                }


                jsonObject.put(userInfo.getPhone(), listWarppers);


                redisUtil.setStrValue("merchantVoucher", jsonObject.toJSONString());


                redisTemplate.opsForValue().set("merchantVoucher", jsonObject.toJSONString());




                pushUtil.removeTask(orderId, 3);//删除定时任务，结束推送数据


                systemNoticeService.addSystemNotice(1, "司机已结束本次行程，谢谢使用", orderCrossCity.getUserId(), 1);