记得上下班打卡 | git大法好，push需谨慎

Skip to content

L
liquidnet-bus-v1
Commit 0e4846e1 authored by 胡佳晨's avatar 胡佳晨
Browse files
Options

提交 通过退款

parent d0a538c3
Show whitespace changes
Inline Side-by-side
Showing with 78 additions and 62 deletions
liquidnet-bus-api/liquidnet-service-goblin-api/src/main/java/com/liquidnet/service/goblin/dto/vo/GoblinStoreOrderListSkuVo.java
View file @ 0e4846e1
...@@ -23,7 +23,7 @@ public class GoblinStoreOrderListSkuVo implements Cloneable { ...@@ -23,7 +23,7 @@ public class GoblinStoreOrderListSkuVo implements Cloneable {
private Integer num; private Integer num;
@ApiModelProperty(value = " 价格") @ApiModelProperty(value = " 价格")
private BigDecimal skuPriceActual; private BigDecimal skuPriceActual;
//todo 胡佳晨 缺券相关 活动相关 //todo hujiachen 缺券相关 活动相关
private static final GoblinStoreOrderListSkuVo obj = new GoblinStoreOrderListSkuVo(); private static final GoblinStoreOrderListSkuVo obj = new GoblinStoreOrderListSkuVo();
......
liquidnet-bus-api/liquidnet-service-goblin-api/src/main/java/com/liquidnet/service/goblin/dto/vo/GoblinStoreOrderListVo.java
View file @ 0e4846e1
...@@ -39,7 +39,7 @@ public class GoblinStoreOrderListVo implements Cloneable { ...@@ -39,7 +39,7 @@ public class GoblinStoreOrderListVo implements Cloneable {
private String payTime; private String payTime;
@ApiModelProperty(value = " 物流公司姓名") @ApiModelProperty(value = " 物流公司姓名")
private String logisticsCompany; private String logisticsCompany;
//todo 胡佳晨 缺发货时间 //todo hujiachen 缺发货时间
@ApiModelProperty(value = " sku相关") @ApiModelProperty(value = " sku相关")
private List<GoblinStoreOrderListSkuVo> storeOrderListSkuVoList; private List<GoblinStoreOrderListSkuVo> storeOrderListSkuVoList;
......
liquidnet-bus-api/liquidnet-service-goblin-api/src/main/java/com/liquidnet/service/goblin/service/manage/IGoblinStoreBackOrderService.java
View file @ 0e4846e1
...@@ -24,6 +24,8 @@ public interface IGoblinStoreBackOrderService { ...@@ -24,6 +24,8 @@ public interface IGoblinStoreBackOrderService {
ResponseDto<Boolean> changeExpressRefund(String backOrderId, BigDecimal refundPrice); ResponseDto<Boolean> changeExpressRefund(String backOrderId, BigDecimal refundPrice);
ResponseDto<Boolean> agreeRefund(String backOrderId);
ResponseDto<Boolean> refusedRefund(String backOrderId); ResponseDto<Boolean> refusedRefund(String backOrderId);
ResponseDto<Boolean> changeSkuRefund(String backOrderId, BigDecimal refundPrice, String orderSkuId); ResponseDto<Boolean> changeSkuRefund(String backOrderId, BigDecimal refundPrice, String orderSkuId);
......
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/kylin/service/InnerService.java
View file @ 0e4846e1
...@@ -134,7 +134,7 @@ public class InnerService { ...@@ -134,7 +134,7 @@ public class InnerService {
priceVo.setPriceId(getPriceId(item.getTicketsId())); priceVo.setPriceId(getPriceId(item.getTicketsId()));
priceVo.setPriceName(item.getTitle()); priceVo.setPriceName(item.getTitle());
priceVo.setTicketPrice(item.getPrice().multiply(BigDecimal.valueOf(100)).intValue()); priceVo.setTicketPrice(item.getPrice().multiply(BigDecimal.valueOf(100)).intValue());
priceVo.setAvailableInventory(item.getTotalGeneral());//TODO 票量累加 priceVo.setAvailableInventory(item.getTotalGeneral());
priceVo.setUnavailableInventory(0);//工作人员位置等 无座位无用 priceVo.setUnavailableInventory(0);//工作人员位置等 无座位无用
priceVos.add(priceVo); priceVos.add(priceVo);
} }
......
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/slime/service/impl/SlimeAuthorizationRecordsAdminServiceImpl.java
View file @ 0e4846e1
...@@ -123,7 +123,6 @@ public class SlimeAuthorizationRecordsAdminServiceImpl extends ServiceImpl<Slime ...@@ -123,7 +123,6 @@ public class SlimeAuthorizationRecordsAdminServiceImpl extends ServiceImpl<Slime
List<SlimeAuthorizationPermissions> authorizationPermissionsArrayList = new ArrayList<>(); List<SlimeAuthorizationPermissions> authorizationPermissionsArrayList = new ArrayList<>();
// 授权记录 entity // 授权记录 entity
// todo 用户信息
SlimeAuthorizationRecords creatorAuthorizationRecords = new SlimeAuthorizationRecords(); SlimeAuthorizationRecords creatorAuthorizationRecords = new SlimeAuthorizationRecords();
creatorAuthorizationRecords.setAuthorizationRecordId(IDGenerator.nextSnowId()); creatorAuthorizationRecords.setAuthorizationRecordId(IDGenerator.nextSnowId());
creatorAuthorizationRecords.setPerformanceId(performanceId); creatorAuthorizationRecords.setPerformanceId(performanceId);
...@@ -170,12 +169,10 @@ public class SlimeAuthorizationRecordsAdminServiceImpl extends ServiceImpl<Slime ...@@ -170,12 +169,10 @@ public class SlimeAuthorizationRecordsAdminServiceImpl extends ServiceImpl<Slime
// mysql // mysql
boolean success = saveBatch(authorizationRecordsArrayList); boolean success = saveBatch(authorizationRecordsArrayList);
if (!success) { if (!success) {
// todo error
throw new LiquidnetServiceException(); throw new LiquidnetServiceException();
} }
success = authorizationPermissionsAdminService.saveBatch(authorizationPermissionsArrayList); success = authorizationPermissionsAdminService.saveBatch(authorizationPermissionsArrayList);
if (!success) { if (!success) {
// todo error
throw new LiquidnetServiceException(); throw new LiquidnetServiceException();
} }
...@@ -227,7 +224,6 @@ public class SlimeAuthorizationRecordsAdminServiceImpl extends ServiceImpl<Slime ...@@ -227,7 +224,6 @@ public class SlimeAuthorizationRecordsAdminServiceImpl extends ServiceImpl<Slime
authorizationRecordsLambdaUpdateWrapper.set(SlimeAuthorizationRecords::getDeletedAt, authorizationRecords.getDeletedAt()); authorizationRecordsLambdaUpdateWrapper.set(SlimeAuthorizationRecords::getDeletedAt, authorizationRecords.getDeletedAt());
boolean success = update(authorizationRecordsLambdaUpdateWrapper); boolean success = update(authorizationRecordsLambdaUpdateWrapper);
if (!success) { if (!success) {
// todo error
throw new LiquidnetServiceException(); throw new LiquidnetServiceException();
} }
...@@ -246,7 +242,6 @@ public class SlimeAuthorizationRecordsAdminServiceImpl extends ServiceImpl<Slime ...@@ -246,7 +242,6 @@ public class SlimeAuthorizationRecordsAdminServiceImpl extends ServiceImpl<Slime
List<SlimeAuthorizationPermissions> authorizationPermissionsArrayList = new ArrayList<>(); List<SlimeAuthorizationPermissions> authorizationPermissionsArrayList = new ArrayList<>();
// 授权记录 entity // 授权记录 entity
// todo 用户信息
SlimeAuthorizationRecords auditorAuthorizationRecords = new SlimeAuthorizationRecords(); SlimeAuthorizationRecords auditorAuthorizationRecords = new SlimeAuthorizationRecords();
auditorAuthorizationRecords.setAuthorizationRecordId(IDGenerator.nextSnowId()); auditorAuthorizationRecords.setAuthorizationRecordId(IDGenerator.nextSnowId());
auditorAuthorizationRecords.setPerformanceId(performanceId); auditorAuthorizationRecords.setPerformanceId(performanceId);
...@@ -285,12 +280,10 @@ public class SlimeAuthorizationRecordsAdminServiceImpl extends ServiceImpl<Slime ...@@ -285,12 +280,10 @@ public class SlimeAuthorizationRecordsAdminServiceImpl extends ServiceImpl<Slime
// mysql // mysql
boolean success = saveBatch(authorizationRecordsArrayList); boolean success = saveBatch(authorizationRecordsArrayList);
if (!success) { if (!success) {
// todo error
throw new LiquidnetServiceException(); throw new LiquidnetServiceException();
} }
success = authorizationPermissionsAdminService.saveBatch(authorizationPermissionsArrayList); success = authorizationPermissionsAdminService.saveBatch(authorizationPermissionsArrayList);
if (!success) { if (!success) {
// todo error
throw new LiquidnetServiceException(); throw new LiquidnetServiceException();
} }
...@@ -348,7 +341,6 @@ public class SlimeAuthorizationRecordsAdminServiceImpl extends ServiceImpl<Slime ...@@ -348,7 +341,6 @@ public class SlimeAuthorizationRecordsAdminServiceImpl extends ServiceImpl<Slime
authorizationRecordsLambdaUpdateWrapper.set(SlimeAuthorizationRecords::getDeletedAt, authorizationRecords.getDeletedAt()); authorizationRecordsLambdaUpdateWrapper.set(SlimeAuthorizationRecords::getDeletedAt, authorizationRecords.getDeletedAt());
boolean success = update(authorizationRecordsLambdaUpdateWrapper); boolean success = update(authorizationRecordsLambdaUpdateWrapper);
if (!success) { if (!success) {
// todo error
throw new LiquidnetServiceException(); throw new LiquidnetServiceException();
} }
...@@ -374,7 +366,6 @@ public class SlimeAuthorizationRecordsAdminServiceImpl extends ServiceImpl<Slime ...@@ -374,7 +366,6 @@ public class SlimeAuthorizationRecordsAdminServiceImpl extends ServiceImpl<Slime
List<SlimeAuthorizationPermissions> authorizationPermissionsArrayList = new ArrayList<>(); List<SlimeAuthorizationPermissions> authorizationPermissionsArrayList = new ArrayList<>();
// 授权记录 entity // 授权记录 entity
// todo 用户信息
SlimeAuthorizationRecords sponsorAuthorizationRecords = new SlimeAuthorizationRecords(); SlimeAuthorizationRecords sponsorAuthorizationRecords = new SlimeAuthorizationRecords();
sponsorAuthorizationRecords.setAuthorizationRecordId(IDGenerator.nextSnowId()); sponsorAuthorizationRecords.setAuthorizationRecordId(IDGenerator.nextSnowId());
sponsorAuthorizationRecords.setPerformanceId(performanceId); sponsorAuthorizationRecords.setPerformanceId(performanceId);
...@@ -416,12 +407,10 @@ public class SlimeAuthorizationRecordsAdminServiceImpl extends ServiceImpl<Slime ...@@ -416,12 +407,10 @@ public class SlimeAuthorizationRecordsAdminServiceImpl extends ServiceImpl<Slime
// mysql // mysql
boolean success = saveBatch(authorizationRecordsArrayList); boolean success = saveBatch(authorizationRecordsArrayList);
if (!success) { if (!success) {
// todo error
throw new LiquidnetServiceException(); throw new LiquidnetServiceException();
} }
success = authorizationPermissionsAdminService.saveBatch(authorizationPermissionsArrayList); success = authorizationPermissionsAdminService.saveBatch(authorizationPermissionsArrayList);
if (!success) { if (!success) {
// todo error
throw new LiquidnetServiceException(); throw new LiquidnetServiceException();
} }
...@@ -479,7 +468,6 @@ public class SlimeAuthorizationRecordsAdminServiceImpl extends ServiceImpl<Slime ...@@ -479,7 +468,6 @@ public class SlimeAuthorizationRecordsAdminServiceImpl extends ServiceImpl<Slime
authorizationRecordsLambdaUpdateWrapper.set(SlimeAuthorizationRecords::getDeletedAt, authorizationRecords.getDeletedAt()); authorizationRecordsLambdaUpdateWrapper.set(SlimeAuthorizationRecords::getDeletedAt, authorizationRecords.getDeletedAt());
boolean success = update(authorizationRecordsLambdaUpdateWrapper); boolean success = update(authorizationRecordsLambdaUpdateWrapper);
if (!success) { if (!success) {
// todo error
throw new LiquidnetServiceException(); throw new LiquidnetServiceException();
} }
...@@ -507,7 +495,6 @@ public class SlimeAuthorizationRecordsAdminServiceImpl extends ServiceImpl<Slime ...@@ -507,7 +495,6 @@ public class SlimeAuthorizationRecordsAdminServiceImpl extends ServiceImpl<Slime
List<SlimeAuthorizationRecordsVo> authorizationRecordsVoArrayList = new ArrayList<>(); List<SlimeAuthorizationRecordsVo> authorizationRecordsVoArrayList = new ArrayList<>();
// 授权记录 entity // 授权记录 entity
// todo 用户信息
SlimeAuthorizationRecords fielderAuthorizationRecords = new SlimeAuthorizationRecords(); SlimeAuthorizationRecords fielderAuthorizationRecords = new SlimeAuthorizationRecords();
fielderAuthorizationRecords.setAuthorizationRecordId(IDGenerator.nextSnowId()); fielderAuthorizationRecords.setAuthorizationRecordId(IDGenerator.nextSnowId());
fielderAuthorizationRecords.setPerformanceId(performanceId); fielderAuthorizationRecords.setPerformanceId(performanceId);
...@@ -598,12 +585,10 @@ public class SlimeAuthorizationRecordsAdminServiceImpl extends ServiceImpl<Slime ...@@ -598,12 +585,10 @@ public class SlimeAuthorizationRecordsAdminServiceImpl extends ServiceImpl<Slime
// mysql // mysql
boolean success = saveBatch(authorizationRecordsArrayList); boolean success = saveBatch(authorizationRecordsArrayList);
if (!success) { if (!success) {
// todo error
throw new LiquidnetServiceException(); throw new LiquidnetServiceException();
} }
success = authorizationPermissionsAdminService.saveBatch(authorizationPermissionsArrayList); success = authorizationPermissionsAdminService.saveBatch(authorizationPermissionsArrayList);
if (!success) { if (!success) {
// todo error
throw new LiquidnetServiceException(); throw new LiquidnetServiceException();
} }
......
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/slime/service/impl/SlimeFieldAppliesAdminServiceImpl.java
View file @ 0e4846e1
...@@ -65,7 +65,6 @@ public class SlimeFieldAppliesAdminServiceImpl extends ServiceImpl<SlimeFieldApp ...@@ -65,7 +65,6 @@ public class SlimeFieldAppliesAdminServiceImpl extends ServiceImpl<SlimeFieldApp
fieldAppliesLambdaQueryWrapper.eq(SlimeFieldApplies::getFieldApplyId, fieldApplyId); fieldAppliesLambdaQueryWrapper.eq(SlimeFieldApplies::getFieldApplyId, fieldApplyId);
SlimeFieldApplies fieldAppliesEntity = getOne(fieldAppliesLambdaQueryWrapper); SlimeFieldApplies fieldAppliesEntity = getOne(fieldAppliesLambdaQueryWrapper);
if (0 != fieldAppliesEntity.getApplyStatus()) { if (0 != fieldAppliesEntity.getApplyStatus()) {
// todo error
throw new LiquidnetServiceException(); throw new LiquidnetServiceException();
} }
...@@ -85,7 +84,6 @@ public class SlimeFieldAppliesAdminServiceImpl extends ServiceImpl<SlimeFieldApp ...@@ -85,7 +84,6 @@ public class SlimeFieldAppliesAdminServiceImpl extends ServiceImpl<SlimeFieldApp
companiesEntity.setCreatedAt(now); companiesEntity.setCreatedAt(now);
boolean success = slimeCompaniesAdminService.save(companiesEntity); boolean success = slimeCompaniesAdminService.save(companiesEntity);
if (!success) { if (!success) {
// todo error
throw new LiquidnetServiceException(); throw new LiquidnetServiceException();
} }
...@@ -94,11 +92,9 @@ public class SlimeFieldAppliesAdminServiceImpl extends ServiceImpl<SlimeFieldApp ...@@ -94,11 +92,9 @@ public class SlimeFieldAppliesAdminServiceImpl extends ServiceImpl<SlimeFieldApp
fieldsLambdaQueryWrapper.eq(SlimeFields::getFieldId, fieldAppliesEntity.getFieldId()); fieldsLambdaQueryWrapper.eq(SlimeFields::getFieldId, fieldAppliesEntity.getFieldId());
SlimeFields fieldsEntity = slimeFieldsAdminService.getOne(fieldsLambdaQueryWrapper); SlimeFields fieldsEntity = slimeFieldsAdminService.getOne(fieldsLambdaQueryWrapper);
if (null == fieldsEntity) { if (null == fieldsEntity) {
// todo error
throw new LiquidnetServiceException(); throw new LiquidnetServiceException();
} }
if (2 != fieldsEntity.getClaimStatus() || !fieldsEntity.getUid().equals(fieldAppliesEntity.getUid())) { if (2 != fieldsEntity.getClaimStatus() || !fieldsEntity.getUid().equals(fieldAppliesEntity.getUid())) {
// todo error
throw new LiquidnetServiceException(); throw new LiquidnetServiceException();
} }
fieldsEntity.setIsOnline(1); fieldsEntity.setIsOnline(1);
...@@ -127,7 +123,6 @@ public class SlimeFieldAppliesAdminServiceImpl extends ServiceImpl<SlimeFieldApp ...@@ -127,7 +123,6 @@ public class SlimeFieldAppliesAdminServiceImpl extends ServiceImpl<SlimeFieldApp
fieldsLambdaUpdateWrapper.eq(SlimeFields::getFieldId, fieldsEntity.getFieldId()); fieldsLambdaUpdateWrapper.eq(SlimeFields::getFieldId, fieldsEntity.getFieldId());
success = slimeFieldsAdminService.update(fieldsEntity, fieldsLambdaUpdateWrapper); success = slimeFieldsAdminService.update(fieldsEntity, fieldsLambdaUpdateWrapper);
if (!success) { if (!success) {
// todo error
throw new LiquidnetServiceException(); throw new LiquidnetServiceException();
} }
...@@ -148,7 +143,6 @@ public class SlimeFieldAppliesAdminServiceImpl extends ServiceImpl<SlimeFieldApp ...@@ -148,7 +143,6 @@ public class SlimeFieldAppliesAdminServiceImpl extends ServiceImpl<SlimeFieldApp
fieldAppliesLambdaUpdateWrapper.set(SlimeFieldApplies::getUpdatedAt, fieldAppliesEntity.getUpdatedAt()); fieldAppliesLambdaUpdateWrapper.set(SlimeFieldApplies::getUpdatedAt, fieldAppliesEntity.getUpdatedAt());
success = update(fieldAppliesLambdaUpdateWrapper); success = update(fieldAppliesLambdaUpdateWrapper);
if (!success) { if (!success) {
// todo error
throw new LiquidnetServiceException(); throw new LiquidnetServiceException();
} }
...@@ -202,7 +196,6 @@ public class SlimeFieldAppliesAdminServiceImpl extends ServiceImpl<SlimeFieldApp ...@@ -202,7 +196,6 @@ public class SlimeFieldAppliesAdminServiceImpl extends ServiceImpl<SlimeFieldApp
companiesEntity.setCreatedAt(now); companiesEntity.setCreatedAt(now);
boolean success = slimeCompaniesAdminService.save(companiesEntity); boolean success = slimeCompaniesAdminService.save(companiesEntity);
if (!success) { if (!success) {
// todo error
throw new LiquidnetServiceException(); throw new LiquidnetServiceException();
} }
...@@ -233,7 +226,6 @@ public class SlimeFieldAppliesAdminServiceImpl extends ServiceImpl<SlimeFieldApp ...@@ -233,7 +226,6 @@ public class SlimeFieldAppliesAdminServiceImpl extends ServiceImpl<SlimeFieldApp
fieldsEntity.setCreatedAt(now); fieldsEntity.setCreatedAt(now);
success = slimeFieldsAdminService.save(fieldsEntity); success = slimeFieldsAdminService.save(fieldsEntity);
if (!success) { if (!success) {
// todo error
throw new LiquidnetServiceException(); throw new LiquidnetServiceException();
} }
...@@ -256,7 +248,6 @@ public class SlimeFieldAppliesAdminServiceImpl extends ServiceImpl<SlimeFieldApp ...@@ -256,7 +248,6 @@ public class SlimeFieldAppliesAdminServiceImpl extends ServiceImpl<SlimeFieldApp
fieldAppliesLambdaUpdateWrapper.set(SlimeFieldApplies::getFieldId, fieldAppliesEntity.getFieldId()); fieldAppliesLambdaUpdateWrapper.set(SlimeFieldApplies::getFieldId, fieldAppliesEntity.getFieldId());
success = update(fieldAppliesLambdaUpdateWrapper); success = update(fieldAppliesLambdaUpdateWrapper);
if (!success) { if (!success) {
// todo error
throw new LiquidnetServiceException(); throw new LiquidnetServiceException();
} }
...@@ -309,7 +300,6 @@ public class SlimeFieldAppliesAdminServiceImpl extends ServiceImpl<SlimeFieldApp ...@@ -309,7 +300,6 @@ public class SlimeFieldAppliesAdminServiceImpl extends ServiceImpl<SlimeFieldApp
fieldAppliesLambdaQueryWrapper.eq(SlimeFieldApplies::getFieldApplyId, fieldApplyId); fieldAppliesLambdaQueryWrapper.eq(SlimeFieldApplies::getFieldApplyId, fieldApplyId);
SlimeFieldApplies fieldAppliesEntity = getOne(fieldAppliesLambdaQueryWrapper); SlimeFieldApplies fieldAppliesEntity = getOne(fieldAppliesLambdaQueryWrapper);
if (0 != fieldAppliesEntity.getApplyStatus()) { if (0 != fieldAppliesEntity.getApplyStatus()) {
// todo error
throw new LiquidnetServiceException(); throw new LiquidnetServiceException();
} }
...@@ -321,11 +311,9 @@ public class SlimeFieldAppliesAdminServiceImpl extends ServiceImpl<SlimeFieldApp ...@@ -321,11 +311,9 @@ public class SlimeFieldAppliesAdminServiceImpl extends ServiceImpl<SlimeFieldApp
fieldsLambdaQueryWrapper.eq(SlimeFields::getFieldId, fieldAppliesEntity.getFieldId()); fieldsLambdaQueryWrapper.eq(SlimeFields::getFieldId, fieldAppliesEntity.getFieldId());
SlimeFields fieldsEntity = slimeFieldsAdminService.getOne(fieldsLambdaQueryWrapper); SlimeFields fieldsEntity = slimeFieldsAdminService.getOne(fieldsLambdaQueryWrapper);
if (null == fieldsEntity) { if (null == fieldsEntity) {
// todo error
throw new LiquidnetServiceException(); throw new LiquidnetServiceException();
} }
if (2 != fieldsEntity.getClaimStatus() || !fieldsEntity.getUid().equals(fieldAppliesEntity.getUid())) { if (2 != fieldsEntity.getClaimStatus() || !fieldsEntity.getUid().equals(fieldAppliesEntity.getUid())) {
// todo error
throw new LiquidnetServiceException(); throw new LiquidnetServiceException();
} }
fieldsEntity.setClaimStatus(0); fieldsEntity.setClaimStatus(0);
...@@ -338,7 +326,6 @@ public class SlimeFieldAppliesAdminServiceImpl extends ServiceImpl<SlimeFieldApp ...@@ -338,7 +326,6 @@ public class SlimeFieldAppliesAdminServiceImpl extends ServiceImpl<SlimeFieldApp
fieldsLambdaUpdateWrapper.set(SlimeFields::getUpdatedAt, fieldsEntity.getUpdatedAt()); fieldsLambdaUpdateWrapper.set(SlimeFields::getUpdatedAt, fieldsEntity.getUpdatedAt());
boolean success = slimeFieldsAdminService.update(fieldsLambdaUpdateWrapper); boolean success = slimeFieldsAdminService.update(fieldsLambdaUpdateWrapper);
if (!success) { if (!success) {
// todo error
throw new LiquidnetServiceException(); throw new LiquidnetServiceException();
} }
...@@ -359,7 +346,6 @@ public class SlimeFieldAppliesAdminServiceImpl extends ServiceImpl<SlimeFieldApp ...@@ -359,7 +346,6 @@ public class SlimeFieldAppliesAdminServiceImpl extends ServiceImpl<SlimeFieldApp
fieldAppliesLambdaUpdateWrapper.set(SlimeFieldApplies::getUpdatedAt, fieldAppliesEntity.getUpdatedAt()); fieldAppliesLambdaUpdateWrapper.set(SlimeFieldApplies::getUpdatedAt, fieldAppliesEntity.getUpdatedAt());
success = update(fieldAppliesLambdaUpdateWrapper); success = update(fieldAppliesLambdaUpdateWrapper);
if (!success) { if (!success) {
// todo error
throw new LiquidnetServiceException(); throw new LiquidnetServiceException();
} }
...@@ -412,7 +398,6 @@ public class SlimeFieldAppliesAdminServiceImpl extends ServiceImpl<SlimeFieldApp ...@@ -412,7 +398,6 @@ public class SlimeFieldAppliesAdminServiceImpl extends ServiceImpl<SlimeFieldApp
fieldAppliesLambdaUpdateWrapper.set(SlimeFieldApplies::getUpdatedAt, fieldAppliesEntity.getUpdatedAt()); fieldAppliesLambdaUpdateWrapper.set(SlimeFieldApplies::getUpdatedAt, fieldAppliesEntity.getUpdatedAt());
boolean success = update(fieldAppliesLambdaUpdateWrapper); boolean success = update(fieldAppliesLambdaUpdateWrapper);
if (!success) { if (!success) {
// todo error
throw new LiquidnetServiceException(); throw new LiquidnetServiceException();
} }
......
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/slime/service/impl/SlimeFieldsAdminServiceImpl.java
View file @ 0e4846e1
...@@ -43,7 +43,6 @@ public class SlimeFieldsAdminServiceImpl extends ServiceImpl<SlimeFieldsMapper, ...@@ -43,7 +43,6 @@ public class SlimeFieldsAdminServiceImpl extends ServiceImpl<SlimeFieldsMapper,
fieldsLambdaQueryWrapper.eq(SlimeFields::getFieldId, parameter.getFieldId()); fieldsLambdaQueryWrapper.eq(SlimeFields::getFieldId, parameter.getFieldId());
SlimeFields fieldsEntity = getOne(fieldsLambdaQueryWrapper); SlimeFields fieldsEntity = getOne(fieldsLambdaQueryWrapper);
if (null == fieldsEntity) { if (null == fieldsEntity) {
// todo error
throw new LiquidnetServiceException(); throw new LiquidnetServiceException();
} }
......
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/slime/service/impl/SlimeSponsorAppliesAdminServiceImpl.java
View file @ 0e4846e1
...@@ -57,7 +57,6 @@ public class SlimeSponsorAppliesAdminServiceImpl extends ServiceImpl<SlimeSponso ...@@ -57,7 +57,6 @@ public class SlimeSponsorAppliesAdminServiceImpl extends ServiceImpl<SlimeSponso
sponsorAppliesLambdaQueryWrapper.eq(SlimeSponsorApplies::getSponsorApplyId, sponsorApplyId); sponsorAppliesLambdaQueryWrapper.eq(SlimeSponsorApplies::getSponsorApplyId, sponsorApplyId);
SlimeSponsorApplies sponsorAppliesEntity = getOne(sponsorAppliesLambdaQueryWrapper); SlimeSponsorApplies sponsorAppliesEntity = getOne(sponsorAppliesLambdaQueryWrapper);
if (0 != sponsorAppliesEntity.getApplyStatus()) { if (0 != sponsorAppliesEntity.getApplyStatus()) {
// todo error
throw new LiquidnetServiceException(); throw new LiquidnetServiceException();
} }
...@@ -78,7 +77,6 @@ public class SlimeSponsorAppliesAdminServiceImpl extends ServiceImpl<SlimeSponso ...@@ -78,7 +77,6 @@ public class SlimeSponsorAppliesAdminServiceImpl extends ServiceImpl<SlimeSponso
companiesEntity.setCreatedAt(now); companiesEntity.setCreatedAt(now);
boolean success = slimeCompaniesAdminService.save(companiesEntity); boolean success = slimeCompaniesAdminService.save(companiesEntity);
if (!success) { if (!success) {
// todo error
throw new LiquidnetServiceException(); throw new LiquidnetServiceException();
} }
} }
...@@ -105,7 +103,6 @@ public class SlimeSponsorAppliesAdminServiceImpl extends ServiceImpl<SlimeSponso ...@@ -105,7 +103,6 @@ public class SlimeSponsorAppliesAdminServiceImpl extends ServiceImpl<SlimeSponso
sponsorsEntity.setCreatedAt(now); sponsorsEntity.setCreatedAt(now);
boolean success = slimeSponsorsAdminService.save(sponsorsEntity); boolean success = slimeSponsorsAdminService.save(sponsorsEntity);
if (!success) { if (!success) {
// todo error
throw new LiquidnetServiceException(); throw new LiquidnetServiceException();
} }
...@@ -128,7 +125,6 @@ public class SlimeSponsorAppliesAdminServiceImpl extends ServiceImpl<SlimeSponso ...@@ -128,7 +125,6 @@ public class SlimeSponsorAppliesAdminServiceImpl extends ServiceImpl<SlimeSponso
sponsorAppliesLambdaUpdateWrapper.set(SlimeSponsorApplies::getSponsorId, sponsorAppliesEntity.getSponsorId()); sponsorAppliesLambdaUpdateWrapper.set(SlimeSponsorApplies::getSponsorId, sponsorAppliesEntity.getSponsorId());
success = update(sponsorAppliesLambdaUpdateWrapper); success = update(sponsorAppliesLambdaUpdateWrapper);
if (!success) { if (!success) {
// todo error
throw new LiquidnetServiceException(); throw new LiquidnetServiceException();
} }
...@@ -180,7 +176,6 @@ public class SlimeSponsorAppliesAdminServiceImpl extends ServiceImpl<SlimeSponso ...@@ -180,7 +176,6 @@ public class SlimeSponsorAppliesAdminServiceImpl extends ServiceImpl<SlimeSponso
sponsorAppliesLambdaQueryWrapper.eq(SlimeSponsorApplies::getSponsorApplyId, sponsorApplyId); sponsorAppliesLambdaQueryWrapper.eq(SlimeSponsorApplies::getSponsorApplyId, sponsorApplyId);
SlimeSponsorApplies sponsorAppliesEntity = getOne(sponsorAppliesLambdaQueryWrapper); SlimeSponsorApplies sponsorAppliesEntity = getOne(sponsorAppliesLambdaQueryWrapper);
if (0 != sponsorAppliesEntity.getApplyStatus()) { if (0 != sponsorAppliesEntity.getApplyStatus()) {
// todo error
throw new LiquidnetServiceException(); throw new LiquidnetServiceException();
} }
...@@ -203,7 +198,6 @@ public class SlimeSponsorAppliesAdminServiceImpl extends ServiceImpl<SlimeSponso ...@@ -203,7 +198,6 @@ public class SlimeSponsorAppliesAdminServiceImpl extends ServiceImpl<SlimeSponso
sponsorAppliesLambdaUpdateWrapper.set(SlimeSponsorApplies::getUpdatedAt, sponsorAppliesEntity.getUpdatedAt()); sponsorAppliesLambdaUpdateWrapper.set(SlimeSponsorApplies::getUpdatedAt, sponsorAppliesEntity.getUpdatedAt());
boolean success = update(sponsorAppliesLambdaUpdateWrapper); boolean success = update(sponsorAppliesLambdaUpdateWrapper);
if (!success) { if (!success) {
// todo error
throw new LiquidnetServiceException(); throw new LiquidnetServiceException();
} }
......
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/slime/service/impl/SlimeSponsorsAdminServiceImpl.java
View file @ 0e4846e1
...@@ -37,7 +37,6 @@ public class SlimeSponsorsAdminServiceImpl extends ServiceImpl<SlimeSponsorsMapp ...@@ -37,7 +37,6 @@ public class SlimeSponsorsAdminServiceImpl extends ServiceImpl<SlimeSponsorsMapp
sponsorsLambdaQueryWrapper.eq(SlimeSponsors::getSponsorId, parameter.getSponsorId()); sponsorsLambdaQueryWrapper.eq(SlimeSponsors::getSponsorId, parameter.getSponsorId());
SlimeSponsors sponsorsEntity = getOne(sponsorsLambdaQueryWrapper); SlimeSponsors sponsorsEntity = getOne(sponsorsLambdaQueryWrapper);
if (null == sponsorsEntity) { if (null == sponsorsEntity) {
// todo error
throw new LiquidnetServiceException(); throw new LiquidnetServiceException();
} }
......
liquidnet-bus-service/liquidnet-service-goblin/liquidnet-service-goblin-impl/src/main/java/com/liquidnet/service/goblin/controller/manage/GoblinStoreBackOrderController.java
View file @ 0e4846e1
...@@ -65,15 +65,15 @@ public class GoblinStoreBackOrderController { ...@@ -65,15 +65,15 @@ public class GoblinStoreBackOrderController {
return goblinStoreBackOrderService.orderDetails(backOrderId); return goblinStoreBackOrderService.orderDetails(backOrderId);
} }
// @ApiOperation(value = "同意退款") @ApiOperation(value = "同意退款")
// @ApiImplicitParams({ @ApiImplicitParams({
// @ApiImplicitParam(type = "form", required = true, dataType = "String", name = "backOrderId", value = "订单id"), @ApiImplicitParam(type = "form", required = true, dataType = "String", name = "backOrderId", value = "订单id"),
// }) })
// @GetMapping(value = "agree") @GetMapping(value = "agree")
// public ResponseDto<Boolean> agreeRefund(@RequestParam(value = "backOrderId", required = true) @Valid String backOrderId) { public ResponseDto<Boolean> agreeRefund(@RequestParam(value = "backOrderId", required = true) @Valid String backOrderId) {
// return goblinStoreBackOrderService.agreeRefund(backOrderId); return goblinStoreBackOrderService.agreeRefund(backOrderId);
// } }
//
@ApiOperation(value = "拒绝退款") @ApiOperation(value = "拒绝退款")
@ApiImplicitParams({ @ApiImplicitParams({
@ApiImplicitParam(type = "form", required = true, dataType = "String", name = "backOrderId", value = "订单id"), @ApiImplicitParam(type = "form", required = true, dataType = "String", name = "backOrderId", value = "订单id"),
......
liquidnet-bus-service/liquidnet-service-goblin/liquidnet-service-goblin-impl/src/main/java/com/liquidnet/service/goblin/service/impl/GoblinAppZhengzaiServiceImpl.java
View file @ 0e4846e1
...@@ -94,7 +94,7 @@ public class GoblinAppZhengzaiServiceImpl implements IGoblinAppZhengzaiService { ...@@ -94,7 +94,7 @@ public class GoblinAppZhengzaiServiceImpl implements IGoblinAppZhengzaiService {
vo.setSkuName(skuInfoVo.getSkuName()); vo.setSkuName(skuInfoVo.getSkuName());
vo.setNum(skuInfoVo.getNum()); vo.setNum(skuInfoVo.getNum());
vo.setSkuSpecs(skuInfoVo.getSkuSpecs()); vo.setSkuSpecs(skuInfoVo.getSkuSpecs());
vo.setSpuName("");//todo 胡佳晨 vo.setSpuName(skuInfoVo.getSpuName());
} }
} }
} }
......
liquidnet-bus-service/liquidnet-service-goblin/liquidnet-service-goblin-impl/src/main/java/com/liquidnet/service/goblin/service/impl/GoblinOrderServiceImpl.java
View file @ 0e4846e1
...@@ -243,7 +243,7 @@ public class GoblinOrderServiceImpl implements IGoblinOrderService { ...@@ -243,7 +243,7 @@ public class GoblinOrderServiceImpl implements IGoblinOrderService {
orderSku.setSkuSpecs(JSON.toJSONString(skuVo.getSkuSpecList())); orderSku.setSkuSpecs(JSON.toJSONString(skuVo.getSkuSpecList()));
orderSku.setPriceVoucher(priceBase.subtract(price)); orderSku.setPriceVoucher(priceBase.subtract(price));
orderSku.setCreatedAt(now); orderSku.setCreatedAt(now);
//todo 需要记录spu名称和图片 //todo hujiachen 需要记录spu名称和图片
goblinOrderSkuList.add(orderSku); goblinOrderSkuList.add(orderSku);
} }
//优惠券 //优惠券
...@@ -270,7 +270,7 @@ public class GoblinOrderServiceImpl implements IGoblinOrderService { ...@@ -270,7 +270,7 @@ public class GoblinOrderServiceImpl implements IGoblinOrderService {
storeOrder.setPriceTotal(storeTotalPrice); storeOrder.setPriceTotal(storeTotalPrice);
storeOrder.setPriceActual(storeOrder.getPriceTotal().add(storeOrder.getPriceExpress()).subtract(voucherMarket).subtract(voucherPrice)); storeOrder.setPriceActual(storeOrder.getPriceTotal().add(storeOrder.getPriceExpress()).subtract(voucherMarket).subtract(voucherPrice));
storeOrder.setPriceRefund(BigDecimal.ZERO); storeOrder.setPriceRefund(BigDecimal.ZERO);
storeOrder.setPriceExpress(BigDecimal.TEN);//todo 快递费 暂时写死 storeOrder.setPriceExpress(BigDecimal.TEN);
storeOrder.setPriceCoupon(voucherPrice); storeOrder.setPriceCoupon(voucherPrice);
storeOrder.setPriceVoucher(voucherMarket.add(voucherPrice)); storeOrder.setPriceVoucher(voucherMarket.add(voucherPrice));
storeOrder.setStatus(0); storeOrder.setStatus(0);
...@@ -553,7 +553,7 @@ public class GoblinOrderServiceImpl implements IGoblinOrderService { ...@@ -553,7 +553,7 @@ public class GoblinOrderServiceImpl implements IGoblinOrderService {
GoblinStoreOrder storeOrder = GoblinStoreOrder.getNew(); GoblinStoreOrder storeOrder = GoblinStoreOrder.getNew();
if (orderVo.getStatus() == GoblinStatusConst.Status.ORDER_STATUS_5.getValue() && syncOrderParam.getStatus().equals(1)) { if (orderVo.getStatus() == GoblinStatusConst.Status.ORDER_STATUS_5.getValue() && syncOrderParam.getStatus().equals(1)) {
log.error("订单号为 {} 的订单超时支付", syncOrderParam.getOrderCode()); log.error("订单号为 {} 的订单超时支付", syncOrderParam.getOrderCode());
// todo 操作超时支付 // todo hujiachen 操作超时支付
// orderVo.setStatus(GoblinStatusConst.OrderStatus.ORDER_STATUS_61.getValue()); // orderVo.setStatus(GoblinStatusConst.OrderStatus.ORDER_STATUS_61.getValue());
// redisUtils.setGoblinOrder(orderVo.getOrderId(),orderVo); // redisUtils.setGoblinOrder(orderVo.getOrderId(),orderVo);
} else if ((orderVo.getStatus() == GoblinStatusConst.Status.ORDER_STATUS_6.getValue() || orderVo.getStatus() == GoblinStatusConst.Status.ORDER_STATUS_7.getValue()) && syncOrderParam.getStatus().equals(1)) { } else if ((orderVo.getStatus() == GoblinStatusConst.Status.ORDER_STATUS_6.getValue() || orderVo.getStatus() == GoblinStatusConst.Status.ORDER_STATUS_7.getValue()) && syncOrderParam.getStatus().equals(1)) {
......
liquidnet-bus-service/liquidnet-service-goblin/liquidnet-service-goblin-impl/src/main/java/com/liquidnet/service/goblin/service/impl/manage/GoblinStoreBackOrderServiceImpl.java
View file @ 0e4846e1
...@@ -33,7 +33,7 @@ import java.util.List; ...@@ -33,7 +33,7 @@ import java.util.List;
@Service @Service
@Slf4j @Slf4j
public class GoblinStoreBackOrderServiceImpl implements IGoblinStoreBackOrderService { public class GoblinStoreBackOrderServiceImpl implements IGoblinStoreBackOrderService {
// todo hujiachen 日志没加
@Autowired @Autowired
GoblinRedisUtils redisUtils; GoblinRedisUtils redisUtils;
@Autowired @Autowired
...@@ -127,6 +127,42 @@ public class GoblinStoreBackOrderServiceImpl implements IGoblinStoreBackOrderSer ...@@ -127,6 +127,42 @@ public class GoblinStoreBackOrderServiceImpl implements IGoblinStoreBackOrderSer
return ResponseDto.success(); return ResponseDto.success();
} }
@Override
public ResponseDto<Boolean> agreeRefund(String backOrderId) {
String uid = CurrentUtil.getCurrentUid();
LocalDateTime now = LocalDateTime.now();
GoblinStoreInfoVo storeInfoVo = redisUtils.getStoreInfoVoByUid(uid);
if (storeInfoVo == null) {
return ResponseDto.failure("无法查看");
}
GoblinBackOrderVo backOrderVo = redisUtils.getBackOrderVo(backOrderId);
backOrderVo.setStatus(GoblinStatusConst.Status.ORDER_BACK_STATUS_0.getValue());
//调用退款
GoblinStoreOrderVo orderVo = redisUtils.getGoblinOrder(backOrderId);
String returnString = initRefund(orderVo, backOrderVo.getRealBackPrice(), backOrderVo.getBackCode());
HashMap hashMapResult = JsonUtils.fromJson(returnString, HashMap.class);
Boolean success = (Boolean) hashMapResult.get("success");
String message = (String) hashMapResult.get("message");
if (!success) {
backOrderVo.setStatus(GoblinStatusConst.Status.ORDER_BACK_STATUS_10.getValue());
backOrderVo.setReason(backOrderVo.getReason() + ",失败原因：" + message);
log.error("REFUND DATA = " + returnString);
}
//redis
redisUtils.setBackOrderVo(backOrderId, backOrderVo);
//mongo
mongoUtils.updateGoblinBackOrderVo(backOrderId, backOrderVo);
//mysql
queueUtils.sendMsgByRedis(
MQConst.GoblinQueue.GOBLIN_STORE_ORDER_OPERA.getKey(),
SqlMapping.get("goblin_order.store.applyRefund",
backOrderVo.getStatus(),backOrderVo.getReason(), now,
backOrderId, now, now
)
);
return ResponseDto.success();
}
@Override @Override
public ResponseDto<Boolean> refusedRefund(String backOrderId) { public ResponseDto<Boolean> refusedRefund(String backOrderId) {
String uid = CurrentUtil.getCurrentUid(); String uid = CurrentUtil.getCurrentUid();
...@@ -144,7 +180,7 @@ public class GoblinStoreBackOrderServiceImpl implements IGoblinStoreBackOrderSer ...@@ -144,7 +180,7 @@ public class GoblinStoreBackOrderServiceImpl implements IGoblinStoreBackOrderSer
//mysql //mysql
queueUtils.sendMsgByRedis( queueUtils.sendMsgByRedis(
MQConst.GoblinQueue.GOBLIN_STORE_ORDER_OPERA.getKey(), MQConst.GoblinQueue.GOBLIN_STORE_ORDER_OPERA.getKey(),
SqlMapping.get("goblin_order.store.refused", SqlMapping.get("goblin_order.store.changeStatus",
backOrderVo.getStatus(), now, backOrderVo.getStatus(), now,
backOrderId, now, now backOrderId, now, now
) )
...@@ -184,4 +220,22 @@ public class GoblinStoreBackOrderServiceImpl implements IGoblinStoreBackOrderSer ...@@ -184,4 +220,22 @@ public class GoblinStoreBackOrderServiceImpl implements IGoblinStoreBackOrderSer
); );
return ResponseDto.success(); return ResponseDto.success();
} }
private String initRefund(GoblinStoreOrderVo orderVo, BigDecimal price, String refundCode) {
MultiValueMap<String, String> params = CollectionUtil.linkedMultiValueMapStringString();
params.add("code", orderVo.getPayCode());
params.add("notifyUrl", synUrl);
params.add("orderCode", orderVo.getMasterOrderCode());
params.add("orderRefundCode", refundCode);
params.add("paymentId", orderVo.getPaymentId());
params.add("paymentType", orderVo.getPaymentType());
params.add("price", String.valueOf(price));
params.add("priceTotal", String.valueOf(orderVo.getPriceActual()));
params.add("reason", "按需退款");
MultiValueMap<String, String> headers = CollectionUtil.linkedMultiValueMapStringString();
headers.add("Accept", "application/json;charset=UTF-8");
String returnString = HttpUtil.post(refundApply, params, headers);
log.debug("REFUND DATA = " + returnString);
return returnString;
}
} }
liquidnet-bus-service/liquidnet-service-goblin/liquidnet-service-goblin-impl/src/main/java/com/liquidnet/service/goblin/service/impl/manage/GoblinStorePurchasingServiceImpl.java
View file @ 0e4846e1
...@@ -383,7 +383,7 @@ public class GoblinStorePurchasingServiceImpl implements IGoblinStorePurchasingS ...@@ -383,7 +383,7 @@ public class GoblinStorePurchasingServiceImpl implements IGoblinStorePurchasingS
@Override @Override
public ResponseDto<Boolean> purchasingSpuDel(String marketId, String storeId, String spuId) { public ResponseDto<Boolean> purchasingSpuDel(String marketId, String storeId, String spuId) {
//todo 判断 如果有订单待支付 则不能关闭 //todo hujiachen 判断 如果有订单待支付 则不能关闭
LocalDateTime now = LocalDateTime.now(); LocalDateTime now = LocalDateTime.now();
String marketSpuId = spuId.concat(GoblinStatusConst.MarketPreStatus.MARKET_PRE_PURCHASE.getValue()).concat(IDGenerator.marketGoodId(marketId)); String marketSpuId = spuId.concat(GoblinStatusConst.MarketPreStatus.MARKET_PRE_PURCHASE.getValue()).concat(IDGenerator.marketGoodId(marketId));
GoblinStoreMarketPurchasing bean = GoblinStoreMarketPurchasing.getNew(); GoblinStoreMarketPurchasing bean = GoblinStoreMarketPurchasing.getNew();
......
liquidnet-bus-service/liquidnet-service-goblin/liquidnet-service-goblin-impl/src/main/java/com/liquidnet/service/goblin/service/impl/manage/GoblinZhengzaiServiceImpl.java
View file @ 0e4846e1
...@@ -281,7 +281,7 @@ public class GoblinZhengzaiServiceImpl implements IGoblinZhengzaiService { ...@@ -281,7 +281,7 @@ public class GoblinZhengzaiServiceImpl implements IGoblinZhengzaiService {
@Override @Override
public ResponseDto<Boolean> zhengzaiSpuDel(String marketId, String storeId, String spuId) { public ResponseDto<Boolean> zhengzaiSpuDel(String marketId, String storeId, String spuId) {
//todo 判断 如果有订单待支付 则不能关闭 //todo hujiachen 判断 如果有订单待支付 则不能关闭
LocalDateTime now = LocalDateTime.now(); LocalDateTime now = LocalDateTime.now();
String marketSpuId = spuId.concat(GoblinStatusConst.MarketPreStatus.MARKET_PRE_ZHENGZAI.getValue()).concat(IDGenerator.marketGoodId(marketId)); String marketSpuId = spuId.concat(GoblinStatusConst.MarketPreStatus.MARKET_PRE_ZHENGZAI.getValue()).concat(IDGenerator.marketGoodId(marketId));
GoblinMarketingZhengzai bean = GoblinMarketingZhengzai.getNew(); GoblinMarketingZhengzai bean = GoblinMarketingZhengzai.getNew();
......
liquidnet-bus-service/liquidnet-service-goblin/liquidnet-service-goblin-impl/src/main/resources/sqlmap.properties
View file @ 0e4846e1
...@@ -73,7 +73,8 @@ goblin_order.store.refundSkuPrice=UPDATE goblin_order_sku SET price_refund = ? , ...@@ -73,7 +73,8 @@ goblin_order.store.refundSkuPrice=UPDATE goblin_order_sku SET price_refund = ? ,
goblin_order.store.refundBackOrder=UPDATE goblin_back_order SET status = ? , updated_at = ? WHERE back_order_id = ? and (updated_at <= ? or created_at = ? or updated_at is null) goblin_order.store.refundBackOrder=UPDATE goblin_back_order SET status = ? , updated_at = ? WHERE back_order_id = ? and (updated_at <= ? or created_at = ? or updated_at is null)
goblin_order.store.changeExpress=UPDATE goblin_back_order SET real_back_price = ? ,back_price_express = ? updated_at = ? WHERE back_order_id = ? and (updated_at <= ? or created_at = ? or updated_at is null) goblin_order.store.changeExpress=UPDATE goblin_back_order SET real_back_price = ? ,back_price_express = ? updated_at = ? WHERE back_order_id = ? and (updated_at <= ? or created_at = ? or updated_at is null)
goblin_order.store.changeSku=UPDATE goblin_back_order SET real_back_price = ? , updated_at = ? WHERE back_order_id = ? and (updated_at <= ? or created_at = ? or updated_at is null) goblin_order.store.changeSku=UPDATE goblin_back_order SET real_back_price = ? , updated_at = ? WHERE back_order_id = ? and (updated_at <= ? or created_at = ? or updated_at is null)
goblin_order.store.refused=UPDATE goblin_back_order SET status = ? , updated_at = ? WHERE back_order_id = ? and (updated_at <= ? or created_at = ? or updated_at is null) goblin_order.store.changeStatus=UPDATE goblin_back_order SET status = ? , updated_at = ? WHERE back_order_id = ? and (updated_at <= ? or created_at = ? or updated_at is null)
goblin_order.store.applyRefund=UPDATE goblin_back_order SET status = ? ,reason=?, updated_at = ? WHERE back_order_id = ? and (updated_at <= ? or created_at = ? or updated_at is null)
#---- 用户订单操作 #---- 用户订单操作
......
liquidnet-bus-service/liquidnet-service-sweet/src/main/java/com/liquidnet/service/sweet/service/impl/SweetIntegralActivityDrawServiceImpl.java
View file @ 0e4846e1
...@@ -198,7 +198,6 @@ public class SweetIntegralActivityDrawServiceImpl extends ServiceImpl<SweetInteg ...@@ -198,7 +198,6 @@ public class SweetIntegralActivityDrawServiceImpl extends ServiceImpl<SweetInteg
receivingStatus = 2; receivingStatus = 2;
} }
if (prizeType == StatusConst.PRIZE_TYPE2) {// 中奖券 优惠券默认未领取状态 if (prizeType == StatusConst.PRIZE_TYPE2) {// 中奖券 优惠券默认未领取状态
//TODO 中券改为已领取
/*receivingStatus = 2; /*receivingStatus = 2;
redisDataUtils.setSendCoupon(drawId,0);*/ redisDataUtils.setSendCoupon(drawId,0);*/
receivingStatus = 3; receivingStatus = 3;
...@@ -352,7 +351,6 @@ public class SweetIntegralActivityDrawServiceImpl extends ServiceImpl<SweetInteg ...@@ -352,7 +351,6 @@ public class SweetIntegralActivityDrawServiceImpl extends ServiceImpl<SweetInteg
Map tokenClaims = CurrentUtil.getTokenClaims(); Map tokenClaims = CurrentUtil.getTokenClaims();
String mobile = StringUtils.defaultString((String.valueOf(tokenClaims.get(CurrentUtil.TOKEN_MOBILE))), ""); String mobile = StringUtils.defaultString((String.valueOf(tokenClaims.get(CurrentUtil.TOKEN_MOBILE))), "");
String uid = StringUtils.defaultString((String.valueOf(tokenClaims.get(CurrentUtil.TOKEN_SUB))), ""); String uid = StringUtils.defaultString((String.valueOf(tokenClaims.get(CurrentUtil.TOKEN_SUB))), "");
//TODO 可以不判断发送状态 增加个redis 来判断是否发送过
// if (null != drawVo && (drawVo.getReceivingStatus() == 1 || drawVo.getReceivingStatus() == 2 && redisDataUtils.isSendCoupon(drawId)) && drawVo.getUserId().equals(uid)) { // if (null != drawVo && (drawVo.getReceivingStatus() == 1 || drawVo.getReceivingStatus() == 2 && redisDataUtils.isSendCoupon(drawId)) && drawVo.getUserId().equals(uid)) {
// TODO: 2021/12/24 jxl 是否有必要判断中奖类型 和 券id是否在配置中 // TODO: 2021/12/24 jxl 是否有必要判断中奖类型 和 券id是否在配置中
if (null != drawVo && drawVo.getReceivingStatus() != 2 && drawVo.getUserId().equals(uid)) { if (null != drawVo && drawVo.getReceivingStatus() != 2 && drawVo.getUserId().equals(uid)) {
...@@ -379,7 +377,6 @@ public class SweetIntegralActivityDrawServiceImpl extends ServiceImpl<SweetInteg ...@@ -379,7 +377,6 @@ public class SweetIntegralActivityDrawServiceImpl extends ServiceImpl<SweetInteg
// 更新缓存 // 更新缓存
redisDataUtils.updateIntegralActivityDrawInfo(drawId, couponId); redisDataUtils.updateIntegralActivityDrawInfo(drawId, couponId);
//TODO 注释修改券逻辑
// redisDataUtils.setSendCoupon(drawId,1); // redisDataUtils.setSendCoupon(drawId,1);
// mongoTemplate.getCollection(IntegralActivityDrawVo.class.getSimpleName()).updateOne( // mongoTemplate.getCollection(IntegralActivityDrawVo.class.getSimpleName()).updateOne(
// Query.query(Criteria.where("drawId").is(drawId)).getQueryObject(), // Query.query(Criteria.where("drawId").is(drawId)).getQueryObject(),
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment