ソースを参照

//..

private_deployment
xhxu 1年前
コミット
f1211717c3
6個のファイルの変更7行の追加84行の削除
  1. +4
    -3
      suimangAdmin/src/main/resources/db/migration/V2023080800001_create.sql
  2. +1
    -1
      suimangCApi/src/main/java/com/iformall/controller/UserDigitalAvatarPhotoController.java
  3. +1
    -0
      suimangService/src/main/java/com/iformall/common/SysConfigConstant.java
  4. +0
    -2
      suimangService/src/main/java/com/iformall/service/WxCouponOrderService.java
  5. +0
    -77
      suimangService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java
  6. +1
    -1
      suimangService/src/main/java/com/iformall/service/sm/impl/UserDigitalAvatarPhotoServiceImpl.java

+ 4
- 3
suimangAdmin/src/main/resources/db/migration/V2023080800001_create.sql ファイルの表示

@@ -1,10 +1,11 @@
user_basic_property
user_basic_property_log
user_basic_from
user_basic_image
user_basic_qrcode
user_basic_glod_config
user_basic_property
user_basic_property_log
user_digital_avatar_order
user_digital_avatar_photo
user_basic_qrcode

product
product_order


+ 1
- 1
suimangCApi/src/main/java/com/iformall/controller/UserDigitalAvatarPhotoController.java ファイルの表示

@@ -140,7 +140,7 @@ public class UserDigitalAvatarPhotoController extends BaseController {
}

@ApiOperation("获取照片是否超分成功")
@GetMapping("/getPhoto")
@GetMapping("/getSupperPhoto")
@ApiImplicitParam(name = "id", value = "id", dataType = "Long", paramType = "query", required = true)
public ResultData getPhoto(Long id) {
logger.debug("[" + getIpAddr() + "] UserDigitalAvatarPhotoController::photoSupper");


+ 1
- 0
suimangService/src/main/java/com/iformall/common/SysConfigConstant.java ファイルの表示

@@ -4,4 +4,5 @@ public class SysConfigConstant {

public static final String vierfy_seconds_key="vierfySeconds";
public static final String default_merchant_b_user = "defaultMerchantBUserId";

}

+ 0
- 2
suimangService/src/main/java/com/iformall/service/WxCouponOrderService.java ファイルの表示

@@ -60,8 +60,6 @@ public interface WxCouponOrderService {
*/
WxCouponOrder verify(WxCouponOrder couponOrder, WxMerchantBUser bUser, EnumCouponVerifyType couponVerifyType);
WxCouponOrder verifyByEquiment(Long couponOrderId,String tenantId,String parentTenantId,String remark);

/**
* 核销后发送消息


+ 0
- 77
suimangService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java ファイルの表示

@@ -1525,83 +1525,6 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService {
}
return false;
}
@Override
@Transactional(propagation = Propagation.REQUIRED, readOnly = false, rollbackFor = {Exception.class})
public WxCouponOrder verifyByEquiment(Long couponOrderId,String tenantId,String parentTenantId,String remark) {
TenantEntity tenantEntity = new TenantEntity();
tenantEntity.setTenantId(tenantId);
tenantEntity.setParentTenantId(parentTenantId);
WxCouponOrderCVo wxCouponOrderCVo = this.detailCUserVo(String.valueOf(couponOrderId),tenantEntity);
if (wxCouponOrderCVo == null) {
throw new MallinkException(ErrorCode.COUPON_ORDER_IS_NULL);
}
WxCUserBasicInfo wxCUserBasicInfo = wxCUserBasicInfoService.getById(wxCouponOrderCVo.getcUserId(),wxCouponOrderCVo.getFinalTenantId());
if (wxCUserBasicInfo != null && EnumCreditLockedStatus.CLOSE.getCode().equals(wxCUserBasicInfo.getStatus())) {
throw new MallinkException(ErrorCode.MEMBER_IS_LOCKED);
}
Date now = new Date();
if (wxCouponOrderCVo.getValidType().equals(EnumCouponValidType.BETWEEN_TWO_TIME.getCode())){
// && !wxCouponOrderCVo.getType().equals(EnumCouponType.COUPON_PREORDER.getCode())) {
if(wxCouponOrderCVo.getType().equals(EnumCouponType.COUPON_PREORDER.getCode())){
if (wxCouponOrderCVo.getPickStartDate().after(now)) {
throw new MallinkException(ErrorCode.COUPON_ORDER_IS_EARLIER_THAN_VALIDDATE);
}
if (wxCouponOrderCVo.getPickEndDate().before(now)) {
throw new MallinkException(ErrorCode.COUPON_ORDER_IS_LATER_THAN_VALIDDATE);
}
}else{
if (wxCouponOrderCVo.getValidStartDate().after(now)) {
throw new MallinkException(ErrorCode.COUPON_ORDER_IS_EARLIER_THAN_VALIDDATE);
}
if (wxCouponOrderCVo.getValidEndDate().before(now)) {
throw new MallinkException(ErrorCode.COUPON_ORDER_IS_LATER_THAN_VALIDDATE);
}
}

} else {
if (wxCouponOrderCVo.getExpiredTime().before(now)) {
throw new MallinkException(ErrorCode.COUPON_IS_EXPIRED);
}
}

WxCouponOrder wxCouponOrder = this.getById(couponOrderId,tenantEntity.getTenantId());
if (wxCouponOrder == null) {
throw new MallinkException(ErrorCode.COUPON_ORDER_IS_NULL);
}

SysConfig sysConfig = sysConfigService.getByKey(SysConfigConstant.default_merchant_b_user, tenantEntity);
if (null == sysConfig) {
throw new MallinkException(ErrorCode.SYS_CONFIG_DEFAULT_MERCHANT_B_USER_UNSET);
}
WxMerchantBUser wxMerchantBUser = wxMerchantBUserService.getById(Long.parseLong(sysConfig.getConfigItemValue()));
if (wxMerchantBUser == null) {
throw new MallinkException(ErrorCode.USER_IS_EMPTY.getCode(), "核销员ID不存在");
}
WxCouponOrder couponOrder = null;
try {
wxCouponOrder.setVerifyRemark(remark);
couponOrder = this.verify(wxCouponOrder, wxMerchantBUser, EnumCouponVerifyType.VERIFY_B);
} catch (MallinkException e) {
logger.error("核销异常: " ,e);
throw new MallinkException(e.getErrorCode(), e.getMessage());
} catch (Exception e) {
logger.error("核销异常: " ,e);
throw new MallinkException(ErrorCode.VERIFY_ERROR.getCode(), e.getMessage());
}

if (couponOrder != null) {
this.sendInsideCouponVerifyMsg(couponOrder.getId(),couponOrder, wxMerchantBUser.getMerchantId(), wxMerchantBUser);
}
return couponOrder;
}

/**
* 核销增加成长值,积分


+ 1
- 1
suimangService/src/main/java/com/iformall/service/sm/impl/UserDigitalAvatarPhotoServiceImpl.java ファイルの表示

@@ -53,7 +53,7 @@ public class UserDigitalAvatarPhotoServiceImpl implements UserDigitalAvatarPhoto
UserDigitalAvatarPhotoServiceImpl proxy = (UserDigitalAvatarPhotoServiceImpl) AopContext.currentProxy();
proxy.handleCreateSupper(record);

proxy.superPhoto(record);
this.superPhoto(record);
return new ResultData(record);
}catch(MallinkException e){
return new ResultData(e.getErrorCode(),e.getMessage());


読み込み中…
キャンセル
保存