新增订单创建时间(数据库生成)

sp-service/level-one-server/src/main/java/com/pj/ht_trade_settlement/HtTradeSettlement.java

@@ -205,10 +205,13 @@ public class HtTradeSettlement extends Model<HtTradeSettlement> implements Seria
 	private Date finishTime;
 
 	/**
-	 * 创建时间
+	 * 创建时间（逻辑生成）
 	 */
 	private Date createTime;
-
+	/**
+	 * 创建时间（数据库生成）
+	 */
+	private Date createdAt;
 	/**
 	 *
 	 */

sp-service/level-one-server/src/main/java/com/pj/ht_trade_settlement/HtTradeSettlementService.java

@@ -17,6 +17,7 @@ import com.pj.tb_import_order.TbImportOrder;
 import com.pj.tb_import_order.TbImportOrderService;
 import com.pj.tb_order.TbOrder;
 import com.pj.tb_order.TbOrderMapper;
+import com.pj.tb_order.TbOrderService;
 import com.pj.tb_people.TbPeople;
 import com.pj.tb_people.TbPeopleService;
 import com.pj.tb_shop.TbShop;
@@ -31,6 +32,7 @@ import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
 import java.math.BigDecimal;
+import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 import java.util.stream.Collectors;
@@ -53,6 +55,8 @@ public class HtTradeSettlementService extends ServiceImpl<HtTradeSettlementMappe
     private TbPeopleService tbPeopleService;
     @Autowired
     private TbOrderMapper tbOrderMapper;
+    @Autowired
+    private TbOrderService tbOrderService;
 
     @Resource
     private TbTradeAreaService tbTradeAreaService;
@@ -145,13 +149,15 @@ public class HtTradeSettlementService extends ServiceImpl<HtTradeSettlementMappe
         Date applyTime = new Date(Long.parseLong(tradeSettlementDto.getDeclTime()));
         htTradeSettlement.setDeclTime(DateUtil.format(applyTime, "yyyy-MM-dd HH:mm:ss")).setFinishStatus(0);
         BigDecimal totalPrice = BigDecimal.ZERO;
-        Date now = new Date();
-        String dateStr = DateUtils.parseDateToStr("yyMMddHHmm", now);
+
+        List<TbOrder> tbOrderList = new ArrayList<>();
         for (BordersListDto item : bordersListDtoList) {//开始创建边民订单
             totalPrice = totalPrice.add(BigDecimal.valueOf(item.getBuyAmount()));
             TbOrder tbOrder = new TbOrder();
             //航通字段
             BeanUtils.copyProperties(item, tbOrder);
+            Date now = new Date();
+            String dateStr = DateUtils.parseDateToStr("yyMMddHHmm", now);
             String tradeNo = "YJSCDD".concat(dateStr)
                     .concat(RandomUtil.randomNumbers(5) + "0");
             while (true){
@@ -212,13 +218,16 @@ public class HtTradeSettlementService extends ServiceImpl<HtTradeSettlementMappe
                 tbOrder.setEnterpriseId(tbShop.getEnterpriseId()).setEnterpriseName(tbShop.getEnterpriseName());
                 tbOrder.setShopId(tbShop.getId()).setShopName(tbShop.getShopName());
             }
-            int result = tbOrderMapper.insert(tbOrder);
+
+            tbOrderList.add(tbOrder);
             //发送短信
-            if (result == 1) {
+            /*if (result == 1) {
                 String content = "您好,您的[边民互市订单]已经生成,订单商品是[" + tbOrder.getGoodsNames() + "]。请前往app进行交易确认";
                 // SystemObject.smsFactory.handler().sendSMS(tbPeople.getPhone(), content);
-            }
+            }*/
         }
+        boolean saveBatch = tbOrderService.saveBatch(tbOrderList);
+        StaticLog.info("航通结算订单生成边民订单结果:{}", saveBatch);
         htTradeSettlement.setTotalPrice(totalPrice);
         this.updateById(htTradeSettlement);
 

sp-service/level-one-server/src/main/java/com/pj/tb_group/TbGroupService.java

@@ -4,10 +4,7 @@ import java.io.FileOutputStream;
 import java.io.IOException;
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
-import java.util.Arrays;
-import java.util.Date;
-import java.util.List;
-import java.util.Objects;
+import java.util.*;
 import java.util.stream.Collectors;
 
 import cn.hutool.json.JSONUtil;
@@ -148,9 +145,6 @@ public class TbGroupService extends ServiceImpl<TbGroupMapper, TbGroup> implemen
     }
 
     public int AddGroupPeople(Long groupId, Long[] peopleIds) {
-        // 获取当前登录用户id
-//		Long loginId = StpUserUtil.getLoginIdAsLong();
-        int line = 0;
         // 获取互助组信息
         TbGroup tbGroup = tbGroupMapper.selectById(groupId);
         // 如果互助组不存在则抛异常
@@ -166,6 +160,7 @@ public class TbGroupService extends ServiceImpl<TbGroupMapper, TbGroup> implemen
             throw new RuntimeException("该互助组已被删除");
         }
         List<Long> list = Arrays.asList(peopleIds);
+        List<TbPeople> tbPeopleList = new ArrayList<>();
         // 把互助组信息写入边民表
         for (Long peopleId : list) {
             TbPeople tbPeople = tbPeopleMapper.selectById(peopleId);
@@ -173,10 +168,10 @@ public class TbGroupService extends ServiceImpl<TbGroupMapper, TbGroup> implemen
             tbPeople.setGroupName(tbGroup.getOrgName());
             // 写入更新者id
 //			tbPeople.setUpdateBy(String.valueOf(loginId));
-            int i = tbPeopleMapper.updateById(tbPeople);
-            line = i + 1;
+            tbPeopleList.add(tbPeople);
         }
-        return line;
+        tbPeopleService.updateBatchById(tbPeopleList);
+        return tbPeopleList.size();
 
     }
 
@@ -184,7 +179,7 @@ public class TbGroupService extends ServiceImpl<TbGroupMapper, TbGroup> implemen
 
         // 获取当前登录用户id
         Long loginId = StpUserUtil.getLoginIdAsLong();
-        int line = 0;
+        //int line = 0;
         // 获取互助组信息
         TbGroup tbGroup = tbGroupMapper.selectById(groupId);
         // 如果互助组不存在则抛异常
@@ -200,6 +195,7 @@ public class TbGroupService extends ServiceImpl<TbGroupMapper, TbGroup> implemen
             throw new RuntimeException("该互助组已被删除");
         }
         List<Long> list = Arrays.asList(peopleIds);
+        List<TbPeople> tbPeopleList = new ArrayList<>();
         // 把边民表互助组信息置空
         for (Long peopleId : list) {
             TbPeople tbPeople = tbPeopleMapper.selectById(peopleId);
@@ -207,10 +203,10 @@ public class TbGroupService extends ServiceImpl<TbGroupMapper, TbGroup> implemen
             tbPeople.setGroupName("");
             // 写入更新者id
             tbPeople.setUpdateBy(String.valueOf(loginId));
-            int i = tbPeopleMapper.updateById(tbPeople);
-            line = i + 1;
+            tbPeopleList.add(tbPeople);
         }
-        return line;
+        tbPeopleService.updateBatchById(tbPeopleList);
+        return tbPeopleList.size();
     }
 
     public int isLock(TbGroupDto tbGroupDto) {

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

@@ -285,9 +285,13 @@ public class TbOrder extends Model<TbOrder> implements Serializable {
 	private String createName;
 
 	/**
-	 * 创建时间
+	 * 创建时间（逻辑生成）
 	 */
 	private Date createTime;
+	/**
+	 * 创建时间（数据库生成）
+	 */
+	private Date createdAt;
 
 	/**
 	 * 更新人编号

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

@@ -1165,9 +1165,9 @@ public class TbOrderService extends ServiceImpl<TbOrderMapper, TbOrder> implemen
         BeanUtils.copyProperties(byId, orderDto);
         String goodsUnitName = byId.getGoodsUnit();
         TbGoodsUnits tbGoodsUnits = tbGoodsUnitsService.findByUnitName(goodsUnitName);
-        if (tbGoodsUnits == null) {
+        /*if (tbGoodsUnits == null) {
             return null;
-        }
+        }*/
         orderDto.setGoodsUnit(tbGoodsUnits.getUnitsNo());
         return orderDto;
     }

sp-service/level-one-server/src/main/java/com/pj/tb_shop/TbShopMapper.xml

@@ -40,6 +40,11 @@
 			<if test=' this.has("enterpriseName") '> and enterprise_name like cancat('%',#{enterpriseName},'%')  </if>
 			<if test=' this.has("ownerName") '> and owner_name like concat('%',#{ownerName},'%')  </if>
 			<if test=' this.has("deleteStatus") '> and delete_status = #{deleteStatus} </if>
+
+			<if test=' this.has("shopSccd") '> and shop_sccd = #{shopSccd} </if>
+			<if test=' this.has("ownerTel") '> and owner_tel = #{ownerTel} </if>
+			<if test=' this.has("nationality") '> and nationality = #{nationality} </if>
+			<if test=' this.has("bankAccount") '> and bank_account = #{bankAccount} </if>
 		</where>
 		order by
 		<choose>

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

@@ -186,6 +186,7 @@ public class TbOrdersService extends ServiceImpl<TbOrdersMapper, TbOrders> imple
         log.info("收购商采购：{}，{}", purchaser.getName(), idStr);
 
         Long[] idArr = Convert.toLongArray(idStr);
+        List<TbOrders> tbOrdersList = new ArrayList<>();
         for (Long id : idArr) {
             TbOrders orderTwo = this.getById(id);
             if (orderTwo == null) {
@@ -200,8 +201,9 @@ public class TbOrdersService extends ServiceImpl<TbOrdersMapper, TbOrders> imple
             orderTwo.setIsPay(0);//支付中
 
             orderTwo.setOrderTime(new Date());//支付时间
-            boolean b = updateById(orderTwo);
-            if (!b) throw new RuntimeException("购买异常，请重新登录或联系管理员！");
+            tbOrdersList.add(orderTwo);
+            //boolean b = updateById(orderTwo);
+            //if (!b) throw new RuntimeException("购买异常，请重新登录或联系管理员！");
 
             //修改对应的一级市场订单状态：BeingOrder值为已被下单
             boolean updateResult = levelOneServerInterface.updateBeingOrder(orderTwo.getLevelOneOrderId());
@@ -220,6 +222,7 @@ public class TbOrdersService extends ServiceImpl<TbOrdersMapper, TbOrders> imple
             dto.setContents("你转售的《" + t.getGoodsName() + "》收购商已付款。请及时发起缴税申请以及缴费申请。");
             adminInterface.messageSave(dto);*/
         }
+        this.updateBatchById(tbOrdersList);
         // 清空购物车
         LambdaQueryWrapper<TbOrdersCart> wrapper = new LambdaQueryWrapper<>();
         wrapper.in(TbOrdersCart::getOrderId, Arrays.asList(idArr));