Quellcode durchsuchen

[优化]商户主券参数转换

release_toaliyun_real
Burce vor 6 Jahren
Ursprung
Commit
429d58be1c
4 geänderte Dateien mit 8 neuen und 9 gelöschten Zeilen
  1. +1
    -1
      mallinkAdmin/src/main/java/com/iformall/controller/basic/WxMerchantController.java
  2. +4
    -4
      mallinkBApi/src/main/java/com/iformall/controller/WxCouponSendController.java
  3. +1
    -1
      mallinkService/src/main/java/com/iformall/service/WxCouponSendService.java
  4. +2
    -3
      mallinkService/src/main/java/com/iformall/service/impl/WxCouponSendServiceImpl.java

+ 1
- 1
mallinkAdmin/src/main/java/com/iformall/controller/basic/WxMerchantController.java Datei anzeigen

@@ -185,7 +185,7 @@ public class WxMerchantController extends BaseController {
return wxMerchantService.updateMerchantTax(wxMerchant); return wxMerchantService.updateMerchantTax(wxMerchant);
} }


@ApiOperation("更新会员等级权益接口")
@ApiOperation("商户信息设置接口")
@PostMapping("updateMerchantLevel") @PostMapping("updateMerchantLevel")
@SystemControllerLog(description = "商户-更新会员等级权益") @SystemControllerLog(description = "商户-更新会员等级权益")
public ResultData updateMerchantLevel(@RequestBody WxMerchant wxMerchant) { public ResultData updateMerchantLevel(@RequestBody WxMerchant wxMerchant) {


+ 4
- 4
mallinkBApi/src/main/java/com/iformall/controller/WxCouponSendController.java Datei anzeigen

@@ -81,7 +81,7 @@ public class WxCouponSendController extends BaseController {
return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL); return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL);
} }


Object cUserId = params.get("cUserId") ;
String cUserId = (String) params.get("cUserId");


if (!params.containsKey("wxCouponSendIds")) { if (!params.containsKey("wxCouponSendIds")) {
return new ResultData(ErrorCode.COUPON_IS_EMPTY); return new ResultData(ErrorCode.COUPON_IS_EMPTY);
@@ -98,12 +98,12 @@ public class WxCouponSendController extends BaseController {
wxCouponSend.setSendType(EnumCouponSendSendType.MERCHANT.getCode()); wxCouponSend.setSendType(EnumCouponSendSendType.MERCHANT.getCode());
wxCouponSend.setStatus(EnumCouponSendStatus.VALID.getCode()); wxCouponSend.setStatus(EnumCouponSendStatus.VALID.getCode());
try { try {
wxCouponSendService.handSel(wxCouponSend, cUserId);
wxCouponSendService.handSel(wxCouponSend, Long.parseLong(cUserId));
} catch (MallinkException e) { } catch (MallinkException e) {
logger.error("注券异常: " + e.getMessage());
logger.error("注券异常: ", e);
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);
return new ResultData(ErrorCode.COUPON_HANDSEL_VERIFY, e.getMessage()); return new ResultData(ErrorCode.COUPON_HANDSEL_VERIFY, e.getMessage());
} }
return new ResultData(); return new ResultData();


+ 1
- 1
mallinkService/src/main/java/com/iformall/service/WxCouponSendService.java Datei anzeigen

@@ -97,7 +97,7 @@ public interface WxCouponSendService {
* *
* @param wxCouponSend * @param wxCouponSend
*/ */
void handSel(WxCouponSend wxCouponSend,Object cUserId) ;
void handSel(WxCouponSend wxCouponSend,Long cUserId) ;




} }

+ 2
- 3
mallinkService/src/main/java/com/iformall/service/impl/WxCouponSendServiceImpl.java Datei anzeigen

@@ -599,11 +599,10 @@ public class WxCouponSendServiceImpl implements WxCouponSendService {
} }
} }



@Override @Override
@Transactional(propagation = Propagation.REQUIRED, readOnly = false, rollbackFor = {Exception.class}) @Transactional(propagation = Propagation.REQUIRED, readOnly = false, rollbackFor = {Exception.class})
public void handSel(WxCouponSend wxCouponSend, Object cUserId) {
WxCUser cu = wxCUserMapper.selectById((Long)cUserId);
public void handSel(WxCouponSend wxCouponSend, Long cUserId) {
WxCUser cu = wxCUserMapper.selectById(cUserId);
if (Objects.isNull(cu)) { if (Objects.isNull(cu)) {
throw new MallinkException(ErrorCode.USER_NOT_AUTH_PHONE); throw new MallinkException(ErrorCode.USER_NOT_AUTH_PHONE);
} }


Laden…
Abbrechen
Speichern