收获地址添加联系电话

common/common-entity/src/main/java/com/yihu/jw/entity/hospital/prescription/WlyyPatientExpressageAddrDO.java

@@ -1,6 +1,9 @@
package com.yihu.jw.entity.hospital.prescription;
import com.yihu.jw.entity.UuidIdentityEntity;
import com.yihu.jw.entity.UuidIdentityEntityWithOperator;
import org.springframework.data.annotation.CreatedDate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
@@ -8,185 +11,247 @@ import java.util.Date;
/**
* 居民收获地址实体
*
* @author Administrator on  2019年06月12日
*
*/
 * 居民收获地址实体
 *
 * @author Administrator on  2019年06月12日
 */
@Entity
@Table(name = "wlyy_patient_expressage_addr")
public class WlyyPatientExpressageAddrDO extends UuidIdentityEntityWithOperator {
public class WlyyPatientExpressageAddrDO extends UuidIdentityEntity {
    /**
     * 居民标识
     */
    private String patient;
    /**
     * 省编码
     */
    private String provinceCode;
    /**
	 * 居民标识
	 */
	private String patient;
     * 省名称
     */
    private String provinceName;
    /**
	 * 省编码
	 */
	private String provinceCode;
     * 市编码
     */
    private String cityCode;
    /**
	 * 省名称
	 */
	private String provinceName;
     * 城市名称
     */
    private String cityName;
    /**
	 * 市编码
	 */
	private String cityCode;
     * 区县编码
     */
    private String townCode;
    /**
	 * 城市名称
	 */
	private String cityName;
     * 区县名称
     */
    private String townName;
    /**
	 * 区县编码
	 */
	private String townCode;
     * 街道编码
     */
    private String streetCode;
    /**
	 * 区县名称
	 */
	private String townName;
     * 街道名称
     */
    private String streetName;
    /**
	 * 街道编码
	 */
	private String streetCode;
     * 居住居委会代码
     */
    private String committeeCode;
    /**
	 * 街道名称
	 */
	private String streetName;
     * 居住居委会名称
     */
    private String committeeName;
    /**
	 * 居住居委会代码
	 */
	private String committeeCode;
     * 具体详细地址
     */
    private String address;
    /**
	 * 居住居委会名称
	 */
	private String committeeName;
     * 收货人姓名
     */
    private String name;
    /**
	 * 具体详细地址
	 */
	private String address;
     * 收货人手机号
     */
    private String mobile;
    /**
	 * 作废标识，1正常，0作废
	 */
	private String del;
     * 作废标识，1正常，0作废
     */
    private String del;
    /**
     * 是否是默认地址，1是，0不是，一个用户只能有一个默认地址
     */
    private Integer isDefault;
    //创建时间
    @CreatedDate
    protected Date createTime;
	@Column(name = "patient")
    @Column(name = "patient")
    public String getPatient() {
        return patient;
    }
    public void setPatient(String patient) {
        this.patient = patient;
    }
	@Column(name = "province_code")
    @Column(name = "province_code")
    public String getProvinceCode() {
        return provinceCode;
    }
    public void setProvinceCode(String provinceCode) {
        this.provinceCode = provinceCode;
    }
	@Column(name = "province_name")
    @Column(name = "province_name")
    public String getProvinceName() {
        return provinceName;
    }
    public void setProvinceName(String provinceName) {
        this.provinceName = provinceName;
    }
	@Column(name = "city_code")
    @Column(name = "city_code")
    public String getCityCode() {
        return cityCode;
    }
    public void setCityCode(String cityCode) {
        this.cityCode = cityCode;
    }
	@Column(name = "city_name")
    @Column(name = "city_name")
    public String getCityName() {
        return cityName;
    }
    public void setCityName(String cityName) {
        this.cityName = cityName;
    }
	@Column(name = "town_code")
    @Column(name = "town_code")
    public String getTownCode() {
        return townCode;
    }
    public void setTownCode(String townCode) {
        this.townCode = townCode;
    }
	@Column(name = "town_name")
    @Column(name = "town_name")
    public String getTownName() {
        return townName;
    }
    public void setTownName(String townName) {
        this.townName = townName;
    }
	@Column(name = "street_code")
    @Column(name = "street_code")
    public String getStreetCode() {
        return streetCode;
    }
    public void setStreetCode(String streetCode) {
        this.streetCode = streetCode;
    }
	@Column(name = "street_name")
    @Column(name = "street_name")
    public String getStreetName() {
        return streetName;
    }
    public void setStreetName(String streetName) {
        this.streetName = streetName;
    }
	@Column(name = "committee_code")
    @Column(name = "committee_code")
    public String getCommitteeCode() {
        return committeeCode;
    }
    public void setCommitteeCode(String committeeCode) {
        this.committeeCode = committeeCode;
    }
	@Column(name = "committee_name")
    @Column(name = "committee_name")
    public String getCommitteeName() {
        return committeeName;
    }
    public void setCommitteeName(String committeeName) {
        this.committeeName = committeeName;
    }
	@Column(name = "address")
    @Column(name = "address")
    public String getAddress() {
        return address;
    }
    public void setAddress(String address) {
        this.address = address;
    }
	@Column(name = "del")
    @Column(name = "del")
    public String getDel() {
        return del;
    }
    public void setDel(String del) {
        this.del = del;
    }
    @Column(name = "isdefault")
    public Integer getIsDefault() {
        return isDefault;
    }
    public void setIsDefault(Integer isDefault) {
        this.isDefault = isDefault;
    }
    public String getName() {
        return name;
    }
    public void setName(String name) {
        this.name = name;
    }
    public String getMobile() {
        return mobile;
    }
    public void setMobile(String mobile) {
        this.mobile = mobile;
    }
    public Date getCreateTime() {
        return createTime;
    }
    public void setCreateTime(Date createTime) {
        this.createTime = createTime;
    }
}

common/common-request-mapping/src/main/java/com/yihu/jw/rm/hospital/BaseHospitalRequestMapping.java

@@ -195,6 +195,8 @@ public class BaseHospitalRequestMapping {
     */
    public static class WlyyPatientExpressageAddr extends Basic {
        public static final String PREFIX  = "/expressageAddr";
        public static final String setDefault  = "/setDefault";
        public static final String hasDefault  = "/hasDefault";
    }
}

common/common-rest-model/src/main/java/com/yihu/jw/restmodel/hospital/prescription/WlyyPatientExpressageAddrVO.java

@@ -100,6 +100,12 @@ public class WlyyPatientExpressageAddrVO extends UuidIdentityVOWithOperator {
	@ApiModelProperty(value = "作废标识，1正常，0作废", example = "模块1")
    private String del;
    /**
     * 是否是默认地址，1是，0不是，一个用户只能有一个默认地址
     */
    @ApiModelProperty(value = "默认地址标识，1是，0不是", example = "模块1")
    private Integer isDefault;
    public String getPatient() {
        return patient;
@@ -192,5 +198,11 @@ public class WlyyPatientExpressageAddrVO extends UuidIdentityVOWithOperator {
        this.del = del;
    }
    public Integer getIsDefault() {
        return isDefault;
    }
    public void setIsDefault(Integer isDefault) {
        this.isDefault = isDefault;
    }
}

svr/svr-internet-hospital-entrance/src/main/java/com/yihu/jw/entrance/controller/expressage/WlyyPatientExpressageAddrEndpoint.java

@@ -59,6 +59,27 @@ public class WlyyPatientExpressageAddrEndpoint extends EnvelopRestEndpoint {
        return success("删除成功");
    }
    @PostMapping(value = BaseHospitalRequestMapping.WlyyPatientExpressageAddr.setDefault)
    @ApiOperation(value = "将地址设置为默认")
    public Envelop setAddrDefault(
            @ApiParam(name = "patient", value = "居民code", required = true) @RequestParam(value = "patient") String patient,
            @ApiParam(name = "addrId", value = "当前地址id", required = true) @RequestParam(value = "addrId") String addrId) {
        StringBuilder error = new StringBuilder();
        wlyyPatientExpressageAddrService.setAddrDefault(patient,addrId,error);
        if(!StringUtils.isEmpty(error.toString())){
            return failed("设置默认地址失败：" + error.toString());
        }
        return success("设置默认地址成功");
    }
    @PostMapping(value = BaseHospitalRequestMapping.WlyyPatientExpressageAddr.hasDefault)
    @ApiOperation(value = "判断当前居民是否已经存在默认地址")
    public Envelop setAddrDefault(
            @ApiParam(name = "patient", value = "居民code", required = true) @RequestParam(value = "patient") String patient) {
        boolean result = wlyyPatientExpressageAddrService.hasDefault(patient);
        return success(result);
    }
    @PostMapping(value = BaseHospitalRequestMapping.WlyyPatientExpressageAddr.UPDATE)
    @ApiOperation(value = "更新")
    public ObjEnvelop<WlyyPatientExpressageAddrVO> update(

svr/svr-internet-hospital-entrance/src/main/java/com/yihu/jw/entrance/dao/WlyyPatientExpressageAddrDao.java

@@ -18,4 +18,6 @@ import com.yihu.jw.entity.hospital.prescription.WlyyPatientExpressageAddrDO;
 * @since 1.
 */
public interface WlyyPatientExpressageAddrDao extends PagingAndSortingRepository<WlyyPatientExpressageAddrDO, String>, JpaSpecificationExecutor<WlyyPatientExpressageAddrDO>  {
    boolean existsByPatientAndIsDefault(String patient,Integer isDefault);
}

svr/svr-internet-hospital-entrance/src/main/java/com/yihu/jw/entrance/service/WlyyPatientExpressageAddrService.java

@@ -3,8 +3,16 @@ package com.yihu.jw.entrance.service;
import com.yihu.jw.entrance.dao.WlyyPatientExpressageAddrDao;
import com.yihu.jw.utils.EntityUtils;
import com.yihu.mysql.query.BaseJpaService;
import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.yihu.jw.entity.hospital.prescription.WlyyPatientExpressageAddrDO;
import org.springframework.transaction.annotation.Transactional;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
/**
 * 居民收获地址服务service
@@ -19,8 +27,14 @@ import com.yihu.jw.entity.hospital.prescription.WlyyPatientExpressageAddrDO;
@Service
public class WlyyPatientExpressageAddrService extends BaseJpaService<WlyyPatientExpressageAddrDO, WlyyPatientExpressageAddrDao> {
    Logger logger = LoggerFactory.getLogger(WlyyPatientExpressageAddrService.class);
    @Autowired
    private WlyyPatientExpressageAddrDao patientExpressageAddrDao;
    /**
     * 新增居民收货地址
     *
     * @param jsonData
     * @param error
     * @return
@@ -28,12 +42,48 @@ public class WlyyPatientExpressageAddrService extends BaseJpaService<WlyyPatient
    public WlyyPatientExpressageAddrDO createAddr(String jsonData, StringBuilder error) {
        WlyyPatientExpressageAddrDO addrDO = null;
        try {
            addrDO = EntityUtils.jsonToEntity(jsonData,WlyyPatientExpressageAddrDO.class);
            addrDO = EntityUtils.jsonToEntity(jsonData, WlyyPatientExpressageAddrDO.class);
        } catch (Exception e) {
            error.append(e.getMessage());
            return null;
        }
      /*  StringBuilder sb = new StringBuilder();
        String address = addrDO.getAddress();
        if(address.contains(addrDO.getProvinceName())){
            sb.append(address.substring(addrDO.getProvinceName().length(),address.length() - 1));
        }
        if(address.contains(addrDO.getProvinceName().toUpperCase() )){
            sb.append(address.substring(addrDO.getProvinceName().length(),address.length() - 1));
        }*/
        this.save(addrDO);
        return addrDO;
    }
     public boolean hasDefault(String patient){
        if(StringUtils.isEmpty(patient)){
            return true;
        }
        return patientExpressageAddrDao.existsByPatientAndIsDefault(patient,1);
     }
    /**
     * 将地址设置为默认地址
     * @param id
     * @return
     */
    @Transactional(rollbackFor = Exception.class)
    public void setAddrDefault(String patient,String id,StringBuilder error){
        if(hasDefault(patient)){
            error.append("当前居民已存在默认地址！");
            return ;
        }
        WlyyPatientExpressageAddrDO addrDO = patientExpressageAddrDao.findOne(id);
        if(null == addrDO){
            error.append("当前地址不存在！");
            return ;
        }
        addrDO.setIsDefault(1);
        this.save(addrDO);
    }
}