diff --git a/mallinkCApi/src/main/java/com/iformall/controller/UserBasicInfoAddressController.java b/mallinkCApi/src/main/java/com/iformall/controller/UserBasicInfoAddressController.java index 6f826d0ca..06d41aa89 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/UserBasicInfoAddressController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/UserBasicInfoAddressController.java @@ -86,7 +86,7 @@ public class UserBasicInfoAddressController extends BaseController { return new ResultData(); } - @ApiOperation("消息模板-删除") + @ApiOperation("删除") @GetMapping("/del") @ApiImplicitParam(name = "id", value = "id", dataType = "String", paramType = "query", required = true) public ResultData delete(Long id) { @@ -98,10 +98,10 @@ public class UserBasicInfoAddressController extends BaseController { userBasicInfoAddress.setId(id); userBasicInfoAddress.undateFinalTenantId(getTenantInfo()); userBasicInfoAddressService.deleteById(userBasicInfoAddress); - return new ResultData(Result.SUCCESS, "删除成功", null); + return new ResultData(); } - @ApiOperation("消息模板-查询") + @ApiOperation("查询") @GetMapping("/findById") @ApiImplicitParam(name = "id", value = "id", dataType = "String", paramType = "query", required = true) public ResultData findById(Long id) { @@ -112,8 +112,8 @@ public class UserBasicInfoAddressController extends BaseController { UserBasicInfoAddress userBasicInfoAddress = new UserBasicInfoAddress(); userBasicInfoAddress.setId(id); userBasicInfoAddress.undateFinalTenantId(getTenantInfo()); - userBasicInfoAddressService.findById(userBasicInfoAddress); - return new ResultData(Result.SUCCESS, "查询成功", null); + UserBasicInfoAddress userAddress = userBasicInfoAddressService.findById(userBasicInfoAddress); + return new ResultData(userAddress); } } \ No newline at end of file diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxCouponPasswordController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxCouponPasswordController.java index f166f044a..c4a304fff 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxCouponPasswordController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxCouponPasswordController.java @@ -103,7 +103,7 @@ public class WxCouponPasswordController extends BaseController { return new ResultData(e.getErrorCode(), e.getMessage()); } catch (Exception e) { setCouponPasswordStatus(couponPassword, EnumCouponPasswordStatus.getEnum(pwdStatus)); - logger.error(e.getMessage()); + logger.error(e.getMessage(),e); return new ResultData(500, e.getMessage()); } return new ResultData(); diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxQuestionOneselfController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxQuestionOneselfController.java index 195fd60b0..d68762b36 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxQuestionOneselfController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxQuestionOneselfController.java @@ -2,6 +2,7 @@ package com.iformall.controller; import com.github.pagehelper.PageInfo; import com.iformall.common.ErrorCode; +import com.iformall.common.Result; import com.iformall.common.ResultData; import com.iformall.domain.po.WxCUserBasicInfo; import com.iformall.domain.po.WxQuestionOneself; @@ -79,11 +80,17 @@ public class WxQuestionOneselfController extends BaseController { public ResultData detailsById(Long id) { logger.debug("[" + getIpAddr() + "] WxQuestionOneselfController::detailsById"); Map map = new HashMap(); + Long memberId; + try { + memberId = getMemberId(); + } catch (Exception e) { + return new ResultData(Result.ERROR,e.getMessage()); + } WxQuestionOneself wxQuestionOneself = wxQuestionOneselfService.detailsById(id); if(wxQuestionOneself != null){ WxQuestionOneselfUser userQ = new WxQuestionOneselfUser(); userQ.updateTenantInfo(getTenantInfo()); - userQ.setUserId(getMemberId()); + userQ.setUserId(memberId); userQ.setQuestionId(wxQuestionOneself.getId()); wxQuestionOneself.setUserStatus(wxQuestionOneselfUserService.countQuestion(userQ)); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxGameServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxGameServiceImpl.java index 1c11d0284..a76985657 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxGameServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxGameServiceImpl.java @@ -23,6 +23,7 @@ import com.iformall.mapper.WxCouponOrderMapper; import com.iformall.mapper.WxGameActionLogMapper; import com.iformall.mapper.WxGameMapper; import com.iformall.service.*; +import com.iformall.service.order.entity.WxComposeOrder; import com.iformall.utils.Constant; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -461,11 +462,11 @@ public class WxGameServiceImpl implements WxGameService { orderSave.add(ocsd); ResultData resultData1 = wxOrderService.composeSaveOrder(EnumComposeOrder.SINGLE,orderSave, userId, EnumPayWay.PAY_WAY_WECHAT, wxGame); - if(resultData1.code == Result.SUCCESS && resultData1.data != null && resultData1.data instanceof WxOrder){ - WxOrder order = (WxOrder)resultData1.data; - orderId = order.getId(); + if(resultData1.code == Result.SUCCESS && resultData1.data != null && resultData1.data instanceof WxComposeOrder){ + WxComposeOrder order = (WxComposeOrder)resultData1.data; + orderId = order.getMainOrderId(); }else{ - logger.info("userId:"+userId+",中奖了发卷失败,"+resultData1.toString()); + logger.info("userId:"+userId+",中奖了发卷失败,"+resultData1.code+"{}"+resultData1.message); resultData.data = null; } }else if(data instanceof JSONObject){