|
@@ -45,7 +45,7 @@ public class AssoPersonVoucherService extends ServiceImpl<AssoPersonVoucherMappe
|
|
public void sendVoucherToPerson(SendVoucherToPersonVO sendVoucherToPersonVO) {
|
|
public void sendVoucherToPerson(SendVoucherToPersonVO sendVoucherToPersonVO) {
|
|
List<String> personUuids = sendVoucherToPersonVO.getPersonUuids();
|
|
List<String> personUuids = sendVoucherToPersonVO.getPersonUuids();
|
|
List<SendVoucherToPersonVO.InAddVoucherVO> inAddVoucherVOS = sendVoucherToPersonVO.getInAddVoucherVOS();
|
|
List<SendVoucherToPersonVO.InAddVoucherVO> inAddVoucherVOS = sendVoucherToPersonVO.getInAddVoucherVOS();
|
|
-
|
|
|
|
|
|
+ Integer getWay =sendVoucherToPersonVO.getGetWay();
|
|
//校验
|
|
//校验
|
|
if (sendVoucherToPersonVO == null || personUuids == null || personUuids.size() == 0 || sendVoucherToPersonVO.getInAddVoucherVOS() == null) {
|
|
if (sendVoucherToPersonVO == null || personUuids == null || personUuids.size() == 0 || sendVoucherToPersonVO.getInAddVoucherVOS() == null) {
|
|
throw new BusinessException(ExceptionEnum.BUSINESS_ERROR, "请校验参数");
|
|
throw new BusinessException(ExceptionEnum.BUSINESS_ERROR, "请校验参数");
|
|
@@ -64,7 +64,7 @@ public class AssoPersonVoucherService extends ServiceImpl<AssoPersonVoucherMappe
|
|
}
|
|
}
|
|
for (int t = 0; t < num; t++) {
|
|
for (int t = 0; t < num; t++) {
|
|
for (String personUuid : personUuids) {
|
|
for (String personUuid : personUuids) {
|
|
- AssoPersonVoucher assoPersonVoucher = this.loadAssoPersonVoucher(voucher, personUuid);
|
|
|
|
|
|
+ AssoPersonVoucher assoPersonVoucher = this.loadAssoPersonVoucher(voucher, personUuid,getWay);
|
|
assoPersonVouchers.add(assoPersonVoucher);
|
|
assoPersonVouchers.add(assoPersonVoucher);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
@@ -73,7 +73,7 @@ public class AssoPersonVoucherService extends ServiceImpl<AssoPersonVoucherMappe
|
|
this.getBaseMapper().insertBatchSomeColumn(assoPersonVouchers);
|
|
this.getBaseMapper().insertBatchSomeColumn(assoPersonVouchers);
|
|
}
|
|
}
|
|
|
|
|
|
- private AssoPersonVoucher loadAssoPersonVoucher(Voucher voucher, String personUuid) {
|
|
|
|
|
|
+ private AssoPersonVoucher loadAssoPersonVoucher(Voucher voucher, String personUuid,Integer getWay) {
|
|
Date date = new Date();
|
|
Date date = new Date();
|
|
AssoPersonVoucher assoPersonVoucher = new AssoPersonVoucher();
|
|
AssoPersonVoucher assoPersonVoucher = new AssoPersonVoucher();
|
|
assoPersonVoucher.setPersonUuid(personUuid);
|
|
assoPersonVoucher.setPersonUuid(personUuid);
|
|
@@ -85,6 +85,7 @@ public class AssoPersonVoucherService extends ServiceImpl<AssoPersonVoucherMappe
|
|
assoPersonVoucher.setExpirationTime(voucher.getExpirationTime());
|
|
assoPersonVoucher.setExpirationTime(voucher.getExpirationTime());
|
|
assoPersonVoucher.setUseScope(voucher.getUseScope());
|
|
assoPersonVoucher.setUseScope(voucher.getUseScope());
|
|
assoPersonVoucher.setUseState(0);
|
|
assoPersonVoucher.setUseState(0);
|
|
|
|
+ assoPersonVoucher.setGetWay(getWay);
|
|
assoPersonVoucher.setCreateTime(date);
|
|
assoPersonVoucher.setCreateTime(date);
|
|
return assoPersonVoucher;
|
|
return assoPersonVoucher;
|
|
|
|
|