8.7 下单

sp-core/sp-base/src/main/java/com/pj/current/dto/APPLoginUserInfo.java

@@ -13,4 +13,6 @@ public class APPLoginUserInfo implements Serializable {
     private String loginName;
     private Long fk;
     private Integer userType;
+    private Long groupId;
+    private String groupName;
 }

sp-core/sp-base/src/main/java/com/pj/enummj/ApplyStatus.java

@@ -0,0 +1,23 @@
+package com.pj.enummj;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+/**
+ * @Author Mechrevo
+ * @Date 2023 08 07 10 55
+ **/
+@Getter
+@AllArgsConstructor
+public enum ApplyStatus {
+
+    //申报[0=待申报,1=申报通过,2=申报不通过]
+
+    APPLY_STATUS_ZERO(0,"待申报"),
+    APPLY_STATUS_ONE(1,"申报通过"),
+    APPLY_STATUS_TWO(2,"申报不通过");
+
+    private Integer code;
+
+    private String msg;
+}

sp-service/level-one-server/src/main/java/com/pj/tb_goods_cart/TbGoodsCartService.java

@@ -140,6 +140,9 @@ public class TbGoodsCartService extends ServiceImpl<TbGoodsCartMapper, TbGoodsCa
 	/**
 	 * todo:采购支付,暂时预留
 	 */
+	
+
+
 
 
 }

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

@@ -131,7 +131,7 @@ public class MethodGoodsTransitService {
         tbOrder.setEnterpriseConfirm(EnterpriseConfirm.ENTERPRISE_CONFIRM_ZERO.getCode()); // 0为待商家确认
         tbOrder.setPeopleConfirm(EnterpriseConfirm.ENTERPRISE_CONFIRM_ZERO.getCode()); // 0为待边民确认
         tbOrder.setSend(DeliverStatus.DELIVER_STATUS_ZERO.getCode());  // 0为未发货 1为已发货
-        tbOrder.setTradeStatus(TradeStatus.TRADE_STATUS_ZERO.getCode().toString()); //支付状态默认是0,未支付
+        tbOrder.setTradeStatus(TradeStatus.TRADE_STATUS_ZERO.getCode()); //支付状态默认是0,未支付
         tbOrder.setResaleStatus(ResaleStatus.RESALE_STATUS_ZERO.getCode()); // 是否转售状态,默认未转售 0
         tbOrder.setFinishStatus(OrderStatus.ORDER_STATUS_ZERO.getCode());  // 订单完成状态,默认未完成 0
         //订单表基本字段

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

@@ -129,7 +129,7 @@ public class TbOrder extends Model<TbOrder> implements Serializable {
 	/**
 	 * 交易状态(0=未支付,1=已支付)
 	 */
-	private String tradeStatus;
+	private Integer tradeStatus;
 
 	/**
 	 * 支付方式(0=金融互助,1=现金刷卡)
@@ -209,7 +209,7 @@ public class TbOrder extends Model<TbOrder> implements Serializable {
 	/**
 	 * 是否申报
 	 */
-	private String apply;
+	private Integer apply;
 
 	/**
 	 * 申报时间
@@ -248,7 +248,8 @@ public class TbOrder extends Model<TbOrder> implements Serializable {
 	/**
 	 * 接单时间
 	 */
-	private String pickTime;
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss SSS")
+	private Date pickTime;
 
 	/**
 	 *

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

@@ -1,5 +1,7 @@
 package com.pj.tb_order;
 
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import com.pj.project4sp.SP;
 import com.pj.utils.sg.AjaxJson;
 import com.pj.utils.so.SoMap;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -21,6 +23,16 @@ public class TbOrderAppController {
 	@Autowired
 	TbOrderService tbOrderService;
 
+
+	/** 增 */
+	@RequestMapping("appAdd")
+//	@SaCheckPermission(TbOrder.PERMISSION_CODE_ADD)
+	public AjaxJson add(TbOrder t){
+		tbOrderService.appAdd(t);
+		t = tbOrderService.getById(SP.publicMapper.getPrimarykey());
+		return AjaxJson.getSuccessData(t);
+	}
+
 	/** 查 - 根据id */
 	@RequestMapping("getById")
 //		@SaCheckPermission(TbOrder.PERMISSION_CODE)

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

@@ -22,15 +22,15 @@ public class TbOrderController {
 	/** 底层 Service 对象 */
 	@Autowired
 	TbOrderService tbOrderService;
-
-	/** 增 */  
-	@RequestMapping("add")
-	@SaCheckPermission(TbOrder.PERMISSION_CODE_ADD)
-	public AjaxJson add(TbOrder t){
-		tbOrderService.add(t);
-		t = tbOrderService.getById(SP.publicMapper.getPrimarykey());
-		return AjaxJson.getSuccessData(t);
-	}
+//
+//	/** 增 */
+//	@RequestMapping("add")
+//	@SaCheckPermission(TbOrder.PERMISSION_CODE_ADD)
+//	public AjaxJson add(TbOrder t){
+//		tbOrderService.add(t);
+//		t = tbOrderService.getById(SP.publicMapper.getPrimarykey());
+//		return AjaxJson.getSuccessData(t);
+//	}
 
 	/** 删 */  
 	@RequestMapping("delete")

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

@@ -1,12 +1,21 @@
 package com.pj.tb_order;
 
+import java.util.Date;
 import java.util.List;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.pj.common.core.exception.ServiceException;
 import com.pj.current.dto.APPLoginUserInfo;
 import com.pj.current.satoken.StpAPPUserUtil;
+import com.pj.enummj.ApplyStatus;
 import com.pj.enummj.DeleteStatus;
+import com.pj.enummj.TradeStatus;
+import com.pj.enummj.UserType;
+import com.pj.tb_group.TbGroup;
+import com.pj.tb_group.TbGroupMapper;
+import com.pj.tb_people.TbPeople;
+import com.pj.tb_people.TbPeopleMapper;
 import com.pj.utils.so.SoMap;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -26,11 +35,47 @@ public class TbOrderService extends ServiceImpl<TbOrderMapper, TbOrder> implemen
 	@Autowired
 	TbOrderMapper tbOrderMapper;
 
+	/** 互市组 */
+	@Autowired
+	private TbPeopleMapper tbPeopleMapper;
+
 	@Autowired
 	private MethodOrderService methodOrderService;
 
-	/** 增 */
-	void add(TbOrder t){
+	/**  app端: 生成一级市场订单 */
+	void appAdd(TbOrder t){
+		//获取当前登陆人
+		APPLoginUserInfo appLoginInfo = StpAPPUserUtil.getAPPLoginInfo();
+		if(appLoginInfo == null || appLoginInfo.getLoginId() == null)
+			throw new RuntimeException("当前登录账号信息已失效!");
+		//判断基本状态
+		Integer enterpriseConfirm = t.getEnterpriseConfirm(); //一级市场商户确认(0=待确认,1=是,2=否)
+		String buyUserType = t.getBuyUserType(); //购买用户类型只能是2
+		Integer peopleConfirm = t.getPeopleConfirm();//边民确认[0=待确认,1=全部确认,2=部分边民确认]
+		String pick = t.getPick(); //是否接单[0=待接单,1=已接单]
+
+		if(enterpriseConfirm != 1)throw new ServiceException("商户确认状态异常!");
+		if(!buyUserType.equals(UserType.USER_TYPE_GROUP_LEADER.getCode() + ""))throw new ServiceException("登录用户身份异常!");
+		if(peopleConfirm != 1)throw new ServiceException("边民确认状态异常");
+		if(!pick.equals("1"))throw new ServiceException("接单状态状态异常");
+
+		//设置购买的互市组信息
+		Long fk = appLoginInfo.getFk();
+		TbPeople tbPeople = tbPeopleMapper.selectById(fk);
+		if(tbPeople == null)throw new ServiceException("边民信息异常!");
+		t.setGroupId(tbPeople.getGroupId());
+
+		//设置基本属性
+		t.setApply(ApplyStatus.APPLY_STATUS_ZERO.getCode()); // 申报状态
+		t.setTradeStatus(TradeStatus.TRADE_STATUS_ZERO.getCode()); //支付状态
+		t.setPickTime(new Date()); // 接单时间
+		t.setSend(0); // 发货状态 默认 0=未发货
+		t.setFinishStatus(0); // 完成状态 默认 0=未完成
+		//设置公共属性
+		t.setCreateBy(appLoginInfo.getLoginId());
+		t.setCreateName(appLoginInfo.getLoginName());
+		t.setCreateTime(new Date());
+		t.setDeleteStatus(DeleteStatus.DELETE_STATUS_ON.getCode());
 		save(t);
 	}