8.11 货运模块添加冗余地址,完善一级市场商户的发货地址信息

sp-core/sp-api/src/main/java/com/pj/api/client/level_one_server/LevelOneServerInterface.java

@@ -23,7 +23,7 @@ import java.util.List;
 public interface LevelOneServerInterface {
 
     /** 远程调用  修改订单的叫车状态 */
-    @RequestMapping("/app/TbEnterprise/rpc/updateOrderCallCarStatus")
+    @RequestMapping("/app/TbOrder/rpc/updateOrderCallCarStatus")
     public boolean updateOrderCallCarStatus(@RequestBody OrderDto orderDto);
 
     /** 根据ID获取一级市场商户信息 */

sp-service/level-two-server/src/main/java/com/pj/tb_purchaser/TbPurchaserService.java

@@ -79,14 +79,14 @@ public class TbPurchaserService extends ServiceImpl<TbPurchaserMapper, TbPurchas
 
 		//手机号去重
 		String idCard = purchaser.getIdCard();
-		if(tbPurchaserMapper.selectList(new LambdaQueryWrapper<TbPurchaser>().eq(TbPurchaser::getIdCard,idCard).eq(TbPurchaser::getDeleteStatus,1)).size() != 0)
+		if(tbPurchaserMapper.selectList(new LambdaQueryWrapper<TbPurchaser>().eq(TbPurchaser::getIdCard,idCard).eq(TbPurchaser::getDeleteStatus,DeleteStatus.DELETE_STATUS_ON.getCode())).size() != 0)
 			throw new RuntimeException("当前手机号已被认证!");
 		//身份证号去重
 		String contact = purchaser.getContact();
-		if(tbPurchaserMapper.selectList(new LambdaQueryWrapper<TbPurchaser>().eq(TbPurchaser::getContact,contact).eq(TbPurchaser::getDeleteStatus,1)).size() != 0)
+		if(tbPurchaserMapper.selectList(new LambdaQueryWrapper<TbPurchaser>().eq(TbPurchaser::getContact,contact).eq(TbPurchaser::getDeleteStatus,DeleteStatus.DELETE_STATUS_ON.getCode())).size() != 0)
 			throw new RuntimeException("当前身份证号已被认证!");
 
-		//是否需要手机发送验证码认证?
+		//todo:是否需要手机发送验证码认证?
 
 		//开始保存收购商信息
 		//注册/认证时间

sp-service/level-two-server/src/main/java/com/pj/tb_purchaser_address/PurchaserAddressAppController.java

@@ -63,7 +63,7 @@ public class PurchaserAddressAppController {
      *
      * @return
      */
-    @RequestMapping("getList")
+    @RequestMapping("getAppList")
     public AjaxJson getList() {
         SoMap so = SoMap.getRequestSoMap();
         so.put("userId", StpAPPUserUtil.getAPPLoginInfo().getLoginId());

sp-service/sp-admin/src/main/java/com/pj/project/app_user/AppUserService.java

@@ -15,6 +15,7 @@ import com.pj.current.dto.APPLoginUserInfo;
 import com.pj.current.satoken.StpAPPUserUtil;
 import com.pj.current.satoken.StpUserUtil;
 import com.pj.enummj.DeleteStatus;
+import com.pj.enummj.IsLock;
 import com.pj.project.app_user.dto.ForgetPasswordDto;
 import com.pj.project.app_user.dto.RegisterDto;
 import com.pj.project.re_role_menu.ReRoleMenu;
@@ -228,7 +229,7 @@ public class AppUserService extends ServiceImpl<AppUserMapper, AppUser> implemen
 		List<AppUser> appUserList = appUserMapper.selectList
 				  (new LambdaQueryWrapper<AppUser>().eq(AppUser::getPhone, forgetPasswordDto.getPhone())
 													.eq(AppUser::getDeleteStatus, DeleteStatus.DELETE_STATUS_ON.getCode())
-													.eq(AppUser::getStatus, 1));
+													.eq(AppUser::getStatus, IsLock.IS_LOCK_ON.getCode()));
 		//判断其手机号码可能存在的异常情况
 		if(appUserList.size() > 1)
 			return AjaxJson.getError("当前账户存在异常,请联系客服进行处理!");

sp-service/transport-server/src/main/java/com/pj/project/tb_driver/TbDriverService.java

@@ -113,7 +113,7 @@ public class TbDriverService extends ServiceImpl<TbDriverMapper, TbDriver> imple
 			OrderDto orderDto = levelOneServerInterface.getOrderDtoById(failDriverResultParam.getLevelOneOrderId());
 			orderDto.setCallCarStatus(0); // 修改成未叫车状态
 			boolean b = levelOneServerInterface.updateOrderCallCarStatus(orderDto);
-			if(!b)throw new ServiceException("一级市场订单表状态异常!");
+			if(!b)throw new RuntimeException("一级市场订单表状态异常!");
 			//todo:司机拒绝,发送通知短信给收购商
 //		smsRetryService.sendSmsMsg(failDriverResultParam.getEnterprisePhone());
 		}

sp-service/transport-server/src/main/java/com/pj/project/tb_favorite_contacts/AppFavoriteContactsController.java

@@ -0,0 +1,79 @@
+package com.pj.project.tb_favorite_contacts;
+
+import com.pj.project.tb_favorite_contacts.param.FavoriteContactsParam;
+import com.pj.project4sp.SP;
+import com.pj.utils.sg.AjaxJson;
+import com.pj.utils.so.SoMap;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+
+/**
+ * Controller: tb_favorite_contacts -- 常用联系人
+ * @author lbl
+ */
+@RestController
+@RequestMapping("/app/TbFavoriteContacts/")
+public class AppFavoriteContactsController {
+
+	/** 底层 Service 对象 */
+	@Autowired
+	TbFavoriteContactsService tbFavoriteContactsService;
+
+	/** 增 */
+	@RequestMapping("appAdd")
+	public AjaxJson appAdd(@RequestBody FavoriteContactsParam  t){
+		tbFavoriteContactsService.appAdd(t);
+		return AjaxJson.getSuccess();
+	}
+
+	/** 删 */
+	@RequestMapping("delete")
+	public AjaxJson delete(Long id){
+		 tbFavoriteContactsService.delete(id);
+		return AjaxJson.getSuccess();
+	}
+
+	/** 删 - 根据id列表 */
+	@RequestMapping("deleteByIds")
+	public AjaxJson deleteByIds(){
+		List<Long> ids = SoMap.getRequestSoMap().getListByComma("ids", long.class);
+		int line = SP.publicMapper.deleteByIds(TbFavoriteContacts.TABLE_NAME, ids);
+		return AjaxJson.getByLine(line);
+	}
+
+	/** 改 */
+	@RequestMapping("update")
+	public AjaxJson update(TbFavoriteContacts t){
+		tbFavoriteContactsService.update(t);
+		return AjaxJson.getSuccess();
+	}
+
+	/** 查 - 根据id */
+	@RequestMapping("getById")
+	public AjaxJson getById(Long id){
+		TbFavoriteContacts t = tbFavoriteContactsService.getById(id);
+		return AjaxJson.getSuccessData(t);
+	}
+
+	/** 查集合 - 查询当前登录人的收货地址 */
+	@RequestMapping("getAppList")
+	public AjaxJson getAppList() {
+		SoMap so = SoMap.getRequestSoMap();
+		List<TbFavoriteContacts> list = tbFavoriteContactsService.getAppList(so.startPage());
+		return AjaxJson.getPageData(so.getDataCount(), list);
+	}
+
+
+
+
+
+
+
+
+
+}

sp-service/transport-server/src/main/java/com/pj/project/tb_favorite_contacts/TbFavoriteContacts.java

@@ -4,6 +4,7 @@ import java.io.Serializable;
 import java.util.*;
 import com.baomidou.mybatisplus.annotation.*;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.EqualsAndHashCode;
 
 import lombok.Data;
@@ -74,7 +75,7 @@ public class TbFavoriteContacts extends Model<TbFavoriteContacts> implements Ser
 	/**
 	 * 创建者id
 	 */
-	private String createBy;
+	private Long createBy;
 
 	/**
 	 * 创建者名称
@@ -84,6 +85,7 @@ public class TbFavoriteContacts extends Model<TbFavoriteContacts> implements Ser
 	/**
 	 * 更新时间
 	 */
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
 	private Date updateTime;
 
 	/**
@@ -99,7 +101,7 @@ public class TbFavoriteContacts extends Model<TbFavoriteContacts> implements Ser
 	/**
 	 * 删除状态
 	 */
-	private String deleteStatus;
+	private Integer deleteStatus;
 
 
 

sp-service/transport-server/src/main/java/com/pj/project/tb_favorite_contacts/TbFavoriteContactsService.java

@@ -1,7 +1,14 @@
 package com.pj.project.tb_favorite_contacts;
 
+import java.util.Date;
 import java.util.List;
+
+import com.pj.current.dto.APPLoginUserInfo;
+import com.pj.current.satoken.StpAPPUserUtil;
+import com.pj.enummj.DeleteStatus;
+import com.pj.project.tb_favorite_contacts.param.FavoriteContactsParam;
 import com.pj.utils.so.SoMap;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.extension.service.IService;
@@ -26,6 +33,23 @@ public class TbFavoriteContactsService extends ServiceImpl<TbFavoriteContactsMap
 		save(t);
 	}
 
+	/** 增 */
+	void appAdd(FavoriteContactsParam favoriteContactsParam){
+		//获取当前登陆人
+		APPLoginUserInfo appLoginInfo = StpAPPUserUtil.getAPPLoginInfo();
+		if(appLoginInfo == null || appLoginInfo.getLoginId() == null)
+			throw new SecurityException("当前登录账号信息已失效!");
+		TbFavoriteContacts t = new TbFavoriteContacts();
+		BeanUtils.copyProperties(favoriteContactsParam,t);
+		t.setFkAppUser(appLoginInfo.getFk());
+		//设置公共字段
+		t.setCreateTime(new Date());
+		t.setCreateName(appLoginInfo.getLoginName());
+		t.setCreateBy(appLoginInfo.getLoginId());
+		t.setDeleteStatus(DeleteStatus.DELETE_STATUS_ON.getCode());
+		save(t);
+	}
+
 	/** 删 */
 	void delete(Long id){
 		removeById(id);
@@ -46,6 +70,17 @@ public class TbFavoriteContactsService extends ServiceImpl<TbFavoriteContactsMap
 	List<TbFavoriteContacts> getList(SoMap so) {
 		return tbFavoriteContactsMapper.getList(so);
 	}
+	/** 查集合 - 查询自己的装货地址 */
+	List<TbFavoriteContacts> getAppList(SoMap so) {
+		//获取当前登录人
+		APPLoginUserInfo appLoginInfo = StpAPPUserUtil.getAPPLoginInfo();
+		if(appLoginInfo == null || appLoginInfo.getLoginId() == null)
+			throw new SecurityException("当前登录账号信息已失效!");
+		//创建查询条件
+		so.put("fkAppUser",appLoginInfo.getFk());
+		so.put("deleteStatus", DeleteStatus.DELETE_STATUS_ON.getCode());
+		return tbFavoriteContactsMapper.getList(so);
+	}
 
 
 }

sp-service/transport-server/src/main/java/com/pj/project/tb_favorite_contacts/param/FavoriteContactsParam.java

@@ -0,0 +1,29 @@
+package com.pj.project.tb_favorite_contacts.param;
+
+import lombok.Data;
+
+/**
+ * @Author Mechrevo
+ * @Date 2023 08 11 16 23
+ **/
+@Data
+public class FavoriteContactsParam {
+
+    /**
+     * 姓名
+     */
+    private String name;
+
+    /**
+     * 手机号
+     */
+    private String phone;
+
+    /**
+     * 联系地址
+     */
+    private String address;
+
+
+
+}

sp-service/transport-server/src/main/java/com/pj/project/tb_vehicle/MethodVehicleService.java

@@ -60,6 +60,7 @@ public class MethodVehicleService {
         boolean carStatus = levelOneServerInterface.updateOrderCallCarStatus(orderDtoById);
         if(!carStatus)throw new ServiceException("叫车状态修改异常!");
         //赋值基本信息
+        carRecord.setLoadingAddress(makeCarRecordParam.getLoadingAddress());  // 装货地址
         carRecord.setVehicleType(tbVehicle.getVehicleType()); // 车辆类型
         carRecord.setVehicleModel(tbVehicle.getVehicleModel());  // 车辆品牌型号
         carRecord.setGoodsName(goodsTransitById.getGoodsName()); //过审商品名称

sp-service/transport-server/src/main/java/com/pj/project/tb_vehicle/param/MakeCarRecordParam.java

@@ -2,6 +2,7 @@ package com.pj.project.tb_vehicle.param;
 
 import lombok.Data;
 
+import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
 
 /**
@@ -50,6 +51,12 @@ public class MakeCarRecordParam {
     private Long vehicleId;
 
     /**
+     * 装货地址
+     */
+    @NotBlank(message = "loadingAddress,装货地址不能为空!")
+    private String loadingAddress;
+
+    /**
      * 商户备注
      */
     private String remark;