黔云通
blame | 历史 | 补丁 | 提交 | 提交对比 | ignore whitespace
Pu Zhibing
4 天以前 3163a383bb58507ac7b0bb56ac20dc26aa1a8e5a 
 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,18 @@


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.mongodb.core.MongoTemplate;


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;




@@ -116,49 +107,47 @@




    @Resource


    private OrderPrivateCarMapper orderPrivateCarMapper;




    


    @Resource


    private OrderTaxiMapper orderTaxiMapper;




    


    @Resource


    private PhoneMapper phoneMapper;




    


    @Autowired


    private IOrderPositionService orderPositionService;




    @Autowired


    private PushMinistryOfTransportUtil pushMinistryOfTransportUtil;




    


    @Resource


    private MongoTemplate mongoTemplate;


    


    @Autowired


    private IOrderCancelService orderCancelService;




    


    @Autowired


    private GeodesyUtil geodesyUtil;




    


    @Autowired


    private PayMoneyUtil payMoneyUtil;




    


    @Autowired


    private IOrderAdditionalFeeService orderAdditionalFeeService;




    @Autowired


    private RedisUtil redisUtil;




    


    @Resource


    private RedisTemplate<String, Object> redisTemplate;


    


    @Autowired


    private IMerchantActivityService merchantActivityService;




    


    @Autowired


    private IMerchantActivitySlaveService merchantActivitySlaveService;




    


    @Autowired


    private IUserMerchantCouponService userMerchantCouponService;




    


    @Autowired


    private IMerchantCouponService merchantCouponService;


    @Autowired


    private QrCodeConfiguration qrCodeConfiguration;


    @Value("${filePath}")


    private String filePath;




    @Value("${pushMinistryOfTransport}")


    private boolean pushMinistryOfTransport;


@@ -368,13 +357,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);


@@ -955,18 +944,8 @@


                orderPosition.setInsertTime(new Date());


                //将数据存储到文件中


                List<OrderPosition> orderPositions = orderPositionService.queryPosition(orderCrossCity.getId(), 3);


                File file = new File(filePath + orderCrossCity.getId() + "_3" + ".txt");


                if(!file.exists()){


                    file.getParentFile().mkdirs();


                    file.createNewFile();


                }


                //写入相应的文件


                PrintWriter out = new PrintWriter(new FileWriter(file));


                orderPositions.add(orderPosition);


                System.err.println("存储新数据：" + JSON.toJSONString(orderPositions));


                out.write(JSON.toJSONString(orderPositions));


                out.flush();


                out.close();


                mongoTemplate.save(orderPositions);


            }


        }


        return false;//上层不需要处理