xhxu 2 лет назад
Родитель
Сommit
5ad8098d70
4 измененных файлов: 29 добавлений и 12 удалений
  1. +2
    -1
      mallinkBApi/src/main/java/com/iformall/controller/WxCouponOrderReservationController.java
  2. +1
    -1
      mallinkService/src/main/java/com/iformall/service/impl/WxChartServiceImpl.java
  3. +7
    -1
      mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderReservationServiceImpl.java
  4. +19
    -9
      mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java

+ 2
- 1
mallinkBApi/src/main/java/com/iformall/controller/WxCouponOrderReservationController.java Просмотреть файл

@@ -71,7 +71,7 @@ public class WxCouponOrderReservationController extends BaseController {
if(EnumCouponOrderReservationStatus.getReservationFinish().contains(sortReservation.getStatus())){
return new ResultData(ErrorCode.SYS_PARAMETER_ERROR.getCode(),"预约单已完成");
}
reservation.setRemark("B用户"+getLoginBUser().getPhone()+"修改信息");
return wxCouponOrderReservationService.saveOrUpdate(reservation);
}

@@ -107,6 +107,7 @@ public class WxCouponOrderReservationController extends BaseController {
updReservation.setId(reservation.getId());
updReservation.setStatus(reservation.getStatus());
updReservation.setRemark(reservation.getRemark());
reservation.setRemark("B用户"+getLoginBUser().getPhone()+"修改状态");
wxCouponOrderReservationService.saveOrUpdate(updReservation);
return new ResultData();
}


+ 1
- 1
mallinkService/src/main/java/com/iformall/service/impl/WxChartServiceImpl.java Просмотреть файл

@@ -784,7 +784,7 @@ public class WxChartServiceImpl implements WxChartDataService {
floor = Long.parseLong(floorId);
}
List<Long> merchantIds = wxMerchantService.getFloorBuildMerchantIds(tenantEntity, null, building, floor, 0, 0);
if (null != merchantIds) {
if (merchantIds != null) {
query.put("ids", merchantIds);
}
List<Map<String,Object>> mapList = wxMerchantMapper.findBusByFloorId(query);


+ 7
- 1
mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderReservationServiceImpl.java Просмотреть файл

@@ -125,8 +125,11 @@ public class WxCouponOrderReservationServiceImpl implements WxCouponOrderReserva
Long id = wxCouponOrderReservationMapper.getIdByCouponOrder(record.getCouponOrderId(),record.getTenantId());
record.setId(id);
}

if (record.getId() == null) {
record.setStatus(EnumCouponOrderReservationStatus.reservation.getCode());
if(record.getStatus() == null){
record.setStatus(EnumCouponOrderReservationStatus.reservation.getCode());
}
//record.setId(UUID.randomUUID().toString().replaceAll("-", ""));
final IdWorker idWorker = IdWorker.get();
record.setId(idWorker.nextId());
@@ -134,6 +137,9 @@ public class WxCouponOrderReservationServiceImpl implements WxCouponOrderReserva
record.setUpdateDate(now);
wxCouponOrderReservationMapper.insert(record);
} else {
if(record.getRemark() == null){
record.setRemark("");
}
record.setUpdateDate(now);
wxCouponOrderReservationMapper.updateById(record);
}


+ 19
- 9
mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java Просмотреть файл

@@ -1180,9 +1180,8 @@ public class WxMerchantServiceImpl implements WxMerchantService {
if (null == couponMerchantIds || couponMerchantIds.size() <=0 ) {
record.setId(-999L);
return;
}else {
merchantIds.addAll(couponMerchantIds);
}
merchantIds.addAll(couponMerchantIds);
}

String phone = StringUtils.trimToNull(record.getPhone());
@@ -1195,8 +1194,14 @@ public class WxMerchantServiceImpl implements WxMerchantService {
record.setId(-999L);
return;
}
if(merchantIds.size() > 0){
if(merchantIds.size() > 0){
merchantIds.retainAll(userMerchantIds);
if (merchantIds.size() <= 0) {
record.setId(-999L);
return;
}
}else{
merchantIds.addAll(userMerchantIds);
}
}
@@ -1204,14 +1209,19 @@ public class WxMerchantServiceImpl implements WxMerchantService {
Long building = record.getBuilding();
Long floor = record.getFloor();
List<Long> floorMerchantIds = getFloorBuildMerchantIds(record, floorRule, building, floor, 0, 0);
if (null == floorMerchantIds || floorMerchantIds.size() <=0 ) {
record.setId(-999L);
return;
}
if(merchantIds.size() > 0){
merchantIds.retainAll(floorMerchantIds);
if(floorMerchantIds != null){
if(merchantIds.size() > 0){
merchantIds.retainAll(floorMerchantIds);
if (merchantIds.size() <= 0) {
record.setId(-999L);
return;
}
}else{
merchantIds.addAll(floorMerchantIds);
}
}


// if(EnumProfitSharingUse.YES.getCode().equals(record.getIsUse())){
// if(merchantIds.size() > 0){
// merchantIds.retainAll(isUseMerchantIds);


Загрузка…
Отмена
Сохранить