bug修改

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

@@ -64,7 +64,7 @@ public interface LevelOneServerInterface {
     public List<PeopleDto> getPeopleList(@RequestParam("groupId")Long groupId);
 
     /** 查 - 根据id */
-    @RequestMapping("/TbGoods/rpc/getBygoodtosId")
+    @RequestMapping("/TbGoods/rpc/getByGoodsId")
     public GoodsDto getByGoodsId(@RequestParam("goodsId") Long goodsId);
 
     /** 根据ID获取边民信息 */

sp-service/level-one-server/src/main/java/com/pj/tb_goods/TbGoodsController.java

@@ -20,7 +20,7 @@ import org.springframework.web.multipart.MultipartFile;
 
 /**
  *商品管理
- * @author qzy 
+ * @author qzy
  */
 @RestController
 @RequestMapping("/TbGoods/")
@@ -39,24 +39,24 @@ public class TbGoodsController {
 		return AjaxJson.getSuccessData(t);
 	}
 
-	/** 删 */  
+	/** 删 */
 	@RequestMapping("delete")
 	@SaCheckPermission(TbGoods.PERMISSION_CODE_DEL)
 	public AjaxJson delete(Long id){
 		 tbGoodsService.delete(id);
 		return AjaxJson.getSuccess();
 	}
-	
-	/** 删 - 根据id列表 */  
+
+	/** 删 - 根据id列表 */
 	@RequestMapping("deleteByIds")
 	@SaCheckPermission(TbGoods.PERMISSION_CODE_DEL)
 	public AjaxJson deleteByIds(){
-		List<Long> ids = SoMap.getRequestSoMap().getListByComma("ids", long.class); 
+		List<Long> ids = SoMap.getRequestSoMap().getListByComma("ids", long.class);
 		int line = SP.publicMapper.deleteByIds(TbGoods.TABLE_NAME, ids);
 		return AjaxJson.getByLine(line);
 	}
-	
-	/** 改 */  
+
+	/** 改 */
 	@RequestMapping("update")
 	@SaCheckPermission(TbGoods.PERMISSION_CODE_EDIT)
 	public AjaxJson update(TbGoods t){
@@ -64,7 +64,7 @@ public class TbGoodsController {
 		return AjaxJson.getSuccess();
 	}
 
-	/** 查 - 根据id */  
+	/** 查 - 根据id */
 	@RequestMapping("getById")
 		@SaCheckPermission(TbGoods.PERMISSION_CODE)
 	public AjaxJson getById(String id){
@@ -72,18 +72,18 @@ public class TbGoodsController {
 		return AjaxJson.getSuccessData(t);
 	}
 
-	/** 查集合 - 根据条件（参数为空时代表忽略指定条件） */  
+	/** 查集合 - 根据条件（参数为空时代表忽略指定条件） */
 	@RequestMapping("getList")
 		@SaCheckPermission(TbGoods.PERMISSION_CODE)
-	public AjaxJson getList() { 
+	public AjaxJson getList() {
 		SoMap so = SoMap.getRequestSoMap();
 		List<TbGoods> list = tbGoodsService.getList(so.startPage());
 		return AjaxJson.getPageData(so.getDataCount(), list);
 	}
-	
-	
-	
-	/** 改 - 状态(0=禁用,1=启用) */  
+
+
+
+	/** 改 - 状态(0=禁用,1=启用) */
 	@RequestMapping("updateStatus")
 	@SaCheckPermission(TbGoods.PERMISSION_CODE_EDIT)
 	public AjaxJson updateStatus(String id, String value){
@@ -127,7 +127,7 @@ public class TbGoodsController {
 
 /* ---           正常业务方法 👆👆  rpc远程调用👇👇                              ---*/
 	/** 查 - 根据id */
-	@RequestMapping("rpc/getBygoodsId")
+	@RequestMapping("rpc/getByGoodsId")
 	public GoodsDto getByGoodsId(@RequestParam("goodsId") Long goodsId){
 		GoodsDto t = tbGoodsService.selectById(goodsId);
 		return t;

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

@@ -399,6 +399,8 @@ public class TbOrderService extends ServiceImpl<TbOrderMapper, TbOrder> implemen
         if ("1".equals(tbOrder.getDeclareType())) {
             // TODO: 2023/8/29 调用航通009接口，发送信息
             sendConfirmMsgToHt(tbOrder);
+            //当declareType为边民时，不需要走后续两个确认，订单状态改为已完成
+            tbOrder.setFinishStatus(FinishStatus.FINISH_STATUS_ONE.getCode());
         }
        return super.updateById(tbOrder);
 

sp-service/level-two-server/src/main/java/com/pj/tb_item_rules/TbItemRulesMapper.xml

@@ -50,7 +50,7 @@
 
 
 	<select id="getAllList" resultType="com.pj.tb_item_rules.TbItemRulesVo">
-		select r.*
+		select i.name,i.company_name,r.*
 		from tb_fee_item i
 		left join tb_item_rules r on i.id = r.item_id
 	</select>

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

@@ -350,7 +350,7 @@ public class TbOrdersService extends ServiceImpl<TbOrdersMapper, TbOrders> imple
         feeItemList.forEach(feeItem -> {
             ruleList.addAll(tbItemRulesService.getList(new SoMap().set("itemId", feeItem.getId())));
         });
-
+        //目前逻辑为一个边民订单只有一个商品
         GoodsDto goods = levelOneServerInterface.getByGoodsId(orderDto.getGoodsId());
         List<TbItemRules> newRuleList = ruleList.stream().filter(rule -> rule.getGoodsCodes().contains(goods.getCode())).collect(Collectors.toList());
         AtomicReference<Float> sum= new AtomicReference<>(0.00F);