fix

netflix-dao/src/main/java/com/cyksj/mapper/GoodsWholesaleAccountMapper.java → netflix-dao/src/main/java/com/cyksj/mapper/GoodsWholesaleUserAccountMapper.java

@@ -8,10 +8,10 @@ import java.util.List;
 
 /**
  * 项目名: yhlxj
- * 文件名: GoodsWholesaleAccountMapper
+ * 文件名: GoodsWholesaleUserAccountMapper
  * 创建者: JavaZou
  * 创建时间:2024/8/26 17:15
  */
-public interface GoodsWholesaleAccountMapper extends BaseMapper<GoodsWholesaleUserAccount> {
+public interface GoodsWholesaleUserAccountMapper extends BaseMapper<GoodsWholesaleUserAccount> {
 	void batchInsert(@Param("userId") Long userId, @Param("orderId") Long orderId, @Param("list") List<GoodsWholesaleUserAccount> insert);
 }

netflix-dao/src/main/resources/mapper/GoodsWholesaleAccountMapper.xml → netflix-dao/src/main/resources/mapper/GoodsWholesaleUserAccountMapper.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 
-<mapper namespace="com.cyksj.mapper.GoodsWholesaleAccountMapper">
+<mapper namespace="com.cyksj.mapper.GoodsWholesaleUserAccountMapper">
 
     <insert id="batchInsert">
         insert ignore into

netflix-service/src/main/java/com/cyksj/service/goods/GoodsWholesaleService.java

@@ -2,6 +2,7 @@ package com.cyksj.service.goods;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.cyksj.model.entity.GoodsWholesale;
+import com.cyksj.model.entity.GoodsWholesaleUserAccount;
 
 import java.util.List;
 import java.util.Map;
@@ -20,4 +21,8 @@ public interface GoodsWholesaleService extends IService<GoodsWholesale> {
 	void uploadAccount(List<Object> acountList, Long orderId);
 
 	 void saveOrUpdateWholesale(GoodsWholesale wholesale) throws Exception;
+
+	void updateOrderAccount(List<GoodsWholesaleUserAccount> goodsWholesaleUserAccounts);
+
+	void insertOrderAccount(List<GoodsWholesaleUserAccount> goodsWholesaleUserAccounts);
 }

netflix-service/src/main/java/com/cyksj/service/goods/impl/GoodsWholesaleServiceImpl.java

@@ -7,9 +7,9 @@ import com.cyksj.common.exception.BusinessRuntimeException;
 import com.cyksj.common.util.Codec;
 import com.cyksj.common.util.Jsons;
 import com.cyksj.common.util.Xmls;
-import com.cyksj.mapper.GoodsWholesaleAccountMapper;
 import com.cyksj.mapper.GoodsWholesaleMapper;
 import com.cyksj.mapper.GoodsWholesaleOrderDonMapper;
+import com.cyksj.mapper.GoodsWholesaleUserAccountMapper;
 import com.cyksj.mapper.GoodsWholesaleUserDepositMapper;
 import com.cyksj.mapper.channel.ShopConfigMapper;
 import com.cyksj.mapper.manage.cms.CmsUserMapper;
@@ -49,7 +49,7 @@ public class GoodsWholesaleServiceImpl extends ServiceImpl<GoodsWholesaleMapper,
 
 	private final GoodsWholesaleOrderDonMapper wholesaleOrderDonMapper;
 
-	private final GoodsWholesaleAccountMapper goodsWholesaleAccountMapper;
+	private final GoodsWholesaleUserAccountMapper goodsWholesaleUserAccountMapper;
 
 	@Override
 	public void depositRefund(Long id, Long adminId) throws Exception {
@@ -142,7 +142,7 @@ public class GoodsWholesaleServiceImpl extends ServiceImpl<GoodsWholesaleMapper,
 			insert.add(goodsWholesaleUserAccount);
 		}
 
-		goodsWholesaleAccountMapper.batchInsert(orderDon.getUserId(), orderId, insert);
+		goodsWholesaleUserAccountMapper.batchInsert(orderDon.getUserId(), orderId, insert);
 	}
 
 	@Override
@@ -152,4 +152,18 @@ public class GoodsWholesaleServiceImpl extends ServiceImpl<GoodsWholesaleMapper,
 		wholesale.setConfig(config);
 		this.saveOrUpdate(wholesale);
 	}
+
+	@Override
+	public void updateOrderAccount(List<GoodsWholesaleUserAccount> goodsWholesaleUserAccounts) {
+		goodsWholesaleUserAccounts.forEach(order -> {
+			goodsWholesaleUserAccountMapper.updateById(order);
+		});
+	}
+
+	@Override
+	public void insertOrderAccount(List<GoodsWholesaleUserAccount> goodsWholesaleUserAccounts) {
+		goodsWholesaleUserAccounts.forEach(order -> {
+			goodsWholesaleUserAccountMapper.insert(order);
+		});
+	}
 }

netflix-web/src/main/java/com/cyksj/web/controller/manage/goods/CmsGoodsDonWholeSaleController.java

@@ -12,6 +12,7 @@ import com.cyksj.enums.GatewayResponse;
 import com.cyksj.mapper.GoodsWholesaleOrderDonMapper;
 import com.cyksj.model.GoodsWholesaleUserRequirementRecord;
 import com.cyksj.model.entity.GoodsWholesale;
+import com.cyksj.model.entity.GoodsWholesaleUserAccount;
 import com.cyksj.model.entity.GoodsWholesaleUserDeposit;
 import com.cyksj.model.views.GoodsWholesaleOrderView;
 import com.cyksj.model.views.GoodsWholesaleView;
@@ -228,4 +229,34 @@ public class CmsGoodsDonWholeSaleController {
 		goodsWholesaleService.uploadAccount(acountList, orderId);
 		return GatewayResponse.SUCCESS.newBuilder().toResult();
 	}
+
+	/**
+	 * 订单账号详情
+	 */
+	@GetMapping("/get/order/account/{orderId}")
+	public Result<SearchResult<GoodsWholesaleUserAccount>> getOrderAccount(@PathVariable Long orderId) {
+		SearchResult<GoodsWholesaleUserAccount> search = beanSearcher.search(GoodsWholesaleUserAccount.class, MapUtils.flatBuilder(request.getParameterMap())
+				.field(GoodsWholesaleUserAccount::getOrderId, orderId)
+				.build());
+		return GatewayResponse.SUCCESS.newBuilder().toResult(search);
+	}
+
+	/**
+	 * 新增订单账号信息
+	 */
+	@PostMapping("/post/order/account")
+	public Result<String> insertOrderAccount(@RequestBody List<GoodsWholesaleUserAccount> goodsWholesaleUserAccounts) {
+		goodsWholesaleService.insertOrderAccount(goodsWholesaleUserAccounts);
+		return GatewayResponse.SUCCESS.newBuilder().toResult();
+	}
+
+	/**
+	 * 编辑订单账号信息
+	 */
+	@PutMapping("/update/order/account")
+	public Result<String> updateOrderAccount(@RequestBody List<GoodsWholesaleUserAccount> goodsWholesaleUserAccounts) {
+		goodsWholesaleService.updateOrderAccount(goodsWholesaleUserAccounts);
+		return GatewayResponse.SUCCESS.newBuilder().toResult();
+	}
+
 }