diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxMapController.java b/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxMapController.java index b6636b055..117b7ae13 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxMapController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxMapController.java @@ -90,10 +90,10 @@ public class WxMapController extends BaseController { Map resultMap = new HashMap<>(); Map merchantByShop = wxMerchantService.findMerchantByShop(shopId); if(merchantByShop != null && merchantByShop.get("id") != null){ - String tenantId = merchantByShop.get("tenantId").toString(); + String tenantId = merchantByShop.get("tenant_id").toString(); String parentTenantId = ""; - if(merchantByShop.get("parentTenantId") != null){ - parentTenantId = merchantByShop.get("parentTenantId").toString(); + if(merchantByShop.get("parent_tenant_id") != null){ + parentTenantId = merchantByShop.get("parent_tenant_id").toString(); } Long mercherId = Long.parseLong(merchantByShop.get("id").toString()); diff --git a/mallinkCallback/src/main/java/com/iformall/controller/callback/JinMaoController.java b/mallinkCallback/src/main/java/com/iformall/controller/callback/JinMaoController.java index 2afaa224c..81b586025 100644 --- a/mallinkCallback/src/main/java/com/iformall/controller/callback/JinMaoController.java +++ b/mallinkCallback/src/main/java/com/iformall/controller/callback/JinMaoController.java @@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; import com.iformall.controller.base.BaseController; import com.iformall.domain.po.*; +import com.iformall.domain.po.base.TenantEntity; import com.iformall.exception.MallinkException; import com.iformall.service.*; import com.iformall.service.pay.alipay.AliPayUtil; @@ -68,6 +69,16 @@ public class JinMaoController extends BaseController { public void dfhUser(@RequestBody Map param) throws IOException { logger.info("dfh user:"+param); + String phone = param.get("phone")==null?"":param.get("phone").toString(); + String userName = param.get("user_name")==null?"":param.get("user_name").toString(); + + + TenantEntity tenantEntity = new TenantEntity(); + tenantEntity.setTenantId("1035"); + + + WxCUserBasicInfo basicInfo = new WxCUserBasicInfo(); + } /** @@ -88,6 +99,9 @@ public class JinMaoController extends BaseController { @RequestMapping(value = "/dfh/order") public void dfhOrder(@RequestBody Map param) throws Exception { logger.info("dfh order:"+param); + TenantEntity tenantEntity = new TenantEntity(); + tenantEntity.setTenantId("1035"); + } }