新增边民缴纳费项记录

sp-service/level-two-server/src/main/java/com/pj/tb_fee_item/TbFeeItem.java

@@ -43,7 +43,7 @@ public class TbFeeItem extends Model<TbFeeItem> implements Serializable {
 	/**
 	 * 主键 
 	 */
-	private String id;
+	private Long id;
 
 	/**
 	 * 企业ID 

sp-service/level-two-server/src/main/java/com/pj/tb_fee_item/TbFeeItemService.java

@@ -49,12 +49,22 @@ public class TbFeeItemService extends ServiceImpl<TbFeeItemMapper, TbFeeItem> im
 		return super.getById(id);
 	}
 
-	/** 查集合 - 根据条件（参数为空时代表忽略指定条件） */  
-	List<TbFeeItem> getList(SoMap so) { 
+	/** 查集合 - 根据条件（参数为空时代表忽略指定条件） */
+	public List<TbFeeItem> getList(SoMap so) {
 		return tbFeeItemMapper.getList(so);	
 	}
 
 	/**
+	 * 查询所有税费
+	 * @return
+	 */
+	public List<TbFeeItem> getFeeItems() {
+		SoMap so=new SoMap();
+		so.put("status",1);
+		return tbFeeItemMapper.getList(so);
+	}
+
+	/**
 	 * 根据收费公司查找
 	 * @param companyId
 	 * @return

sp-service/level-two-server/src/main/java/com/pj/tb_fee_item_record/TbFeeItemRecord.java

@@ -1,6 +1,8 @@
 package com.pj.tb_fee_item_record;
 
 import java.io.Serializable;
+import java.util.Date;
+
 import com.baomidou.mybatisplus.annotation.*;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
 import lombok.EqualsAndHashCode;
@@ -98,12 +100,12 @@ public class TbFeeItemRecord extends Model<TbFeeItemRecord> implements Serializa
 	/**
 	 * 创建时间 
 	 */
-	private String createTime;	
+	private Date createTime;
 
 	/**
 	 * 支付/划拨时间 
 	 */
-	private String payTime;	
+	private Date payTime;
 
 	/**
 	 * 支付/划拨状态(0=未划拨,1=划拨成功,2=划拨失败) 

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

@@ -1,13 +1,10 @@
 package com.pj.tb_orders;
 
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Date;
-import java.util.List;
-
 import cn.dev33.satoken.stp.StpUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.pj.api.client.admin.AdminInterface;
 import com.pj.api.client.async_server.AsyncServerInterface;
 import com.pj.api.client.level_one_server.LevelOneServerInterface;
@@ -21,11 +18,13 @@ import com.pj.current.satoken.StpAPPUserUtil;
 import com.pj.enummj.DataType;
 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_fee_item.TbFeeItem;
+import com.pj.tb_fee_item.TbFeeItemService;
+import com.pj.tb_fee_item_record.TbFeeItemRecord;
+import com.pj.tb_fee_item_record.TbFeeItemRecordService;
 import com.pj.tb_goods_demand.TbGoodsDemand;
-import com.pj.tb_goods_demand.TbGoodsDemandMapper;
 import com.pj.tb_goods_demand.TbGoodsDemandService;
 import com.pj.tb_goods_demand.vo.GoodsDemandVo;
 import com.pj.tb_orders_cart.TbOrdersCart;
@@ -36,10 +35,13 @@ 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;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Date;
+import java.util.List;
+
 /**
  * Service: tb_orders -- 订单表
  *
@@ -67,6 +69,12 @@ public class TbOrdersService extends ServiceImpl<TbOrdersMapper, TbOrders> imple
     @Autowired
     TbOrdersCartMapper tbOrdersCartMapper;
 
+    @Autowired
+    TbFeeItemService tbFeeItemService;
+
+    @Autowired
+    TbFeeItemRecordService tbFeeItemRecordService;
+
     /**
      * 远程调用
      */
@@ -159,6 +167,21 @@ public class TbOrdersService extends ServiceImpl<TbOrdersMapper, TbOrders> imple
         orders.setPayTaxTime(new Date());
         orders.setOrderFinish(1);//缴费成功订单完成
         if (updateById(orders)) {
+            //保存缴费记录
+            List<TbFeeItem> feeItems = tbFeeItemService.getFeeItems();
+            feeItems.stream().forEach(e -> {
+                TbFeeItemRecord record = new TbFeeItemRecord();
+                record.setItemId(e.getId());
+                record.setCompanyName(e.getCompanyName());
+                record.setItemName(e.getName());
+                record.setOrderNo(orders.getOrderNo());
+                record.setLevelTwoOrderId(orders.getId());
+                record.setPayTime(new Date());
+                record.setCreateTime(new Date());
+                record.setPayStatus("1");
+                record.setPayRemark("缴纳:" + e.getName());
+                tbFeeItemRecordService.save(record);
+            });
             //todo:给收购商发送边民缴费成功消息
             MessageDto dto = new MessageDto();
             dto.setUrl("/pages/market/two/purchaser/order/list");