Просмотр исходного кода

[IdWorker整理][修复]:IdWorker调用整理

release_toaliyun_real
Stormeye.Wu 7 лет назад
Родитель
Сommit
3d5547af95
8 измененных файлов: 17 добавлений и 15 удалений
  1. +2
    -2
      mallinkBApi/src/main/java/com/simple/controller/WxCouponOrderController.java
  2. +4
    -4
      mallinkService/src/main/java/com/simple/service/WxCouponOrderService.java
  3. +2
    -1
      mallinkService/src/main/java/com/simple/service/impl/MallPermissionServiceImpl.java
  4. +1
    -1
      mallinkService/src/main/java/com/simple/service/impl/WxCUserBasicInfoServiceImpl.java
  5. +5
    -5
      mallinkService/src/main/java/com/simple/service/impl/WxCouponOrderServiceImpl.java
  6. +1
    -1
      mallinkService/src/main/java/com/simple/service/impl/WxDateAmountRecordServiceImpl.java
  7. +1
    -0
      mallinkService/src/main/java/com/simple/service/impl/WxOrderServiceImpl.java
  8. +1
    -1
      mallinkService/src/main/java/com/simple/service/impl/WxPayOrderServiceImpl.java

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

@@ -88,7 +88,7 @@ public class WxCouponOrderController extends BaseController
logger.error("couponOrderId参数不正确: " + paramMap.toString());
return new ResultData(ErrorCode.PARAMETER_NOT_NULL.getCode(), "couponOrderId参数不正确");
}
return wxCouponOrderService.verify(couponOrderId, getUser());
return wxCouponOrderService.verify(couponOrderId, getUser().getId());
}

@ApiOperation(value = "退券接口", notes = "{\"couponOrderId\":\"string\"}")
@@ -108,6 +108,6 @@ public class WxCouponOrderController extends BaseController
logger.error("couponOrderId参数不正确: " + paramMap.toString());
return new ResultData(ErrorCode.PARAMETER_NOT_NULL.getCode(), "couponOrderId参数不正确");
}
return wxCouponOrderService.refund(couponOrderId, getUser());
return wxCouponOrderService.refund(couponOrderId, getUser().getId());
}
}

+ 4
- 4
mallinkService/src/main/java/com/simple/service/WxCouponOrderService.java Просмотреть файл

@@ -44,17 +44,17 @@ public interface WxCouponOrderService {
* 根据主键couponOrderId(券码)核销
*
* @param couponOrderId
* @param bUser 核销人(登录用户)
* @param bUserId 核销人(登录用户)
*/
ResultData verify(Long couponOrderId, WxMerchantBUser bUser);
ResultData verify(Long couponOrderId, Long bUserId);

/**
* 根据主键couponOrderId(券码)退券(款)
*
* @param couponOrderId
* @param bUser 退券(款)人(登录用户)
* @param bUserId 退券(款)人(登录用户)
*/
ResultData refund(Long couponOrderId, WxMerchantBUser bUser);
ResultData refund(Long couponOrderId, Long bUserId);



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

@@ -32,7 +32,8 @@ public class MallPermissionServiceImpl implements MallPermissionService {
public void saveOrUpdate(MallPermission record) {
if (record.getId() == null) {
//record.setId(UUID.randomUUID().toString().replaceAll("-", ""));
record.setId(new IdWorker(0, 0).nextId());
final IdWorker idWorker = IdWorker.get();
record.setId(idWorker.nextId());
mallPermissionMapper.insertSelective(record);
} else {
mallPermissionMapper.updateByPrimaryKeySelective(record);


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

@@ -31,7 +31,7 @@ public class WxCUserBasicInfoServiceImpl implements WxCUserBasicInfoService {
public void saveOrUpdate(WxCUserBasicInfo record) {
if (record.getId() == null) {
//record.setId(UUID.randomUUID().toString().replaceAll("-", ""));
IdWorker idWorker = new IdWorker(0, 0);
final IdWorker idWorker = IdWorker.get();
record.setId(idWorker.nextId());
wxCUserBasicInfoMapper.insertSelective(record);
} else {


+ 5
- 5
mallinkService/src/main/java/com/simple/service/impl/WxCouponOrderServiceImpl.java Просмотреть файл

@@ -43,7 +43,7 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService {
public void saveOrUpdate(WxCouponOrder record) {
if (record.getId() == null) {
//record.setId(UUID.randomUUID().toString().replaceAll("-", ""));
IdWorker idWorker = new IdWorker(0, 0);
final IdWorker idWorker = IdWorker.get();
record.setId(idWorker.nextId());
wxCouponOrderMapper.insertSelective(record);
} else {
@@ -60,7 +60,7 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService {

@Override
@Transactional(propagation = Propagation.REQUIRED, readOnly = false, rollbackFor = {Exception.class})
public ResultData verify(Long couponOrderId, WxMerchantBUser bUser) {
public ResultData verify(Long couponOrderId, Long bUserId) {
WxCouponOrder wxCouponOrder = wxCouponOrderMapper.selectByPrimaryKey(couponOrderId);
if (wxCouponOrder.getCouponOrderStatus() == EnumCouponOrderStatus.COUPON_ORDER_OVER_TIME.getCode()) {
logger.error("已过期: couponOrder-" + couponOrderId);
@@ -76,7 +76,7 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService {
}
try {
wxCouponOrder.setCouponOrderStatus(EnumCouponOrderStatus.COUPON_ORDER_USED.getCode()); //1核销
wxCouponOrder.setBUserId(bUser.getId());
wxCouponOrder.setBUserId(bUserId);
wxCouponOrder.setUpdateDate(new Date());
wxCouponOrderMapper.updateByPrimaryKeySelective(wxCouponOrder);
} catch (Exception e) {
@@ -90,7 +90,7 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService {

@Override
@Transactional(propagation = Propagation.REQUIRED, readOnly = false, rollbackFor = {Exception.class})
public ResultData refund(Long couponOrderId, WxMerchantBUser bUser) {
public ResultData refund(Long couponOrderId, Long bUserId) {
WxCouponOrder wxCouponOrder = wxCouponOrderMapper.selectByPrimaryKey(couponOrderId);

if (wxCouponOrder.getCouponOrderStatus().equals(EnumCouponOrderStatus.COUPON_ORDER_OVER_TIME.getCode())) {
@@ -107,7 +107,7 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService {
}
try {
wxCouponOrder.setCouponOrderStatus(EnumCouponOrderStatus.COUPON_ORDER_INVALID.getCode()); //3退款,券作废
wxCouponOrder.setBUserId(bUser.getId());
wxCouponOrder.setBUserId(bUserId);
wxCouponOrder.setUpdateDate(new Date());
wxCouponOrderMapper.updateByPrimaryKeySelective(wxCouponOrder);
} catch (Exception e) {


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

@@ -31,7 +31,7 @@ public class WxDateAmountRecordServiceImpl implements WxDateAmountRecordService
public void saveOrUpdate(WxDateAmountRecord record) {
if (record.getId() == null) {
//record.setId(UUID.randomUUID().toString().replaceAll("-", ""));
IdWorker idWorker = new IdWorker(0, 0);
final IdWorker idWorker = IdWorker.get();
record.setId(idWorker.nextId());
wxDateAmountRecordMapper.insertSelective(record);
} else {


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

@@ -174,6 +174,7 @@ public class WxOrderServiceImpl implements WxOrderService {
try {
WxCouponOrder couponOrder = new WxCouponOrder();
couponOrder.setId(idWorker.nextId());
couponOrder.setTenantId(user.getTenantId());
couponOrder.setCouponId(couponId);
couponOrder.setCUserId(user.getId());
couponOrder.setOrderId(orderNumber);


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

@@ -401,7 +401,7 @@ public class WxPayOrderServiceImpl implements WxPayOrderService {
public void saveOrUpdate(WxPayOrder record) {
if (record.getId() == null) {
//record.setId(UUID.randomUUID().toString().replaceAll("-", ""));
IdWorker idWorker = new IdWorker(0, 0);
final IdWorker idWorker = IdWorker.get();
record.setId(idWorker.nextId());
wxPayOrderMapper.insertSelective(record);
} else {


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