修改bug

puzhibing

2023-12-22 a0efb3f1c1eb1269e8cd0f0dda2543a9dadddb93

 ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/UserActivityServiceImpl.java

@@ -16,10 +16,7 @@
import org.springframework.stereotype.Service;

import javax.annotation.Resource;
import java.util.Date;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.*;

/**
 * <p>
@@ -136,10 +133,11 @@
                }
            }
            //添加打折活动
            UserActivityDiscount1 userActivityDiscount1 = null;
            if(SinataUtil.isNotEmpty(discountSpecial) &&
                    /*SinataUtil.isNotEmpty(discountTaxi) &&*/
                    SinataUtil.isNotEmpty(discountLogistics)){
                UserActivityDiscount1 userActivityDiscount1 = new UserActivityDiscount1();
                userActivityDiscount1 = new UserActivityDiscount1();
                userActivityDiscount1.setUserActivityId(userActivity.getId());
                userActivityDiscount1.setStartTime(startTimes);
                userActivityDiscount1.setEndTime(endTimes);
@@ -166,6 +164,29 @@
                userActivityRedenvelope.setLavePrice(redPrice);
                userActivityRedenvelope.insertOrUpdate();
            }

            if(SinataUtil.isNotEmpty(discountSpecial) &&
                    /*SinataUtil.isNotEmpty(discountTaxi) &&*/
                    SinataUtil.isNotEmpty(discountLogistics)){
                UserActivityDiscount1 finalUserActivityDiscount = userActivityDiscount1;
                new Thread(new Runnable() {
                    @Override
                    public void run() {
                        Date startTime1 = userActivity.getStartTime();
                        Date endTime = userActivity.getEndTime();
                        if(System.currentTimeMillis() >= startTime1.getTime() && System.currentTimeMillis() < endTime.getTime()){
                            List<UserActivityDiscount1> list = new ArrayList();
                            list.add(finalUserActivityDiscount);
                            try {
                                userActivityDiscount1Service.sendEmail(list);
                            } catch (Exception e) {
                                e.printStackTrace();
                            }
                        }
                    }
                }).start();
            }

        }else{
            String[] timeArray = startTime.split(" - ");
            Date startTimes = DateUtil.getDate_str3(timeArray[0]);