Преглед на файлове

//b test

release_toaliyun_real
xhxu преди 3 години
родител
ревизия
4c67c1376a
променени са 4 файла, в които са добавени 26 реда и са изтрити 12 реда
  1. +15
    -10
      mallinkCApi/src/main/java/com/iformall/controller/WxOrderController.java
  2. +8
    -0
      mallinkCApi/src/main/java/com/iformall/interceptor/AuthorizationInterceptor.java
  3. +1
    -1
      mallinkService/src/main/java/com/iformall/service/WxOrderService.java
  4. +2
    -1
      mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java

+ 15
- 10
mallinkCApi/src/main/java/com/iformall/controller/WxOrderController.java Целия файл

@@ -61,6 +61,9 @@ import java.util.*;
public class WxOrderController extends BaseController { public class WxOrderController extends BaseController {
private final Logger logger = LoggerFactory.getLogger(this.getClass()); private final Logger logger = LoggerFactory.getLogger(this.getClass());


@Autowired
private WxMallService mallService;

@Autowired @Autowired
private WxCouponChannelService wxCouponChannelService; private WxCouponChannelService wxCouponChannelService;


@@ -207,9 +210,10 @@ public class WxOrderController extends BaseController {
map.put("err_tips","透传字段格式不正确"); map.put("err_tips","透传字段格式不正确");
return map; return map;
} }
WxMall mall = mallService.getByTenantId(tenantId);


//验证app
WxAppinfo appinfo = wxAppinfoService.getByAppIdFromRedis(app_id,tenantId);
//验证app todo 想想集团版多小程序和单小程序怎么处理
WxAppinfo appinfo = wxAppinfoService.getByAppIdFromRedis(app_id,mall.getFinalTenantId());
if(appinfo == null || !EnumAppPlat.TOUTIAO.getCode().equals(appinfo.getPlat()) if(appinfo == null || !EnumAppPlat.TOUTIAO.getCode().equals(appinfo.getPlat())
|| !EnumAppType.C.getCode().equals(appinfo.getType())){ || !EnumAppType.C.getCode().equals(appinfo.getType())){
map.put("err_no",ErrorCode.APP_ID_NOT_FOUND.getCode()); map.put("err_no",ErrorCode.APP_ID_NOT_FOUND.getCode());
@@ -223,10 +227,10 @@ public class WxOrderController extends BaseController {
return map; return map;
} }
TenantEntity tenantEntity = new TenantEntity(); TenantEntity tenantEntity = new TenantEntity();
tenantEntity.updateTenantInfo(appinfo);
tenantEntity.updateTenantInfo(mall);
//验证用户 //验证用户
Long memberId = null; Long memberId = null;
TtCUser cuser = (TtCUser) cuserFactory.getCUserService(EnumAppPlat.TOUTIAO).getByOpenId(open_id, tenantEntity.getTenantId());
TtCUser cuser = (TtCUser) cuserFactory.getCUserService(EnumAppPlat.TOUTIAO).getByOpenId(open_id, appinfo.getTenantId());
if(cuser != null && cuser.getUserId() != null){ if(cuser != null && cuser.getUserId() != null){
memberId = cuser.getUserId(); memberId = cuser.getUserId();
} }
@@ -253,7 +257,7 @@ public class WxOrderController extends BaseController {
Map<String, Object> data = new HashMap<>(); Map<String, Object> data = new HashMap<>();
data.put("out_order_no",order.getMainOrderId().toString()); data.put("out_order_no",order.getMainOrderId().toString());
data.put("pay_expire_seconds",14*60); data.put("pay_expire_seconds",14*60);
data.put("order_entry_schema",wxOrderService.getOrderEntrySchema(order.getMainOrderId()));
data.put("order_entry_schema",wxOrderService.getOrderEntrySchema(mall.getTenantId(),order.getMainOrderId()));
if(order.getExtParam() != null && !order.getExtParam().isEmpty()){ if(order.getExtParam() != null && !order.getExtParam().isEmpty()){
data.put("order_goods_info",order.getExtParam()); data.put("order_goods_info",order.getExtParam());
} }
@@ -756,9 +760,10 @@ public class WxOrderController extends BaseController {
String app_id = msgObject.getString("app_id"); String app_id = msgObject.getString("app_id");
String open_id = msgObject.getString("open_id"); String open_id = msgObject.getString("open_id");
String cp_extra = msgObject.getString("cp_extra"); String cp_extra = msgObject.getString("cp_extra");

String tenantId = getTenantId(cp_extra);
WxMall mall = mallService.getByTenantId(tenantId);
//验证app //验证app
WxAppinfo appinfo = wxAppinfoService.getByAppId(app_id,getTenantId(cp_extra));
WxAppinfo appinfo = wxAppinfoService.getByAppId(app_id);
if(appinfo == null || !EnumAppPlat.TOUTIAO.getCode().equals(appinfo.getPlat()) if(appinfo == null || !EnumAppPlat.TOUTIAO.getCode().equals(appinfo.getPlat())
|| !EnumAppType.C.getCode().equals(appinfo.getType())){ || !EnumAppType.C.getCode().equals(appinfo.getType())){
map.put("err_no",ErrorCode.APP_ID_NOT_FOUND.getCode()); map.put("err_no",ErrorCode.APP_ID_NOT_FOUND.getCode());
@@ -772,10 +777,10 @@ public class WxOrderController extends BaseController {
return map; return map;
} }
TenantEntity tenantEntity = new TenantEntity(); TenantEntity tenantEntity = new TenantEntity();
tenantEntity.updateTenantInfo(appinfo);
tenantEntity.updateTenantInfo(mall);
//验证用户 //验证用户
Long memberId = null; Long memberId = null;
TtCUser cuser = (TtCUser) cuserFactory.getCUserService(EnumAppPlat.TOUTIAO).getByOpenId(open_id, tenantEntity.getTenantId());
TtCUser cuser = (TtCUser) cuserFactory.getCUserService(EnumAppPlat.TOUTIAO).getByOpenId(open_id, appinfo.getTenantId());
if(cuser != null && cuser.getUserId() != null){ if(cuser != null && cuser.getUserId() != null){
memberId = cuser.getUserId(); memberId = cuser.getUserId();
} }
@@ -794,7 +799,7 @@ public class WxOrderController extends BaseController {
WxRefundOrder refundOrder = (WxRefundOrder) resultData.data; WxRefundOrder refundOrder = (WxRefundOrder) resultData.data;
Map<String, Object> data = new HashMap<>(); Map<String, Object> data = new HashMap<>();
data.put("out_refund_no",refundOrder.getId().toString()); data.put("out_refund_no",refundOrder.getId().toString());
data.put("order_entry_schema",wxOrderService.getOrderEntrySchema(Long.parseLong(refundOrder.getPayOrderNo())));
data.put("order_entry_schema",wxOrderService.getOrderEntrySchema(mall.getTenantId(),Long.parseLong(refundOrder.getPayOrderNo())));
map.put("data",data); map.put("data",data);
map.put("err_no",0); map.put("err_no",0);
map.put("err_tips",resultData.message); map.put("err_tips",resultData.message);


+ 8
- 0
mallinkCApi/src/main/java/com/iformall/interceptor/AuthorizationInterceptor.java Целия файл

@@ -1,6 +1,7 @@
package com.iformall.interceptor; package com.iformall.interceptor;




import com.alibaba.fastjson.JSONObject;
import com.iformall.annotation.AuthIgnore; import com.iformall.annotation.AuthIgnore;
import com.iformall.annotation.TenantIgnore; import com.iformall.annotation.TenantIgnore;
import com.iformall.common.ErrorCode; import com.iformall.common.ErrorCode;
@@ -75,6 +76,13 @@ public class AuthorizationInterceptor extends HandlerInterceptorAdapter {
if(StringUtils.isBlank(mallTenantId)){ if(StringUtils.isBlank(mallTenantId)){
mallTenantId = request.getParameter("mallTenantId"); mallTenantId = request.getParameter("mallTenantId");
} }
if(StringUtils.isBlank(mallTenantId)){
try{
String body = ((BodyReaderHttpServletRequestWrapper) request).getBody();
mallTenantId = JSONObject.parseObject(body).getString("mallTenantId");
}catch(Exception e){}
}

String tenantId = null; String tenantId = null;
String parenTenantId = null; String parenTenantId = null;
//设置userId到request里,后续根据userId,获取用户信息 //设置userId到request里,后续根据userId,获取用户信息


+ 1
- 1
mallinkService/src/main/java/com/iformall/service/WxOrderService.java Целия файл

@@ -265,7 +265,7 @@ public interface WxOrderService {


WxBatchOrder getWxBatchOrder(TenantEntity tenantInfo, Long orderId); WxBatchOrder getWxBatchOrder(TenantEntity tenantInfo, Long orderId);


Map<String,String> getOrderEntrySchema(Long mainOrderId);
Map<String,String> getOrderEntrySchema(String tenantId,Long mainOrderId);


int updateCpsStatus(WxOrder order); int updateCpsStatus(WxOrder order);




+ 2
- 1
mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java Целия файл

@@ -3588,11 +3588,12 @@ public class WxOrderServiceImpl implements WxOrderService {
} }


@Override @Override
public Map<String,String> getOrderEntrySchema(Long mainOrderId) {
public Map<String,String> getOrderEntrySchema(String tenantId,Long mainOrderId) {
Map<String,String> map = new HashMap<>(); Map<String,String> map = new HashMap<>();
map.put("path", Constant.mainPageUrl); map.put("path", Constant.mainPageUrl);
Map<String,Object> paramMap = new HashMap<>(); Map<String,Object> paramMap = new HashMap<>();
paramMap.put("type","dt"); paramMap.put("type","dt");
paramMap.put("tenantId",tenantId);
paramMap.put("orderId",mainOrderId); paramMap.put("orderId",mainOrderId);
map.put("params", JSON.toJSONString(paramMap)); map.put("params", JSON.toJSONString(paramMap));
return map; return map;


Зареждане…
Отказ
Запис