Merge branch 'feature/asyncOrder' of http://git.aseanbusiness.cn/qzyReal/market-server into feature/asyncOrder

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

@@ -42,6 +42,7 @@ public class HtTradeSettlement extends Model<HtTradeSettlement> implements Seria
 	public static final String PERMISSION_CODE_ADD = "ht-trade-settlement-add";
 	public static final String PERMISSION_CODE_EDIT = "ht-trade-settlement-edit";
 	public static final String PERMISSION_CODE_DEL = "ht-trade-settlement-del";
+	public static final String PERMISSION_CODE_LISTING = "listing-management";
 
 
 

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

@@ -74,6 +74,13 @@ public class HtTradeSettlementController {
 		List<HtTradeSettlement> list = htTradeSettlementService.getList(so.startPage());
 		return AjaxJson.getPageData(so.getDataCount(), list);
 	}
+	@RequestMapping("getListingList")
+	@SaCheckPermission(HtTradeSettlement.PERMISSION_CODE_LISTING)
+	public AjaxJson getListingList() {
+		SoMap so = SoMap.getRequestSoMap();
+		List<HtTradeSettlement> list = htTradeSettlementService.getList(so.startPage());
+		return AjaxJson.getPageData(so.getDataCount(), list);
+	}
 
 	/*-----           正常业务逻辑👆👆    rpc远程调用👇👇 -----*/
 

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

@@ -109,6 +109,7 @@ public class HtTradeSettlementService extends ServiceImpl<HtTradeSettlementMappe
         } else {
             htTradeSettlement.setEnterpriseId(tbShop.getEnterpriseId());
         }
+        htTradeSettlement.setCreateTime(new Date());
         int insert = htTradeSettlementMapper.insert(htTradeSettlement);
         //获取边民订单集合
         List<BordersListDto> bordersListDtoList = tradeSettlementDto.getBordersListDtoList();
@@ -166,9 +167,10 @@ public class HtTradeSettlementService extends ServiceImpl<HtTradeSettlementMappe
                 tbOrder.setGroupId(tbPeople.getGroupId());
             }
             //商品店铺信息
-            if (tbShop != null)
+            if (tbShop != null) {
                 tbOrder.setEnterpriseId(tbShop.getEnterpriseId()).setEnterpriseName(tbShop.getEnterpriseName());
-
+                tbOrder.setShopId(tbShop.getId()).setShopName(tbShop.getShopName());
+            }
             int result = tbOrderMapper.insert(tbOrder);
             //发送短信
             if (result == 1) {

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

@@ -13,10 +13,8 @@ import java.util.stream.Collectors;
 import cn.hutool.json.JSONUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.pj.api.dto.BorderDTO;
-import com.pj.api.dto.DclBorderList;
-import com.pj.api.dto.GroupDto;
-import com.pj.api.dto.HtGroupDto;
+import com.pj.api.client.admin.AdminInterface;
+import com.pj.api.dto.*;
 import com.pj.current.satoken.StpUserUtil;
 import com.pj.enummj.DeleteStatus;
 import com.pj.enummj.IsLock;
@@ -68,6 +66,8 @@ public class TbGroupService extends ServiceImpl<TbGroupMapper, TbGroup> implemen
 
     @Resource
     private TbTradeAreaService tbTradeAreaService;
+    @Autowired
+    private AdminInterface adminInterface;
 
     /**
      * 增
@@ -373,6 +373,11 @@ public class TbGroupService extends ServiceImpl<TbGroupMapper, TbGroup> implemen
      */
     public boolean groupDto(HtGroupDto groupDto) {
         log.info("还是处理互助组信息:{}",JSONUtil.toJsonStr(groupDto));
+        // 边民信息表体信息
+        List<BorderDTO> borderDTOList = JSONUtil.toList(groupDto.getBorderList(), BorderDTO.class);
+        //互助组边民代表(组长)表体信息——>默认一个互助组只有一个组长
+        List<DclBorderList> dclBorderList = JSONUtil.toList(groupDto.getDclBorderList(), DclBorderList.class);
+
         TbTradeArea tbTradeArea = tbTradeAreaService.updateHandler(groupDto.getFieldCode(), "", "");
         //根据编号进行事务处理
         TbGroup tbGroup = this.findByAreaCodeAndSeqCode(tbTradeArea.getId(), groupDto.getPlatSeqNo());
@@ -386,10 +391,7 @@ public class TbGroupService extends ServiceImpl<TbGroupMapper, TbGroup> implemen
                     .setTradeAreaName(tbTradeArea.getName());
             this.save(tbGroup);
         }
-        // 边民信息表体信息
-        List<BorderDTO> borderDTOList = JSONUtil.toList(groupDto.getBorderList(), BorderDTO.class);
-        //互助组边民代表(组长)表体信息
-        List<DclBorderList> dclBorderList = JSONUtil.toList(groupDto.getDclBorderList(), DclBorderList.class);
+
         for (BorderDTO borderDTO : borderDTOList) {
             TbPeople tbPeople = tbPeopleService.findByIdCarNo(borderDTO.getIdCardNo());
             if (tbPeople == null) {
@@ -406,10 +408,20 @@ public class TbGroupService extends ServiceImpl<TbGroupMapper, TbGroup> implemen
             tbPeople.setGroupName(tbGroup.getOrgName()).setGroupId(tbGroup.getId()).setTradeAreaId(tbTradeArea.getId())
                     .setTradeAreaName(tbTradeArea.getName()).setUpdateTime(new Date());
             tbPeopleService.saveOrUpdate(tbPeople);
-            //todo 继续同步边民信息
+            if (dclBorderList1.size() > 0) {
+                tbGroup.setLeaderId(tbPeople.getId());
+            }
+
+            AppUserDto appUser = adminInterface.getByFkId(tbPeople.getId());
+            if(appUser != null) {
+                appUser.setUserType("2");
+                adminInterface.saveAppUserInfo(appUser);
+            }
         }
         //修改
         BeanUtils.copyProperties(groupDto, tbGroup);
+        tbGroup.setLeaderName(dclBorderList.get(0).getDeclareName())
+                .setLeaderPhone(dclBorderList.get(0).getDeclareTel());
         tbGroup.setUpdateTime(new Date());
         super.saveOrUpdate(tbGroup);
         return true;

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

@@ -330,7 +330,7 @@ public class TbOrder extends Model<TbOrder> implements Serializable {
 	/**
 	 * 查验结果[1=查验通过 2=查验不通过]
 	 */
-	private Integer checkPassStatus=1;
+	private Integer checkPassStatus;
 
 	/**
 	 * 查验时间（不通过）
@@ -524,7 +524,7 @@ public class TbOrder extends Model<TbOrder> implements Serializable {
     /**
      * 上架状态(1=未上架，2=上架,3=已下架）
      */
-    private Integer upStatus = 1;
+    private Integer upStatus;
     private Date upTime;
 
     private BigDecimal upPrice;

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

@@ -1,10 +1,12 @@
 package com.pj.tb_order;
 
+import java.math.BigDecimal;
+import java.util.ArrayList;
 import java.util.List;
 
+import cn.hutool.core.convert.Convert;
 import com.pj.api.dto.HtDeclareChargebackDto;
 import com.pj.api.dto.HtPassCardDTO;
-import com.pj.current.mybatis.DataScope;
 import com.pj.utils.so.SoMap;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -89,6 +91,23 @@ public class TbOrderController {
 		return AjaxJson.getByLine(line);
 	}
 
+	/** 批量修改总价 */
+	@RequestMapping("editUpPriceByIds")
+	@SaCheckPermission(TbOrder.PERMISSION_CODE_EDIT_PRICE)
+	public AjaxJson editUpPriceByIds(String ids, double price){
+		Long[] idArr = Convert.toLongArray(ids);
+
+		List<TbOrder> tbOrders = new ArrayList<>();
+		for (Long id: idArr) {
+			TbOrder order = new TbOrder();
+			order.setUpPrice(BigDecimal.valueOf(price));
+			order.setId(id);
+			tbOrders.add(order);
+		}
+		boolean batch = tbOrderService.updateBatchById(tbOrders);
+		return AjaxJson.toAjax(batch);
+	}
+
 
 
 	/*-----           正常业务逻辑👆👆    rpc远程调用👇👇 -----*/

sp-service/level-one-server/src/main/java/com/pj/tb_shop/vo/ShopVo.java

@@ -14,7 +14,7 @@ public class ShopVo {
 	/**
 	 * 主键
 	 */
-	private String id;
+	private Long id;
 
 	/**
 	 * 互市区名称