app转售功能修改

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

@@ -74,4 +74,7 @@ public interface LevelOneServerInterface {
 
     @RequestMapping("/app/TbCooperative/rpc/getCooperativeById")
     public CooperativeDto getCooperativeById(@RequestParam("id")Long cooperativeId);
+
+    @RequestMapping("/app/TbOrder/rpc/updateResaleStatus")
+    public boolean updateResaleStatus(@RequestParam("id") Long orderId);
 }

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

@@ -118,6 +118,11 @@ public class LevelOneServerInterfaceFallback implements FallbackFactory<LevelOne
                 log.error("查询一级市场商户错误,当前ID:{},错误信息是:{}",cooperativeId,throwable.getMessage());
                 return null;
             }
+
+            @Override
+            public boolean updateResaleStatus(Long orderId) {
+                return false;
+            }
         };
     }
 }

sp-core/sp-api/src/main/java/com/pj/api/dto/OrderDto.java

@@ -238,9 +238,18 @@ public class OrderDto {
     private String distribution;
 
     /**
-     * 一级市场边民确认(0=待确认,1=是,2=否)[j]
+     * 一级市场边民确认状态(0=待确认,1=是)
      */
-    private Integer peopleConfirm;
+    private Integer peopleConfirmStatus;
+    /**
+     * 一级市场边民确认类型(1=刷脸,2=指纹)
+     */
+    private Integer peopleConfirmType;
+    /**
+     * 一级市场边民确认时间
+     */
+    private Date peopleConfirmTime;
+
     /**
      * 一级市场商户确认(0=待确认,1=是,2=否)[j]
      */
@@ -625,12 +634,28 @@ public class OrderDto {
         this.distribution = distribution;
     }
 
-    public Integer getPeopleConfirm() {
-        return peopleConfirm;
+    public Integer getPeopleConfirmStatus() {
+        return peopleConfirmStatus;
+    }
+
+    public void setPeopleConfirmStatus(Integer peopleConfirmStatus) {
+        this.peopleConfirmStatus = peopleConfirmStatus;
+    }
+
+    public Integer getPeopleConfirmType() {
+        return peopleConfirmType;
+    }
+
+    public void setPeopleConfirmType(Integer peopleConfirmType) {
+        this.peopleConfirmType = peopleConfirmType;
+    }
+
+    public Date getPeopleConfirmTime() {
+        return peopleConfirmTime;
     }
 
-    public void setPeopleConfirm(Integer peopleConfirm) {
-        this.peopleConfirm = peopleConfirm;
+    public void setPeopleConfirmTime(Date peopleConfirmTime) {
+        this.peopleConfirmTime = peopleConfirmTime;
     }
 
     public Integer getEnterpriseConfirm() {

sp-service/level-one-server/src/main/java/com/pj/tb_goods_transit/MethodGoodsTransitService.java

@@ -140,7 +140,7 @@ public class MethodGoodsTransitService {
         //设置下单时的默认状态
         tbOrder.setDeleteStatus(DeleteStatus.DELETE_STATUS_ON.getCode()); // 删除状态默认是1,可用
         tbOrder.setEnterpriseConfirm(ConfirmStatus.CONFIRM_STATUS_ZERO.getCode()); // 0为待商家确认
-        tbOrder.setPeopleConfirm(ConfirmStatus.CONFIRM_STATUS_ZERO.getCode()); // 0为待边民确认
+        tbOrder.setPeopleConfirmStatus(ConfirmStatus.CONFIRM_STATUS_ZERO.getCode()); // 0为待边民确认
         tbOrder.setSend(DeliverStatus.DELIVER_STATUS_ZERO.getCode());  // 0为未发货 1为已发货
         tbOrder.setTradeStatus(TradeStatus.TRADE_STATUS_ONE.getCode()); //支付状态默认是1,已支付
         tbOrder.setResaleStatus(ResaleStatus.RESALE_STATUS_ZERO.getCode()); // 是否转售状态,默认未转售 0

sp-service/level-one-server/src/main/java/com/pj/tb_order/TbOrder.java

@@ -238,9 +238,18 @@ public class TbOrder extends Model<TbOrder> implements Serializable {
 	private String distribution;
 
 	/**
-	 * 一级市场边民确认(0=待确认,1=是)[j]
+	 * 一级市场边民确认状态(0=待确认,1=是)
 	 */
-	private Integer peopleConfirm;
+	private Integer peopleConfirmStatus;
+	/**
+	 * 一级市场边民确认类型(1=刷脸,2=指纹)
+	 */
+	private Integer peopleConfirmType;
+	/**
+	 * 一级市场边民确认时间
+	 */
+	private Date peopleConfirmTime;
+
 	/**
 	 * 一级市场商户确认(0=待确认,1=是)[j]
 	 */

sp-service/level-one-server/src/main/java/com/pj/tb_order/TbOrderAppController.java

@@ -88,14 +88,6 @@ public class TbOrderAppController {
 	}
 
 
-	/** 改 转售状态：根据订单Id把订单改为已转售 */
-	@RequestMapping("updateResaleStatus")
-	public AjaxJson updateResaleStatus(Long orderId) {
-		boolean result = tbOrderService.updateResaleStatus(orderId);
-		if(result) return AjaxJson.getSuccess();
-		return AjaxJson.getError();
-	}
-
 	/**
 	 * 组长或者边民取消订单
 	 * @param orderId  一级市场订单ID
@@ -165,4 +157,10 @@ public class TbOrderAppController {
 	}
 
 
+	/** 改 转售状态：根据订单Id把订单改为已转售 */
+	@RequestMapping("rpc/updateResaleStatus")
+	public boolean updateResaleStatus(@RequestParam("id")Long orderId) {
+		return tbOrderService.updateResaleStatus(orderId);
+	}
+
 }

sp-service/level-one-server/src/main/java/com/pj/tb_order/TbOrderMapper.xml

@@ -81,6 +81,9 @@
 			<if test=' this.has("updateName") '> and update_name = #{updateName} </if>
 			<if test=' this.has("deleteStatus") '> and delete_status = #{deleteStatus} </if>
 			<if test=' this.has("enterpriseConfirm") '> and enterprise_confirm = #{enterpriseConfirm} </if>
+			<if test=' this.has("resaleStatus") '> and resale_status = #{resaleStatus} </if>
+			<if test=' this.has("peopleConfirmStatus") '> and people_confirm_status = #{peopleConfirmStatus} </if>
+			<if test=' this.has("peopleConfirmType") '> and people_confirm_type = #{peopleConfirmType} </if>
 		</where>
 		order by
 		<choose>

sp-service/level-one-server/src/main/java/com/pj/tb_order/TbOrderService.java

@@ -86,7 +86,7 @@ public class TbOrderService extends ServiceImpl<TbOrderMapper, TbOrder> implemen
 		//判断基本状态
 		Integer enterpriseConfirm = t.getEnterpriseConfirm(); //一级市场商户确认(0=待确认,1=是,2=否)
 		String buyUserType = t.getBuyUserType(); //购买用户类型只能是2
-		Integer peopleConfirm = t.getPeopleConfirm();//边民确认[0=待确认,1=全部确认,2=部分边民确认]
+		Integer peopleConfirm = t.getPeopleConfirmStatus();//边民确认[0=待确认,1=全部确认,2=部分边民确认]
 		String pick = t.getPick(); //是否接单[0=待接单,1=已接单]
 
 		if(enterpriseConfirm != 1)throw new ServiceException("商户确认状态异常!");

sp-service/level-one-server/src/main/java/com/pj/tb_people/TbPeopleService.java

@@ -311,7 +311,7 @@ public class TbPeopleService extends ServiceImpl<TbPeopleMapper, TbPeople> imple
 				//将订单得people_confirm修改成1 , 边民确认
 				TbOrder tbOrder = tbOrderMapper.selectById(orderId);
 				if(tbOrder == null)throw new RuntimeException("当前订单已被组长取消!");
-				tbOrder.setPeopleConfirm(1);
+				tbOrder.setPeopleConfirmStatus(ConfirmStatus.CONFIRM_STATUS_ONE.getCode());
 				int updateById = tbOrderMapper.updateById(tbOrder);
 				if(updateById != 1)throw new RuntimeException("执行边民确认异常!");
 				//todo:发送冻结请求 -> 接收冻结请求，边民账户货款进行冻结，并给出回执
@@ -335,7 +335,7 @@ public class TbPeopleService extends ServiceImpl<TbPeopleMapper, TbPeople> imple
 			throw new ServiceException("订单信息异常!");
 		//修改订单状态
 		tbOrder.setApplyTime(new Date()); // 申报时间
-		tbOrder.setPeopleConfirm(ConfirmStatus.CONFIRM_STATUS_ONE.getCode()); // 默认边民确认
+		tbOrder.setPeopleConfirmStatus(ConfirmStatus.CONFIRM_STATUS_ONE.getCode()); // 默认边民确认
 		tbOrder.setFinishStatus(OrderStatus.ORDER_STATUS_ONE.getCode()); // 订单状态已完成
 		int update = tbOrderMapper.updateById(tbOrder);
 		if(update == 1){

sp-service/level-two-server/src/main/java/com/pj/tb_orders/TbOrders.java

@@ -216,4 +216,8 @@ public class TbOrders extends Model<TbOrders> implements Serializable {
 	 */
 	private Integer isDelivery;
 
+	/**
+	 * 转售金额
+	 */
+	private Double resalePrice;
 }

sp-service/level-two-server/src/main/java/com/pj/tb_orders/TbOrdersApiController.java

@@ -36,7 +36,6 @@ public class TbOrdersApiController {
 
 	/** 删 */
 	@RequestMapping("delete")
-//	@SaCheckPermission(TbOrders.PERMISSION_CODE_DEL)
 	public AjaxJson delete(Long id){
 		 tbOrdersService.delete(id);
 		return AjaxJson.getSuccess();
@@ -44,7 +43,6 @@ public class TbOrdersApiController {
 
 	/** 删 - 根据id列表 */
 	@RequestMapping("deleteByIds")
-//	@SaCheckPermission(TbOrders.PERMISSION_CODE_DEL)
 	public AjaxJson deleteByIds(){
 		List<Long> ids = SoMap.getRequestSoMap().getListByComma("ids", long.class);
 		int line = SP.publicMapper.deleteByIds(TbOrders.TABLE_NAME, ids);
@@ -53,12 +51,18 @@ public class TbOrdersApiController {
 
 	/** 改 */
 	@RequestMapping("update")
-//	@SaCheckPermission(TbOrders.PERMISSION_CODE_EDIT)
 	public AjaxJson update(TbOrders t){
 		tbOrdersService.update(t);
 		return AjaxJson.getSuccess();
 	}
 
+	/** 查集合 - 根据条件（参数为空时代表忽略指定条件） */
+	@RequestMapping("getList")
+	public AjaxJson getList(@RequestParam(value = "orderFinish",required = false)Integer orderFinish) {
+		SoMap so = SoMap.getRequestSoMap();
+		List<TbOrders> list = tbOrdersService.getList(so);
+		return AjaxJson.getPageData(so.getDataCount(), list);
+	}
 
 	/** 二级市场订单 组长角色入口*/
 	@RequestMapping("getLeaderOrderList")
@@ -95,9 +99,7 @@ public class TbOrdersApiController {
 	/** 增 一级市场已完成订单进行转售时，新增二级市场订单 */
 	@RequestMapping("addOrderByResale")
 	public AjaxJson  addOrderByResale(TbOrdersDto ordersDto) {
-		tbOrdersService.addOrderByResale(ordersDto);
-		TbOrders orders = tbOrdersService.getById(SP.publicMapper.getPrimarykey());
-		return AjaxJson.getSuccessData(orders);
+		return AjaxJson.toAjax(tbOrdersService.addOrderByResale(ordersDto));
 	}
 
 	/** 查 根据订单Id查订单详情 */

sp-service/level-two-server/src/main/java/com/pj/tb_orders/TbOrdersController.java

@@ -25,7 +25,7 @@ public class TbOrdersController {
 
 	/** 增 */
 	@RequestMapping("add")
-//	@SaCheckPermission(TbOrders.PERMISSION_CODE_ADD)
+		@SaCheckPermission(TbOrders.PERMISSION_CODE_ADD)
 	public AjaxJson add(TbOrders t){
 		tbOrdersService.add(t);
 		t = tbOrdersService.getById(SP.publicMapper.getPrimarykey());
@@ -34,7 +34,7 @@ public class TbOrdersController {
 
 	/** 删 */
 	@RequestMapping("delete")
-//	@SaCheckPermission(TbOrders.PERMISSION_CODE_DEL)
+		@SaCheckPermission(TbOrders.PERMISSION_CODE_DEL)
 	public AjaxJson delete(Long id){
 		 tbOrdersService.delete(id);
 		return AjaxJson.getSuccess();
@@ -42,7 +42,7 @@ public class TbOrdersController {
 
 	/** 删 - 根据id列表 */
 	@RequestMapping("deleteByIds")
-//	@SaCheckPermission(TbOrders.PERMISSION_CODE_DEL)
+		@SaCheckPermission(TbOrders.PERMISSION_CODE_DEL)
 	public AjaxJson deleteByIds(){
 		List<Long> ids = SoMap.getRequestSoMap().getListByComma("ids", long.class);
 		int line = SP.publicMapper.deleteByIds(TbOrders.TABLE_NAME, ids);
@@ -51,7 +51,7 @@ public class TbOrdersController {
 
 	/** 改 */
 	@RequestMapping("update")
-//	@SaCheckPermission(TbOrders.PERMISSION_CODE_EDIT)
+		@SaCheckPermission(TbOrders.PERMISSION_CODE_EDIT)
 	public AjaxJson update(TbOrders t){
 		tbOrdersService.update(t);
 		return AjaxJson.getSuccess();
@@ -59,7 +59,7 @@ public class TbOrdersController {
 
 	/** 查 - 根据id */
 	@RequestMapping("getById")
-//		@SaCheckPermission(TbOrders.PERMISSION_CODE)
+		@SaCheckPermission(TbOrders.PERMISSION_CODE)
 	public AjaxJson getById(Long id){
 		TbOrders t = tbOrdersService.getById(id);
 		return AjaxJson.getSuccessData(t);
@@ -67,7 +67,7 @@ public class TbOrdersController {
 
 	/** 查集合 - 根据条件（参数为空时代表忽略指定条件） */
 	@RequestMapping("getList")
-//		@SaCheckPermission(TbOrders.PERMISSION_CODE)
+		@SaCheckPermission(TbOrders.PERMISSION_CODE)
 	public AjaxJson getList(@RequestParam(value = "ordersStatus",required = false)Integer ordersStatus) {
 		SoMap so = SoMap.getRequestSoMap();
 		List<TbOrders> list = tbOrdersService.getPCList(so.startPage(),ordersStatus);
@@ -78,7 +78,7 @@ public class TbOrdersController {
 
 	/** 改 - 订单完成状态 (0=未完成,1=已完成) */
 	@RequestMapping("updateOrderFinish")
-//	@SaCheckPermission(TbOrders.PERMISSION_CODE_EDIT)
+		@SaCheckPermission(TbOrders.PERMISSION_CODE_EDIT)
 	public AjaxJson updateOrderFinish(Long id, Integer value){
 		int line = SP.publicMapper.updateColumnById(TbOrders.TABLE_NAME, "order_finish", value, id);
 		return AjaxJson.getByLine(line);

sp-service/level-two-server/src/main/java/com/pj/tb_orders/TbOrdersDto.java

@@ -233,5 +233,8 @@ public class TbOrdersDto {
 	@JsonFormat(pattern = "yyyy-MM-dd")
 	private Date goodsDemandTime;
 
-
+	/**
+	 * 转售金额
+	 */
+	private Double resalePrice;
 }

sp-service/level-two-server/src/main/java/com/pj/tb_orders/TbOrdersService.java

@@ -15,6 +15,7 @@ import com.pj.current.dto.APPLoginUserInfo;
 import com.pj.current.satoken.StpAPPUserUtil;
 import com.pj.enummj.DeleteStatus;
 import com.pj.enummj.OrderStatus;
+import com.pj.tb_company.TbCompany;
 import com.pj.tb_demand_quotation.TbDemandQuotation;
 import com.pj.tb_demand_quotation.TbDemandQuotationService;
 import com.pj.tb_goods_demand.TbGoodsDemand;
@@ -89,6 +90,12 @@ public class TbOrdersService extends ServiceImpl<TbOrdersMapper, TbOrders> imple
 		soMap.put("sortType",22);  // 根据时间降序
 		return tbOrdersMapper.getList(soMap);
 	}
+	/**
+	 * 查集合 - 根据条件（参数为空时代表忽略指定条件）
+	 */
+	List<TbOrders> getList(SoMap so) {
+		return tbOrdersMapper.getList(so);
+	}
 
 	/**
 	 * 二级市场订单 组长角色入口
@@ -128,7 +135,7 @@ public class TbOrdersService extends ServiceImpl<TbOrdersMapper, TbOrders> imple
 	}
 
 	/** 增 一级市场已完成订单进行转售时，新增二级市场订单 */
-	void addOrderByResale(TbOrdersDto ordersDto) {
+	boolean addOrderByResale(TbOrdersDto ordersDto) {
 		//获取app登录用户
 		APPLoginUserInfo appLoginInfo = StpAPPUserUtil.getAPPLoginInfo();
 		if(appLoginInfo == null || appLoginInfo.getLoginId() == null)
@@ -151,6 +158,12 @@ public class TbOrdersService extends ServiceImpl<TbOrdersMapper, TbOrders> imple
 		orders.setCreateTime(new Date());
 
 		this.add(orders);
+
+		//修改一级市场边民订单转售状态为已转售
+		boolean b = levelOneServerInterface.updateResaleStatus(ordersDto.getLevelOneOrderId());
+		if(!b) throw new RuntimeException("修改一级市场边民订单转售状态为已转售失败！");
+
+		return true;
 	}
 
 	/** 增  二级市场订单*/