|
@@ -14,8 +14,7 @@ import com.sqx.modules.app.service.UserMoneyDetailsService;
|
|
|
import com.sqx.modules.app.service.UserService;
|
|
import com.sqx.modules.app.service.UserService;
|
|
|
import com.sqx.modules.common.entity.CommonInfo;
|
|
import com.sqx.modules.common.entity.CommonInfo;
|
|
|
import com.sqx.modules.common.service.CommonInfoService;
|
|
import com.sqx.modules.common.service.CommonInfoService;
|
|
|
-import com.sqx.modules.coupon.dao.TbCouponUserDao;
|
|
|
|
|
-import com.sqx.modules.coupon.entity.TbCouponUser;
|
|
|
|
|
|
|
+import com.sqx.modules.coupon.service.TbCouponUserService;
|
|
|
import com.sqx.modules.datacentre.dao.DataCentreDao;
|
|
import com.sqx.modules.datacentre.dao.DataCentreDao;
|
|
|
import com.sqx.modules.datacentre.query.DataCenterQuery;
|
|
import com.sqx.modules.datacentre.query.DataCenterQuery;
|
|
|
import com.sqx.modules.datacentre.query.RankListQuery;
|
|
import com.sqx.modules.datacentre.query.RankListQuery;
|
|
@@ -26,47 +25,40 @@ import com.sqx.modules.errand.entity.TbIndent;
|
|
|
import com.sqx.modules.order.dao.AppOrderDao;
|
|
import com.sqx.modules.order.dao.AppOrderDao;
|
|
|
import com.sqx.modules.order.entity.TbOrder;
|
|
import com.sqx.modules.order.entity.TbOrder;
|
|
|
import com.sqx.modules.pay.controller.app.AliPayController;
|
|
import com.sqx.modules.pay.controller.app.AliPayController;
|
|
|
-import com.sqx.modules.pay.controller.query.WalletDetailQuery;
|
|
|
|
|
import com.sqx.modules.pay.dao.PayDetailsDao;
|
|
import com.sqx.modules.pay.dao.PayDetailsDao;
|
|
|
import com.sqx.modules.pay.entity.CashOut;
|
|
import com.sqx.modules.pay.entity.CashOut;
|
|
|
import com.sqx.modules.pay.entity.PayDetails;
|
|
import com.sqx.modules.pay.entity.PayDetails;
|
|
|
import com.sqx.modules.pay.service.WxErrRiderService;
|
|
import com.sqx.modules.pay.service.WxErrRiderService;
|
|
|
-import com.sqx.modules.pay.vo.WalletDetailVO;
|
|
|
|
|
|
|
+import com.sqx.modules.utils.VipExpirationUtil;
|
|
|
import com.sqx.modules.utils.excel.ExcelData;
|
|
import com.sqx.modules.utils.excel.ExcelData;
|
|
|
|
|
+import lombok.RequiredArgsConstructor;
|
|
|
import lombok.extern.slf4j.Slf4j;
|
|
import lombok.extern.slf4j.Slf4j;
|
|
|
import org.apache.commons.lang.StringUtils;
|
|
import org.apache.commons.lang.StringUtils;
|
|
|
-import org.springframework.beans.factory.annotation.Autowired;
|
|
|
|
|
import org.springframework.stereotype.Service;
|
|
import org.springframework.stereotype.Service;
|
|
|
import org.springframework.transaction.annotation.Transactional;
|
|
import org.springframework.transaction.annotation.Transactional;
|
|
|
|
|
|
|
|
import java.math.BigDecimal;
|
|
import java.math.BigDecimal;
|
|
|
import java.text.SimpleDateFormat;
|
|
import java.text.SimpleDateFormat;
|
|
|
-import java.util.*;
|
|
|
|
|
|
|
+import java.util.ArrayList;
|
|
|
|
|
+import java.util.Arrays;
|
|
|
|
|
+import java.util.Date;
|
|
|
|
|
+import java.util.HashMap;
|
|
|
|
|
+import java.util.List;
|
|
|
|
|
|
|
|
@Service
|
|
@Service
|
|
|
@Slf4j
|
|
@Slf4j
|
|
|
|
|
+@RequiredArgsConstructor
|
|
|
public class DataCentreServiceImpl implements DataCentreService {
|
|
public class DataCentreServiceImpl implements DataCentreService {
|
|
|
|
|
|
|
|
- @Autowired
|
|
|
|
|
- private DataCentreDao dataCentreDao;
|
|
|
|
|
- @Autowired
|
|
|
|
|
- private UserDao userDao;
|
|
|
|
|
- @Autowired
|
|
|
|
|
- private AppOrderDao appOrderDao;
|
|
|
|
|
- @Autowired
|
|
|
|
|
- private WxErrRiderService wxErrRiderService;
|
|
|
|
|
- @Autowired
|
|
|
|
|
- private AliPayController aliPayController;
|
|
|
|
|
- @Autowired
|
|
|
|
|
- private UserService userService;
|
|
|
|
|
- @Autowired
|
|
|
|
|
- private PayDetailsDao payDetailsDao;
|
|
|
|
|
- @Autowired
|
|
|
|
|
- private UserMoneyDetailsService userMoneyDetailsService;
|
|
|
|
|
- @Autowired
|
|
|
|
|
- private CommonInfoService commonInfoService;
|
|
|
|
|
- @Autowired
|
|
|
|
|
- private TbCouponUserDao tbCouponUserDao;
|
|
|
|
|
|
|
+ private final DataCentreDao dataCentreDao;
|
|
|
|
|
+ private final UserDao userDao;
|
|
|
|
|
+ private final AppOrderDao appOrderDao;
|
|
|
|
|
+ private final WxErrRiderService wxErrRiderService;
|
|
|
|
|
+ private final UserService userService;
|
|
|
|
|
+ private final PayDetailsDao payDetailsDao;
|
|
|
|
|
+ private final UserMoneyDetailsService userMoneyDetailsService;
|
|
|
|
|
+ private final CommonInfoService commonInfoService;
|
|
|
|
|
+ private final TbCouponUserService tbCouponUserService;
|
|
|
|
|
|
|
|
@Override
|
|
@Override
|
|
|
public Result dataCentre() {
|
|
public Result dataCentre() {
|
|
@@ -383,46 +375,25 @@ public class DataCentreServiceImpl implements DataCentreService {
|
|
|
@Transactional
|
|
@Transactional
|
|
|
@Override
|
|
@Override
|
|
|
public Result presenterVip(Long userId) {
|
|
public Result presenterVip(Long userId) {
|
|
|
- UserEntity userEntity1 = userDao.selectById(userId);
|
|
|
|
|
- if(userEntity1.getIsVip()==1){
|
|
|
|
|
|
|
+ UserEntity user = userDao.selectById(userId);
|
|
|
|
|
+ if(user.getIsVip() ==1 && VipExpirationUtil.isVipValid(user.getVipExpirationTime())){
|
|
|
return Result.error("该用户已经是会员,不能重复添加!");
|
|
return Result.error("该用户已经是会员,不能重复添加!");
|
|
|
}
|
|
}
|
|
|
- SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
|
|
|
|
|
- /*Calendar calendar1 = java.util.Calendar.getInstance();
|
|
|
|
|
- Calendar calendar2 = java.util.Calendar.getInstance();
|
|
|
|
|
- try {
|
|
|
|
|
- calendar1.setTime(dateFormat.parse(userEntity1.getVipExpirationTime()));
|
|
|
|
|
- calendar2.setTime(dateFormat.parse(dateFormat.format(new Date())));
|
|
|
|
|
- } catch (java.text.ParseException e) {
|
|
|
|
|
- System.out.println("日期格式不正确");
|
|
|
|
|
- }
|
|
|
|
|
- if(calendar1.compareTo(calendar2)>0){
|
|
|
|
|
- return Result.error("用户已经是会员,请勿重复操作!");
|
|
|
|
|
- }*/
|
|
|
|
|
|
|
+
|
|
|
|
|
+ // 读取配置
|
|
|
CommonInfo one = commonInfoService.findOne(314);
|
|
CommonInfo one = commonInfoService.findOne(314);
|
|
|
CommonInfo one1 = commonInfoService.findOne(315);
|
|
CommonInfo one1 = commonInfoService.findOne(315);
|
|
|
CommonInfo one2 = commonInfoService.findOne(316);
|
|
CommonInfo one2 = commonInfoService.findOne(316);
|
|
|
- UserEntity userEntity = new UserEntity();
|
|
|
|
|
- userEntity.setUserId(userId);
|
|
|
|
|
- userEntity.setIsVip(1);
|
|
|
|
|
- Calendar calendar = Calendar.getInstance();
|
|
|
|
|
- calendar.add(Calendar.DATE, +Integer.valueOf(one.getValue())); //得到前一个月
|
|
|
|
|
- userEntity.setVipExpirationTime(dateFormat.format(calendar.getTime()));
|
|
|
|
|
- userDao.updateById(userEntity);
|
|
|
|
|
|
|
+
|
|
|
|
|
+ // 会员失效时间
|
|
|
|
|
+ String expirationTime = VipExpirationUtil.getFutureTimeWithDays(Integer.valueOf(one.getValue()));
|
|
|
|
|
+
|
|
|
|
|
+ // 更新用户为会员
|
|
|
|
|
+ userService.updateUserToVip(userId, expirationTime);
|
|
|
|
|
+
|
|
|
|
|
+ // 新增会员专属优惠券
|
|
|
for(int i = 0;i<Integer.valueOf(one1.getValue());i++){
|
|
for(int i = 0;i<Integer.valueOf(one1.getValue());i++){
|
|
|
- TbCouponUser tbCouponUser = new TbCouponUser();
|
|
|
|
|
- tbCouponUser.setUserId(userId);
|
|
|
|
|
- tbCouponUser.setCouponName("会员专属优惠券");
|
|
|
|
|
- tbCouponUser.setCouponPicture("图片");
|
|
|
|
|
- tbCouponUser.setCreateTime(dateFormat.format(new Date()));
|
|
|
|
|
- tbCouponUser.setExpirationTime(dateFormat.format(calendar.getTime()));
|
|
|
|
|
- tbCouponUser.setMinMoney(BigDecimal.valueOf(0));
|
|
|
|
|
- tbCouponUser.setGoodsType("0");
|
|
|
|
|
- tbCouponUser.setMoney(new BigDecimal(one2.getValue()));
|
|
|
|
|
- tbCouponUser.setStatus(0);
|
|
|
|
|
- tbCouponUser.setEndTime(one.getValue());
|
|
|
|
|
- tbCouponUser.setShopId(0L);
|
|
|
|
|
- tbCouponUserDao.insert(tbCouponUser);
|
|
|
|
|
|
|
+ tbCouponUserService.addAfterVipBuySuccess(userId, new BigDecimal(one2.getValue()), one.getValue(), expirationTime);
|
|
|
}
|
|
}
|
|
|
return Result.success();
|
|
return Result.success();
|
|
|
}
|
|
}
|
|
@@ -461,6 +432,4 @@ public class DataCentreServiceImpl implements DataCentreService {
|
|
|
userDao.updateById(userEntity);
|
|
userDao.updateById(userEntity);
|
|
|
return Result.success();
|
|
return Result.success();
|
|
|
}
|
|
}
|
|
|
-
|
|
|
|
|
-
|
|
|
|
|
}
|
|
}
|