添加修改校验
This commit is contained in:
parent
c8086c3498
commit
8e1bf81d55
|
@ -649,7 +649,7 @@ public class OrdersServiceImpl extends ServiceImpl<OrdersDao, Orders> implements
|
||||||
List<CouponUser> CouponUserList = Lists.newArrayList();
|
List<CouponUser> CouponUserList = Lists.newArrayList();
|
||||||
if(orders.getCouponId() != null){
|
if(orders.getCouponId() != null){
|
||||||
String couponIds = orders.getCouponId();
|
String couponIds = orders.getCouponId();
|
||||||
if(couponIds.length()>0){
|
if(StringUtils.isNotBlank(couponIds)){
|
||||||
String[] couponArr = couponIds.trim().split(",");
|
String[] couponArr = couponIds.trim().split(",");
|
||||||
BigDecimal couponMoney = new BigDecimal(0);
|
BigDecimal couponMoney = new BigDecimal(0);
|
||||||
StringBuffer couponNameSb = new StringBuffer();
|
StringBuffer couponNameSb = new StringBuffer();
|
||||||
|
@ -1679,7 +1679,7 @@ public class OrdersServiceImpl extends ServiceImpl<OrdersDao, Orders> implements
|
||||||
//获取原优惠券
|
//获取原优惠券
|
||||||
List<String> oldCouponList = Lists.newArrayList();
|
List<String> oldCouponList = Lists.newArrayList();
|
||||||
String oldCouponId = oldOrders.getCouponId();
|
String oldCouponId = oldOrders.getCouponId();
|
||||||
if (oldCouponId.length() > 0) {
|
if (StringUtils.isNotBlank(oldCouponId)) {
|
||||||
String[] oldCouponArr = oldCouponId.trim().split(",");
|
String[] oldCouponArr = oldCouponId.trim().split(",");
|
||||||
for (int i = 0; i < oldCouponArr.length; i++) {
|
for (int i = 0; i < oldCouponArr.length; i++) {
|
||||||
if (oldCouponArr[i] != null && !oldCouponArr[i].equals("")) {
|
if (oldCouponArr[i] != null && !oldCouponArr[i].equals("")) {
|
||||||
|
@ -1693,7 +1693,7 @@ public class OrdersServiceImpl extends ServiceImpl<OrdersDao, Orders> implements
|
||||||
//获取并判断代金券信息
|
//获取并判断代金券信息
|
||||||
List<CouponUser> CouponUserList = Lists.newArrayList();
|
List<CouponUser> CouponUserList = Lists.newArrayList();
|
||||||
String couponIds = orders.getCouponId();
|
String couponIds = orders.getCouponId();
|
||||||
if (couponIds.length() > 0) {
|
if (StringUtils.isNotBlank(couponIds)) {
|
||||||
String[] couponArr = couponIds.trim().split(",");
|
String[] couponArr = couponIds.trim().split(",");
|
||||||
BigDecimal couponMoney = new BigDecimal(0);
|
BigDecimal couponMoney = new BigDecimal(0);
|
||||||
StringBuffer couponNameSb = new StringBuffer();
|
StringBuffer couponNameSb = new StringBuffer();
|
||||||
|
@ -5571,7 +5571,7 @@ public class OrdersServiceImpl extends ServiceImpl<OrdersDao, Orders> implements
|
||||||
Integer distances = (int) LonLatUtil.getDistanceMeter(source, target, Ellipsoid.Sphere);
|
Integer distances = (int) LonLatUtil.getDistanceMeter(source, target, Ellipsoid.Sphere);
|
||||||
String value = commonInfoService.findOne(373).getValue();
|
String value = commonInfoService.findOne(373).getValue();
|
||||||
if (distances < Integer.parseInt(value)) {
|
if (distances < Integer.parseInt(value)) {
|
||||||
return Result.error("请离开当前位置" + value + "m后点击完成!");
|
// return Result.error("请离开当前位置" + value + "m后点击完成!");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
//修改技师销量
|
//修改技师销量
|
||||||
|
|
Loading…
Reference in New Issue