添加是否允许用户自定义充值金额字段
This commit is contained in:
@@ -125,8 +125,7 @@ public class LoginContoller {
|
||||
// try{
|
||||
// String data = WxMaCryptUtils.decrypt(sessionKey, encryptedData, ivStr);
|
||||
// if (ObjectUtil.isNotEmpty(data) && JSONObject.parseObject(data).containsKey("phoneNumber")) {
|
||||
// phone =JSONObject.parseObject(data).get("phoneNumber").toString();
|
||||
// }
|
||||
// }// phone =JSONObject.parseObject(data).get("phoneNumber").toString();
|
||||
// }catch (Exception e){
|
||||
// log.info("登录传参:获取手机号失败{}",e.getMessage());
|
||||
// }
|
||||
|
||||
@@ -102,6 +102,7 @@ public class UserContoller {
|
||||
shopUser.setAmount(BigDecimal.ZERO);
|
||||
}
|
||||
if (tbShopInfo != null) {
|
||||
shopUser.setIsUser(tbShopInfo.getIsCustom());
|
||||
shopUser.setShopName(tbShopInfo.getShopName());
|
||||
}else {
|
||||
shopUser.setShopName("");
|
||||
|
||||
@@ -111,6 +111,8 @@ public class TbShopInfo implements Serializable {
|
||||
private String cities;
|
||||
private String districts;
|
||||
|
||||
private String isCustom;
|
||||
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
}
|
||||
@@ -1,5 +1,7 @@
|
||||
package com.chaozhanggui.system.cashierservice.entity;
|
||||
|
||||
import org.springframework.data.annotation.Transient;
|
||||
|
||||
import java.io.Serializable;
|
||||
import java.math.BigDecimal;
|
||||
|
||||
@@ -65,6 +67,14 @@ public class TbShopUser implements Serializable {
|
||||
private String miniOpenId;
|
||||
private String shopName;
|
||||
|
||||
@Transient
|
||||
private String isUser;
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
public String getId() {
|
||||
@@ -307,4 +317,12 @@ public class TbShopUser implements Serializable {
|
||||
public void setMiniOpenId(String miniOpenId) {
|
||||
this.miniOpenId = miniOpenId == null ? null : miniOpenId.trim();
|
||||
}
|
||||
|
||||
public String getIsUser() {
|
||||
return isUser;
|
||||
}
|
||||
|
||||
public void setIsUser(String isUser) {
|
||||
this.isUser = isUser;
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user