Commit 93880f11 authored by shiyu's avatar shiyu

支付回调

parent 8ac123ba
...@@ -56,7 +56,7 @@ public class OpenShopCostRecordDaoImpl implements OpenShopCostRecordDao { ...@@ -56,7 +56,7 @@ public class OpenShopCostRecordDaoImpl implements OpenShopCostRecordDao {
OpenShopCostRecordExample.Criteria criteria = example.createCriteria(); OpenShopCostRecordExample.Criteria criteria = example.createCriteria();
criteria.andUserIdEqualTo(userId); criteria.andUserIdEqualTo(userId);
criteria.andIsValidEqualTo(true); criteria.andIsValidEqualTo(true);
//开带你飞截止有效时间必须大于当前时间 //截止有效时间必须大于当前时间
criteria.andEndValidTimeGreaterThan(new Date()); criteria.andEndValidTimeGreaterThan(new Date());
criteria.andTransactionIdIsNotNull(); criteria.andTransactionIdIsNotNull();
return openShopCostRecordMapper.countByExample(example) > 0; return openShopCostRecordMapper.countByExample(example) > 0;
......
...@@ -16,10 +16,12 @@ import com.wwdz.ch.core.util.IdUtils; ...@@ -16,10 +16,12 @@ import com.wwdz.ch.core.util.IdUtils;
import com.wwdz.ch.core.util.PriceUtil; import com.wwdz.ch.core.util.PriceUtil;
import com.wwdz.ch.core.util.RedisUtils; import com.wwdz.ch.core.util.RedisUtils;
import com.wwdz.ch.core.util.TimeUtil; import com.wwdz.ch.core.util.TimeUtil;
import com.wwdz.ch.db.dao.CollectorWhiteListDao;
import com.wwdz.ch.db.dao.distribution.*; import com.wwdz.ch.db.dao.distribution.*;
import com.wwdz.ch.db.dao.openShop.GuaranteeMoneyRecordDao; import com.wwdz.ch.db.dao.openShop.GuaranteeMoneyRecordDao;
import com.wwdz.ch.db.dao.openShop.OpenShopApplyOrderDao; import com.wwdz.ch.db.dao.openShop.OpenShopApplyOrderDao;
import com.wwdz.ch.db.dao.openShop.OpenShopCostRecordDao; import com.wwdz.ch.db.dao.openShop.OpenShopCostRecordDao;
import com.wwdz.ch.db.domain.CollectorWhiteList;
import com.wwdz.ch.db.domain.distribution.*; import com.wwdz.ch.db.domain.distribution.*;
import com.wwdz.ch.db.domain.openShop.GuaranteeMoneyRecord; import com.wwdz.ch.db.domain.openShop.GuaranteeMoneyRecord;
import com.wwdz.ch.db.domain.openShop.OpenShopApplyOrder; import com.wwdz.ch.db.domain.openShop.OpenShopApplyOrder;
...@@ -133,6 +135,9 @@ public class WxPayCallbackController { ...@@ -133,6 +135,9 @@ public class WxPayCallbackController {
@Autowired @Autowired
OpenShopApplyOrderDao openShopApplyOrderDao; OpenShopApplyOrderDao openShopApplyOrderDao;
@Autowired
CollectorWhiteListDao collectorWhiteListDao;
@RequestMapping(value ="/getPayNotify") @RequestMapping(value ="/getPayNotify")
public String payNotify(HttpServletRequest request) throws IOException { public String payNotify(HttpServletRequest request) throws IOException {
logger.info("------------------ 收到微信支付回调通知 ------------------"); logger.info("------------------ 收到微信支付回调通知 ------------------");
...@@ -571,6 +576,17 @@ public class WxPayCallbackController { ...@@ -571,6 +576,17 @@ public class WxPayCallbackController {
if (openShopApplyOrder.getState() == OpenShopApplyOrderEnum.StateEnum.PRE_PAY.getCode()) { if (openShopApplyOrder.getState() == OpenShopApplyOrderEnum.StateEnum.PRE_PAY.getCode()) {
//申请单状态修改 //申请单状态修改
openShopApplyOrderDao.updateState(openShopApplyOrder.getOpenShopApplyOrderId(), OpenShopApplyOrderEnum.StateEnum.PRE_AUDIT.getCode()); openShopApplyOrderDao.updateState(openShopApplyOrder.getOpenShopApplyOrderId(), OpenShopApplyOrderEnum.StateEnum.PRE_AUDIT.getCode());
} else if (openShopApplyOrder.getState() == OpenShopApplyOrderEnum.StateEnum.PASSED.getCode()) {
//申请单原本就通过了,再次支付开店费,属于续费,延长藏家白名单的有效时间
CollectorWhiteList collectorWhiteList = new CollectorWhiteList();
collectorWhiteList.setCollectorId(openShopApplyOrder.getUserId());
collectorWhiteList.setEndValidTime(DateUtils.fromLocalDateTime(endValidTime));
collectorWhiteList.setDeliveryAuth(CommonEnum.StateEnum.VALID.getCode());
collectorWhiteList.setIsShow(true);
collectorWhiteList.setIsUploadLimit(false);
collectorWhiteList.setIsValid(true);
collectorWhiteListDao.upsert(collectorWhiteList);
} }
logger.info(">>>>>>>>>>>> 开店费缴纳订单,微信支付回调通知处理成功 <<<<<<<<<<<<"); logger.info(">>>>>>>>>>>> 开店费缴纳订单,微信支付回调通知处理成功 <<<<<<<<<<<<");
return Result.success(); return Result.success();
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment