Przeglądaj źródła

update

release_toaliyun_real
xiaohanzi 5 lat temu
rodzic
commit
964ee948cd
3 zmienionych plików z 11 dodań i 4 usunięć
  1. +8
    -1
      mallinkCApi/src/main/java/com/iformall/controller/WxPayOrderController.java
  2. +2
    -2
      mallinkService/src/main/java/com/iformall/service/WxPayOrderService.java
  3. +1
    -1
      mallinkService/src/main/java/com/iformall/service/impl/WxPayOrderServiceImpl.java

+ 8
- 1
mallinkCApi/src/main/java/com/iformall/controller/WxPayOrderController.java Wyświetl plik

@@ -78,7 +78,14 @@ public class WxPayOrderController extends BaseController {
}

WxCUser user = getUser();
WxCUserBasicInfo wxCUserBasicInfo = wxCUserBasicInfoService.getById(user.getId());
if(!user.isBasicInfo()) {
return new ResultData(ErrorCode.USER_IS_NOT_MEMBER);
}
WxCUserBasicInfo wxCUserBasicInfo = wxCUserBasicInfoService.getById(user.getUserId());
if ( null == wxCUserBasicInfo) {
logger.error("会员用户不存在."+user.getUserId());
return new ResultData(ErrorCode.USER_IS_EMPTY.getCode(),"会员用户不存在."+user.getUserId());
}
if (null != wxCUserBasicInfo && EnumCreditLockedStatus.CLOSE.getCode().equals(wxCUserBasicInfo.getStatus())) {
return new ResultData(ErrorCode.MEMBER_IS_LOCKED);
}


+ 2
- 2
mallinkService/src/main/java/com/iformall/service/WxPayOrderService.java Wyświetl plik

@@ -6,7 +6,7 @@ import com.github.pagehelper.PageInfo;
import com.iformall.common.IdWorker;
import com.iformall.common.ResultData;
import com.iformall.domain.po.WxAppinfo;
import com.iformall.domain.po.WxCUser;
import com.iformall.domain.po.WxCUserBasicInfo;
import com.iformall.domain.po.WxCoupon;
import com.iformall.domain.po.WxMerchantBUser;
import com.iformall.domain.po.WxOrder;
@@ -27,7 +27,7 @@ public interface WxPayOrderService {
* @param payWay
* @return
*/
ResultData createPayOrder(WxAppinfo appInfo, WxCUser user, WxPayOrder record, EnumPayWay payWay);
ResultData createPayOrder(WxAppinfo appInfo, WxCUserBasicInfo user, WxPayOrder record, EnumPayWay payWay);

/**
* 刷卡支付订单


+ 1
- 1
mallinkService/src/main/java/com/iformall/service/impl/WxPayOrderServiceImpl.java Wyświetl plik

@@ -218,7 +218,7 @@ public class WxPayOrderServiceImpl implements WxPayOrderService {
@Override
public ResultData createPayOrder(WxAppinfo appInfo, WxCUser user, WxPayOrder record, EnumPayWay payWay) {
public ResultData createPayOrder(WxAppinfo appInfo, WxCUserBasicInfo user, WxPayOrder record, EnumPayWay payWay) {
IdWorker idworker = IdWorker.get();

EnumPayShare isShare = EnumPayShare.NO;


Ładowanie…
Anuluj
Zapisz