diff --git a/mallinkService/src/main/java/com/iformall/mapper/TtCUserMapper.java b/mallinkService/src/main/java/com/iformall/mapper/TtCUserMapper.java index f7177f0f1..9fc9df53b 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/TtCUserMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/TtCUserMapper.java @@ -19,7 +19,7 @@ public interface TtCUserMapper extends CommonMapper { TtCUser findByToken(@Param("token")String token,@Param("tenantId")String tenantId); - TtCUser selectById(@Param("id")Long id,@Param("tenantId")String tenantId); + TtCUser getById(@Param("id")Long id,@Param("tenantId")String tenantId); long findCount(WxCUserBasicInfoDto dto); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/TtCUserServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/TtCUserServiceImpl.java index b1d3d6c59..5bd5897f5 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/TtCUserServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/TtCUserServiceImpl.java @@ -64,7 +64,7 @@ public class TtCUserServiceImpl implements TtCUserService { @Override public TtCUser getById(Long id,String tenantId) { - return ttCUserMapper.selectById(id,tenantId); + return ttCUserMapper.getById(id,tenantId); } @Override diff --git a/mallinkService/src/main/resources/mapper/TtCUserMapper.xml b/mallinkService/src/main/resources/mapper/TtCUserMapper.xml index 2bc3c2e2b..eb3753e57 100644 --- a/mallinkService/src/main/resources/mapper/TtCUserMapper.xml +++ b/mallinkService/src/main/resources/mapper/TtCUserMapper.xml @@ -277,7 +277,7 @@ where `token` = #{token} and `tenant_id` = #{tenantId} - select from tt_c_user where id = #{id} and `tenant_id` = #{tenantId} diff --git a/mallinkTTCApi/src/main/java/com/iformall/controller/TtOrderCallbackController.java b/mallinkTTCApi/src/main/java/com/iformall/callback/TtOrderCallbackController.java similarity index 92% rename from mallinkTTCApi/src/main/java/com/iformall/controller/TtOrderCallbackController.java rename to mallinkTTCApi/src/main/java/com/iformall/callback/TtOrderCallbackController.java index f77fef182..bce3e8092 100644 --- a/mallinkTTCApi/src/main/java/com/iformall/controller/TtOrderCallbackController.java +++ b/mallinkTTCApi/src/main/java/com/iformall/callback/TtOrderCallbackController.java @@ -1,6 +1,7 @@ -package com.iformall.controller; +package com.iformall.callback; import com.alibaba.fastjson.JSONObject; +import com.iformall.controller.BaseController; import com.iformall.domain.po.WxAppinfo; import com.iformall.domain.po.WxPayAccount; import com.iformall.douyin.pay.DouYinPayHelper; @@ -8,11 +9,13 @@ import com.iformall.interceptor.BodyReaderHttpServletRequestWrapper; import com.iformall.service.WxAppinfoService; import com.iformall.service.WxPayAccountService; import com.iformall.service.tt.TtOrderService; -import com.iformall.utils.sign.SignUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; +import org.springframework.web.bind.annotation.RestController; import javax.servlet.http.HttpServletRequest; import java.util.HashMap;