|
@@ -116,14 +116,15 @@ public class OrderServiceImpl implements OrderService {
|
|
|
}else{
|
|
|
//更新价格
|
|
|
Orders order = selectBySubId(subscription.getId());
|
|
|
- if(order != null && !order.getPrice().equals(subscription.getPrice())) {
|
|
|
+ // 由于存在安卓端和web端,不能单纯的靠价格来判断是否更新,安卓端需要的是androidSign,web需要的是pagePayUrl
|
|
|
+// if(order != null && !order.getPrice().equals(subscription.getPrice())) {
|
|
|
order.setPrice(subscription.getPrice());
|
|
|
order.setCreatedAt(new Date());
|
|
|
order.setUpdatedAt(new Date());
|
|
|
//设置支付的url
|
|
|
setOrderPayUrlByPayment(subscription, order, client);
|
|
|
ordersMapper.updateByPrimaryKey(order);
|
|
|
- }
|
|
|
+// }
|
|
|
}
|
|
|
//如果微信url为空或者微信url超过两小时过期了,则重重新生成
|
|
|
boolean wxCheckDateFlag = StringUtils.isEmpty(list.get(0).getQrcodeUrl()) || DateUtils.addHours(list.get(0).getUpdatedAt(),OrderConstant.WXPAY_EXPIRE_TIME,1).compareTo(new Date())<0;
|