Просмотр исходного кода

Merge branch 'release_real_20211001' of https://git.malls.iformall.com/server/formallProject into release_real_20211001

release_toaliyun_real
xiaohanzi 4 лет назад
Родитель
Сommit
4ff2d2f18c
4 измененных файлов: 19 добавлений и 11 удалений
  1. +5
    -5
      mallinkCApi/src/main/java/com/iformall/controller/UserBasicInfoAddressController.java
  2. +1
    -1
      mallinkCApi/src/main/java/com/iformall/controller/WxCouponPasswordController.java
  3. +8
    -1
      mallinkCApi/src/main/java/com/iformall/controller/WxQuestionOneselfController.java
  4. +5
    -4
      mallinkService/src/main/java/com/iformall/service/impl/WxGameServiceImpl.java

+ 5
- 5
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);
}

}

+ 1
- 1
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();


+ 8
- 1
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<String,Object> 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));



+ 5
- 4
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){


Загрузка…
Отмена
Сохранить