Commit 18f41bcf by Java-聂换换

修改用户

parent 4bb63613
...@@ -31,6 +31,11 @@ public class OrderApiController { ...@@ -31,6 +31,11 @@ public class OrderApiController {
@Autowired @Autowired
private DictService dictService; private DictService dictService;
/**
* 获取订单列表
* @param request
* @return
*/
@PostMapping("/getOrderList") @PostMapping("/getOrderList")
public Response getOrderList(OrderRequest request){ public Response getOrderList(OrderRequest request){
Response res = new Response(); Response res = new Response();
...@@ -56,6 +61,10 @@ public class OrderApiController { ...@@ -56,6 +61,10 @@ public class OrderApiController {
} }
/**
* 获取支付方式
* @return
*/
@PostMapping("/getPayMethod") @PostMapping("/getPayMethod")
public Response getPayMethod(){ public Response getPayMethod(){
Response response = new Response(); Response response = new Response();
......
...@@ -54,6 +54,11 @@ public class PayApiController { ...@@ -54,6 +54,11 @@ public class PayApiController {
} }
/**
* 回调
* @param request
* @param response
*/
@RequestMapping("/notifyPay") @RequestMapping("/notifyPay")
public void notifyPay(HttpServletRequest request, HttpServletResponse response) { public void notifyPay(HttpServletRequest request, HttpServletResponse response) {
System.out.println("。。。。。。回调。。。。。"); System.out.println("。。。。。。回调。。。。。");
......
...@@ -4,6 +4,8 @@ import com.thinkgem.jeesite.common.baseBean.Response; ...@@ -4,6 +4,8 @@ import com.thinkgem.jeesite.common.baseBean.Response;
import com.thinkgem.jeesite.common.constant.ComCode; import com.thinkgem.jeesite.common.constant.ComCode;
import com.thinkgem.jeesite.common.utils.StringUtils; import com.thinkgem.jeesite.common.utils.StringUtils;
import com.thinkgem.jeesite.modules.commonError.MyException; import com.thinkgem.jeesite.modules.commonError.MyException;
import com.thinkgem.jeesite.modules.img.bean.ImgRequest;
import com.thinkgem.jeesite.modules.sys.entity.User;
import com.thinkgem.jeesite.modules.user.bean.IdentityCodeRequest; import com.thinkgem.jeesite.modules.user.bean.IdentityCodeRequest;
import com.thinkgem.jeesite.modules.user.bean.UserRequest; import com.thinkgem.jeesite.modules.user.bean.UserRequest;
import com.thinkgem.jeesite.modules.user.entity.IdentityCodeEntity; import com.thinkgem.jeesite.modules.user.entity.IdentityCodeEntity;
...@@ -520,4 +522,30 @@ public class UserApiController { ...@@ -520,4 +522,30 @@ public class UserApiController {
return resp; return resp;
} }
/**
* 修改用户信息
*
* @param request
* @return
*/
@PostMapping("/modifyUser")
public Response modifyUser(UserRequest request){
Response resp = new Response();
if(request == null || StringUtils.isBlank(request.getSubMerchantCode())){
resp.setStatus(ComCode.STATUS_CODE_4001);
resp.setMessage(ComCode.STATUS_CODE_4001_DESC);
return resp;
}
try {
userService.updateUser(request);
resp.setStatus(ComCode.STATUS_CODE_2000);
resp.setMessage(ComCode.STATUS_CODE_2000_DESC);
}catch (Exception e){
resp.setStatus(ComCode.STATUS_CODE_9998);
resp.setMessage(ComCode.STATUS_CODE_9998_DESC);
resp.setError(e.getMessage());
}
return resp;
}
} }
...@@ -33,6 +33,12 @@ public class UserRequest extends Request { ...@@ -33,6 +33,12 @@ public class UserRequest extends Request {
private String pid; // 父级id private String pid; // 父级id
private String debitCardCode; // 结算卡code private String debitCardCode; // 结算卡code
private String avatar;
private String nickname;
public String getMobile() { public String getMobile() {
return mobile; return mobile;
} }
...@@ -248,4 +254,20 @@ public class UserRequest extends Request { ...@@ -248,4 +254,20 @@ public class UserRequest extends Request {
public void setDebitCardCode(String debitCardCode) { public void setDebitCardCode(String debitCardCode) {
this.debitCardCode = debitCardCode; this.debitCardCode = debitCardCode;
} }
public String getAvatar() {
return avatar;
}
public void setAvatar(String avatar) {
this.avatar = avatar;
}
public String getNickname() {
return nickname;
}
public void setNickname(String nickname) {
this.nickname = nickname;
}
} }
...@@ -53,6 +53,8 @@ public interface UserApiDao { ...@@ -53,6 +53,8 @@ public interface UserApiDao {
void updateUserInfo(UserEntity userEntity); void updateUserInfo(UserEntity userEntity);
void updateUser(UserRequest userRequest);
RateEntity getRateByLevel(RateEntity rateEntityParam); RateEntity getRateByLevel(RateEntity rateEntityParam);
List<UserEntity> getUserInfoBySameRecommend(UserEntity queryUserRecommendEntity); List<UserEntity> getUserInfoBySameRecommend(UserEntity queryUserRecommendEntity);
......
...@@ -353,4 +353,14 @@ public class UserApiService { ...@@ -353,4 +353,14 @@ public class UserApiService {
public CardEntity getDebitCardByUserCode(UserRequest request){ public CardEntity getDebitCardByUserCode(UserRequest request){
return userDao.getDebitCardByUserCode(request); return userDao.getDebitCardByUserCode(request);
} }
@Transactional(readOnly = false)
public void updateUser(UserRequest request){
if(StringUtils.isNotBlank(request.getAvatar())){
request.setAvatar(StringUtils.replace(request.getAvatar(),Global.getConfig("image.save.url"),""));
}
userDao.updateUser(request);
}
} }
...@@ -399,7 +399,20 @@ ...@@ -399,7 +399,20 @@
</if> </if>
WHERE code = #{code} WHERE code = #{code}
</update> </update>
<update id="updateUser">
UPDATE youka_users
SET code = #{subMerchantCode}
<if test="avatar != null and avatar !=''">
, avatar = #{avatar}
</if>
<if test="mobile != null and mobile !=''">
, mobile = #{mobile}
</if>
<if test="nickname != null and nickname !=''">
, nickname = #{nickname}
</if>
WHERE code = #{subMerchantCode}
</update>
<select id="getRateByLevel" resultType="com.thinkgem.jeesite.modules.pay.entity.RateEntity"> <select id="getRateByLevel" resultType="com.thinkgem.jeesite.modules.pay.entity.RateEntity">
SELECT SELECT
yr.id, yr.id,
...@@ -528,6 +541,7 @@ ...@@ -528,6 +541,7 @@
code = #{debitCardCode} code = #{debitCardCode}
</update> </update>
<select id="getDebitCard" resultType="com.thinkgem.jeesite.modules.user.entity.CardEntity"> <select id="getDebitCard" resultType="com.thinkgem.jeesite.modules.user.entity.CardEntity">
SELECT SELECT
yc.id, yc.id,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment