Browse Source

tt

release_toaliyun_real
xhxu 5 years ago
parent
commit
801f2f9120
4 changed files with 9 additions and 6 deletions
  1. +1
    -1
      mallinkService/src/main/java/com/iformall/mapper/TtCUserMapper.java
  2. +1
    -1
      mallinkService/src/main/java/com/iformall/service/impl/TtCUserServiceImpl.java
  3. +1
    -1
      mallinkService/src/main/resources/mapper/TtCUserMapper.xml
  4. +6
    -3
      mallinkTTCApi/src/main/java/com/iformall/callback/TtOrderCallbackController.java

+ 1
- 1
mallinkService/src/main/java/com/iformall/mapper/TtCUserMapper.java View File

@@ -19,7 +19,7 @@ public interface TtCUserMapper extends CommonMapper<TtCUser, Long> {

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);



+ 1
- 1
mallinkService/src/main/java/com/iformall/service/impl/TtCUserServiceImpl.java View File

@@ -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


+ 1
- 1
mallinkService/src/main/resources/mapper/TtCUserMapper.xml View File

@@ -277,7 +277,7 @@
where `token` = #{token} and `tenant_id` = #{tenantId}
</select>
<select id="selectById" parameterType="java.util.HashMap" resultMap="BaseResultMap">
<select id="getById" parameterType="java.util.HashMap" resultMap="BaseResultMap">
select <include refid="allColumns"/> from tt_c_user where id = #{id} and `tenant_id` = #{tenantId}
</select>



mallinkTTCApi/src/main/java/com/iformall/controller/TtOrderCallbackController.java → mallinkTTCApi/src/main/java/com/iformall/callback/TtOrderCallbackController.java View File

@@ -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;

Loading…
Cancel
Save