|
@@ -141,6 +141,7 @@ public class NewOrderService extends CrudService<NewOrderDao, NewOrder> {
|
|
|
NewOrder dbOrder = newOrderDao.findByOrderID(newOrder.getOrderID());
|
|
|
boolean flag = false;// 是否新增标志
|
|
|
boolean onlinePay = true; // 能否线上支付
|
|
|
+ String dbOnlinePayFlag = newOrder.getOnlinePayFlag();
|
|
|
if (newOrder.getOrderID() == null) {
|
|
|
flag = true;
|
|
|
newOrder.setOrderNo(OrderUtil.geneAdminOrderNo());
|
|
@@ -168,8 +169,8 @@ public class NewOrderService extends CrudService<NewOrderDao, NewOrder> {
|
|
|
if (newOrder.getHasActProduct() == null) {
|
|
|
newOrder.setHasActProduct("0");
|
|
|
}
|
|
|
- if (newOrder.getOnlinePayFlag() == null) {
|
|
|
- newOrder.setOnlinePayFlag("0");
|
|
|
+ if (StringUtils.isEmpty(newOrder.getOnlinePayFlag())) {
|
|
|
+ newOrder.setOnlinePayFlag("1");
|
|
|
}
|
|
|
if (!StringUtils.equals("1", newOrder.getConfirmFlag())) {
|
|
|
newOrder.setConfirmFlag("0");
|
|
@@ -269,6 +270,9 @@ public class NewOrderService extends CrudService<NewOrderDao, NewOrder> {
|
|
|
newOrderDao.insert(newOrder);
|
|
|
} else {
|
|
|
// 修改
|
|
|
+ if ("0".equals(newOrder.getOnlinePayFlag())) {
|
|
|
+ logger.info("【修改订单可线上支付】>>>>>>>>>>>>>>>>>原onlinePayFlag:" + dbOnlinePayFlag + ",orderId:" + newOrder.getOrderID() + ",行数:" + 274);
|
|
|
+ }
|
|
|
newOrderDao.update(newOrder);
|
|
|
}
|
|
|
//优惠券相关
|
|
@@ -864,6 +868,9 @@ public class NewOrderService extends CrudService<NewOrderDao, NewOrder> {
|
|
|
}
|
|
|
}
|
|
|
newOrder.setShopOrderIDs(shopOrderIDs);
|
|
|
+ if ("0".equals(newOrder.getOnlinePayFlag())) {
|
|
|
+ logger.info("【修改订单可线上支付】>>>>>>>>>>>>>>>>>原onlinePayFlag:" + dbOnlinePayFlag + ",orderId:" + newOrder.getOrderID() + ",行数:" + 872);
|
|
|
+ }
|
|
|
newOrderDao.update(newOrder);
|
|
|
|
|
|
//下单短信推送
|