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

Merge branch 'develop' into release

release_toaliyun_real
Burce 6 лет назад
Родитель
Сommit
faaf3a965a
4 измененных файлов: 11 добавлений и 5 удалений
  1. +2
    -2
      mallinkBApi/src/main/java/com/iformall/controller/WxCouponSendController.java
  2. +2
    -0
      mallinkBApi/src/main/java/com/iformall/controller/WxCreditHistoryController.java
  3. +5
    -2
      mallinkService/src/main/java/com/iformall/service/impl/WxCouponSendServiceImpl.java
  4. +2
    -1
      mallinkService/src/main/java/com/iformall/service/impl/WxCreditHistoryServiceImpl.java

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

@@ -100,10 +100,10 @@ public class WxCouponSendController extends BaseController {
try { try {
wxCouponSendService.handSel(wxCouponSend, cUserId); wxCouponSendService.handSel(wxCouponSend, cUserId);
} catch (MallinkException e) { } catch (MallinkException e) {
logger.error("注异常: " + e.getMessage());
logger.error("注异常: " + e.getMessage());
return new ResultData(e.getErrorCode(), e.getMessage()); return new ResultData(e.getErrorCode(), e.getMessage());
} catch (Exception e) { } catch (Exception e) {
logger.error("注异常: " + e.getMessage());
logger.error("注异常: " + e.getMessage());
return new ResultData(ErrorCode.COUPON_HANDSEL_VERIFY, e.getMessage()); return new ResultData(ErrorCode.COUPON_HANDSEL_VERIFY, e.getMessage());
} }
return new ResultData(); return new ResultData();


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

@@ -73,6 +73,8 @@ public class WxCreditHistoryController extends BaseController {
WxCUserBasicInfo wxCUserBasicInfo = new WxCUserBasicInfo(); WxCUserBasicInfo wxCUserBasicInfo = new WxCUserBasicInfo();
if (wxCUserBasicInfoList != null && wxCUserBasicInfoList.size() > 0) { if (wxCUserBasicInfoList != null && wxCUserBasicInfoList.size() > 0) {
wxCUserBasicInfo = wxCUserBasicInfoList.get(0); wxCUserBasicInfo = wxCUserBasicInfoList.get(0);
} else {
return new ResultData(ErrorCode.USER_NOT_AUTH_PHONE);
} }
return new ResultData(wxCUserBasicInfo); return new ResultData(wxCUserBasicInfo);
} }


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

@@ -605,9 +605,12 @@ public class WxCouponSendServiceImpl implements WxCouponSendService {
public void handSel(WxCouponSend wxCouponSend, Object cUserId) { public void handSel(WxCouponSend wxCouponSend, Object cUserId) {
WxCUser cu = wxCUserMapper.selectByPrimaryKey(cUserId); WxCUser cu = wxCUserMapper.selectByPrimaryKey(cUserId);
if (Objects.isNull(cu)) { if (Objects.isNull(cu)) {
throw new MallinkException(ErrorCode.SYS_PARAMETER_NOT_NULL);
throw new MallinkException(ErrorCode.USER_NOT_AUTH_PHONE);
}

if(StringUtils.isEmpty(cu.getPhone())) {
throw new MallinkException(ErrorCode.USER_NOT_AUTH_PHONE);
} }
// 1002 ,11012,2020 ,2000,2022,2021,3005,3999,1050,3000


WxCUserBasicInfo wxCUserBasicInfo = wxCUserBasicInfoMapper.selectByPrimaryKey(cu.getId()); WxCUserBasicInfo wxCUserBasicInfo = wxCUserBasicInfoMapper.selectByPrimaryKey(cu.getId());
if (Objects.isNull(wxCUserBasicInfo)) { if (Objects.isNull(wxCUserBasicInfo)) {


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

@@ -194,6 +194,7 @@ public class WxCreditHistoryServiceImpl implements WxCreditHistoryService {
return wxCreditHistoryMapper.selectByPrimaryKey(id); return wxCreditHistoryMapper.selectByPrimaryKey(id);
} }


@Override
public void check(Long cUserId) { public void check(Long cUserId) {
WxCUserBasicInfo wxCUserBasicInfo = wxCUserBasicInfoMapper.selectByPrimaryKey(cUserId); WxCUserBasicInfo wxCUserBasicInfo = wxCUserBasicInfoMapper.selectByPrimaryKey(cUserId);
if (wxCUserBasicInfo == null) { if (wxCUserBasicInfo == null) {
@@ -208,7 +209,7 @@ public class WxCreditHistoryServiceImpl implements WxCreditHistoryService {
WxCUserBasicInfo wxCUserBasicInfo = wxCUserBasicInfoMapper.selectByPrimaryKey(record.getCUserId()); WxCUserBasicInfo wxCUserBasicInfo = wxCUserBasicInfoMapper.selectByPrimaryKey(record.getCUserId());
if (wxCUser == null && wxCUserBasicInfo == null) { if (wxCUser == null && wxCUserBasicInfo == null) {
//验证此用户是否存在 //验证此用户是否存在
throw new MallinkException(ErrorCode.USER_IS_EMPTY);
throw new MallinkException(ErrorCode.USER_NOT_AUTH_PHONE);
} }
if (StringUtils.isNotEmpty(record.getSpendStr())) { if (StringUtils.isNotEmpty(record.getSpendStr())) {
record.setSpend(new BigDecimal(record.getSpendStr()).multiply(new BigDecimal(100)).intValue()); record.setSpend(new BigDecimal(record.getSpendStr()).multiply(new BigDecimal(100)).intValue());


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