| @@ -16,6 +16,7 @@ import com.iformall.domain.dto.OrderSaveDto; | |||||
| import com.iformall.domain.dto.PlatPushOrderSaveDto; | import com.iformall.domain.dto.PlatPushOrderSaveDto; | ||||
| import com.iformall.domain.po.*; | import com.iformall.domain.po.*; | ||||
| import com.iformall.domain.po.base.BaseEntity; | import com.iformall.domain.po.base.BaseEntity; | ||||
| import com.iformall.domain.po.base.TenantEntity; | |||||
| import com.iformall.domain.po.tt.TtCUser; | import com.iformall.domain.po.tt.TtCUser; | ||||
| import com.iformall.domain.vo.WxCouponCVo; | import com.iformall.domain.vo.WxCouponCVo; | ||||
| import com.iformall.domain.vo.WxOrderCouponPressVo; | import com.iformall.domain.vo.WxOrderCouponPressVo; | ||||
| @@ -209,9 +210,11 @@ public class WxOrderController extends BaseController { | |||||
| map.put("err_tips","未找到支付配置"); | map.put("err_tips","未找到支付配置"); | ||||
| return map; | return map; | ||||
| } | } | ||||
| TenantEntity tenantEntity = new TenantEntity(); | |||||
| tenantEntity.updateTenantInfo(appinfo); | |||||
| //验证用户 | //验证用户 | ||||
| Long memberId = null; | Long memberId = null; | ||||
| TtCUser cuser = (TtCUser) cuserFactory.getCUserService(EnumAppPlat.TOUTIAO).getByOpenId(open_id, appinfo.getTenantId()); | |||||
| TtCUser cuser = (TtCUser) cuserFactory.getCUserService(EnumAppPlat.TOUTIAO).getByOpenId(open_id, tenantEntity.getTenantId()); | |||||
| if(cuser != null && cuser.getUserId() != null){ | if(cuser != null && cuser.getUserId() != null){ | ||||
| memberId = cuser.getUserId(); | memberId = cuser.getUserId(); | ||||
| } | } | ||||
| @@ -239,7 +242,7 @@ public class WxOrderController extends BaseController { | |||||
| list.add(dto); | list.add(dto); | ||||
| } | } | ||||
| ResultData resultData = wxOrderService.platPushSaveOrder(false, EnumComposeOrder.ONE_NUMBER_ORDER_BATCH, allExtParam.toString(), list, memberId, EnumPayWay.PAY_WAY_TT, getTenantInfo()); | |||||
| ResultData resultData = wxOrderService.platPushSaveOrder(false, EnumComposeOrder.ONE_NUMBER_ORDER_BATCH, allExtParam.toString(), list, memberId, EnumPayWay.PAY_WAY_TT, tenantEntity); | |||||
| if(resultData.code == 200){ | if(resultData.code == 200){ | ||||
| WxComposeOrder order = (WxComposeOrder) resultData.data; | WxComposeOrder order = (WxComposeOrder) resultData.data; | ||||
| Map<String, Object> data = new HashMap<>(); | Map<String, Object> data = new HashMap<>(); | ||||