|
|
@@ -42,6 +42,7 @@ import com.zbkj.service.dao.OrderDao;
|
|
|
import com.zbkj.service.dao.UserDao;
|
|
|
import com.zbkj.service.service.*;
|
|
|
import io.swagger.models.auth.In;
|
|
|
+import org.apache.commons.lang3.StringUtils;
|
|
|
import org.springframework.beans.BeanUtils;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.stereotype.Service;
|
|
|
@@ -49,6 +50,7 @@ import org.springframework.transaction.support.TransactionTemplate;
|
|
|
|
|
|
import javax.annotation.Resource;
|
|
|
import java.math.BigDecimal;
|
|
|
+import java.text.SimpleDateFormat;
|
|
|
import java.util.*;
|
|
|
import java.util.stream.Collectors;
|
|
|
|
|
|
@@ -203,7 +205,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderDao, Order> implements Or
|
|
|
lqw.and(i -> i.ne(Order::getIsIntegral, 1).or().isNull(Order::getIsIntegral));
|
|
|
lqw.and(i -> i.eq(Order::getQyId, id).or().isNull(Order::getQyId));
|
|
|
lqw.in(Order::getUid, ids);
|
|
|
- if (0!= isRemit) {
|
|
|
+ if (0 != isRemit) {
|
|
|
lqw.eq(Order::getIsRemit, isRemit);
|
|
|
lqw.eq(Order::getPayType, "信用额度");
|
|
|
}
|
|
|
@@ -223,6 +225,14 @@ public class OrderServiceImpl extends ServiceImpl<OrderDao, Order> implements Or
|
|
|
lqw.eq(Order::getIsMerchantDel, false);
|
|
|
lqw.in(Order::getType, OrderConstants.ORDER_TYPE_NORMAL, OrderConstants.ORDER_TYPE_SECKILL);
|
|
|
lqw.eq(Order::getIsDel, false);
|
|
|
+ HashMap<String, String> info = systemConfigService.info(19);
|
|
|
+ String orderExpireTime = info.get("orderExpireTime");
|
|
|
+ String orderExpireTime1="-"+orderExpireTime;
|
|
|
+ Calendar c = Calendar.getInstance();
|
|
|
+ c.add(Calendar.DAY_OF_MONTH, Integer.parseInt(orderExpireTime1));
|
|
|
+ SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
|
|
|
+ String mDateTime = formatter.format(c.getTime());
|
|
|
+ lqw.apply(StringUtils.isNotBlank(mDateTime),"DATE(create_time) >= STR_TO_DATE('"+mDateTime+"','%Y-%m-%d')");
|
|
|
lqw.orderByDesc(Order::getId);
|
|
|
List<Order> orderList = dao.selectList(lqw);
|
|
|
return CommonPage.copyPageInfo(page, orderList);
|
|
|
@@ -1080,7 +1090,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderDao, Order> implements Or
|
|
|
MerchantSmsTemplate merchantSmsTemplate = merchantSmsTemplateService.getById(id);
|
|
|
String tempId = merchantSmsTemplate.getTempId();
|
|
|
MerchantSmsTiming merchantSmsTiming = merchantSmsTimingService.selectByTempId(tempId);
|
|
|
- if(null!=merchantSmsTiming){
|
|
|
+ if (null != merchantSmsTiming) {
|
|
|
String phone = merchantSmsTiming.getPhone();
|
|
|
String[] list = phone.split(",");
|
|
|
//如果下过订单的用户手机号存在定时任务发送手机号的列表中则不显示该条信息
|
