Merge branch 'master' of http://218.2.6.10:3001/fanzherong/hunanzeyunew

snowy-admin-web/src/api/biz/customerApi.js

@@ -24,7 +24,7 @@ export default {
 	// 获取客户详情
 	customerDetail(data) {
 		return request('detail', data, 'get')
-	}, 
+	},
 	// 获取客户列表
 	getList(data){
 		return request('getList', data, 'get')
@@ -33,5 +33,8 @@ export default {
 	customerResetPassword(data) {
 		return request('resetPassword', data)
 	},
-	
+	getOrderByCustomerId(data){
+		return request('getOrderByCustomerId',data,'get')
+	}
+
 }

snowy-admin-web/src/views/biz/bizorder/form.vue

@@ -13,12 +13,20 @@
 			<a-form-item label="订单名称：" name="orderName">
 				<a-input v-model:value="formData.orderName" placeholder="请输入订单名称" allow-clear />
 			</a-form-item>
-			<a-form-item label="货品信息：" name="goodId">
-				<a-select v-model:value="formData.goodId" placeholder="请选择货品信息"
-						  :options="goodIdList"
+			<a-form-item label="客户信息：" name="customerId">
+				<a-select v-model:value="formData.customerId" placeholder="请选择客户信息"
+						  :options="customerIdList" @change="onChangeCustomer"
 				> </a-select>
 			</a-form-item>
-			<a-form-item label="订单类型：" name="orderType">
+			<a-form-item label="订单信息：" name="saleOrderInfo">
+				<a-select v-model:value="formData.saleOrderInfo" placeholder="请选择订单信息"
+						  :options="saleOrderInfoList" @change="onChangeSaleOrder"
+				> </a-select>
+			</a-form-item>
+			<a-form-item label="货品名称：" name="goodsName">
+				<a-input v-model:value="formData.goodsName" placeholder="请输入货品名称" allow-clear />
+			</a-form-item>
+			<a-form-item label="订单类型：" name="orderType" style="display:none">
 				<a-select v-model:value="formData.orderType" placeholder="请选择订单类型"
 						  :options="orderTypeList"
 				> </a-select>
@@ -40,6 +48,7 @@
 	import bizOrderApi from '@/api/biz/bizOrderApi'
 	import tool from '@/utils/tool'
 	import bizGoodsApi from '@/api/biz/bizGoodsApi'
+	import customerApi from '@/api/biz/customerApi'
 	// 抽屉状态
 	const open = ref(false)
 	const emit = defineEmits({ successful: null })
@@ -55,6 +64,8 @@
 	//订单类型
 	const orderTypeList = tool.dictList('order_type')
 	const goodIdList = ref()
+	const customerIdList = ref()
+	const saleOrderInfoList = ref()
 
 	// 打开抽屉
 	const onOpen = (record) => {
@@ -63,6 +74,16 @@
 			let recordData = cloneDeep(record)
 			formData.value = Object.assign({}, recordData)
 		}
+		//查询客户信息
+		customerApi.getList().then((res)=>{
+			customerIdList.value = res.map((item)=>{
+				return{
+					value:item.id,
+					label:item.name
+				}
+			})
+		})
+
 		bizGoodsApi.getList().then((res)=>{
 			goodIdList.value = res.map((item)=>{
 				return{
@@ -72,6 +93,30 @@
 			})
 		})
 	}
+
+	//客户点击时间
+	const onChangeCustomer =(value)=>{
+		customerApi.getOrderByCustomerId({id:value}).then((res)=>{
+			saleOrderInfoList.value = res.orderList.map((item)=>{
+				return{
+					value:item.orderName+'-'+item.orderNumber+'-'+item.goodsName+'-'+item.orderWeight+'-'+item.orderType,
+					label:item.orderName
+				}
+			})
+		})
+	}
+
+	//订单点击时间
+	const onChangeSaleOrder = (value) =>{
+		formData.value.orderName = value.split('-')[0]
+		formData.value.orderNumber= value.split('-')[1]
+		formData.value.goodsName = value.split('-')[2]
+		formData.value.orderWeight = value.split('-')[3]
+		formData.value.orderType = value.split('-')[4]
+
+		//根据货品名称和重量查询提货时间段
+	}
+
 	// 关闭抽屉
 	const onClose = () => {
 		formRef.value.resetFields()
@@ -82,6 +127,8 @@
 	const formRules = {
 		orderNumber: [required('请输入订单编号')],
 		orderName: [required('请输入订单名称')],
+		customerId:[required('请选择客户信息')],
+		saleOrderInfo:[required('请选择订单信息')],
 		goodId: [required('请选择货品信息')],
 		orderWeight: [required('请输入订单重量')],
 	}

snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/customer/controller/BizCustomerController.java

@@ -31,6 +31,8 @@ import jakarta.annotation.Resource;
 import jakarta.validation.Valid;
 import jakarta.validation.constraints.NotEmpty;
 import java.util.List;
+import java.util.Map;
+import java.util.Objects;
 
 /**
  * 客户控制器
@@ -156,4 +158,17 @@ public class BizCustomerController {
         return CommonResult.ok();
     }
 
-}
+    /**
+     * 获取用友平台销售订单
+     *
+     * @author sandy
+     * @date  2025/03/27 17:00
+     */
+    @Operation(summary = "获取用友平台销售订单")
+    @CommonLog("获取用友平台销售订单")
+    @GetMapping("/biz/customer/getOrderByCustomerId")
+    public CommonResult<Map<String, Object>> getOrderByCustomerId(BizCustomerIdParam bizCustomerIdParam){
+        return CommonResult.data(bizCustomerService.getOrderByCustomerId(bizCustomerIdParam));
+    }
+
+}

snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/customer/param/BizSaleOrderParam.java

@@ -0,0 +1,23 @@
+package vip.xiaonuo.biz.modular.customer.param;
+
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+@Data
+public class BizSaleOrderParam {
+    /**订单名称*/
+    private String orderName;
+
+    /**订单编号*/
+    private String orderNumber;
+
+    /**货品名称*/
+    private String goodsName;
+
+    /**订单重量*/
+    private BigDecimal orderWeight;
+
+    /**订单类型*/
+    private String orderType;
+}

snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/customer/service/BizCustomerService.java

@@ -21,6 +21,8 @@ import vip.xiaonuo.biz.modular.customer.param.BizCustomerIdParam;
 import vip.xiaonuo.biz.modular.customer.param.BizCustomerPageParam;
 
 import java.util.List;
+import java.util.Map;
+import java.util.Objects;
 
 /**
  * 客户Service接口
@@ -93,4 +95,9 @@ public interface BizCustomerService extends IService<BizCustomer> {
      * @date  2025/03/21 11:44
      **/
     BizCustomer queryEntity(String id);
+
+    /**
+     * 获取用友销售订单
+     */
+    Map<String, Object> getOrderByCustomerId(BizCustomerIdParam bizCustomerIdParam);
 }

snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/customer/service/impl/BizCustomerServiceImpl.java

@@ -21,11 +21,14 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.google.common.collect.Maps;
 import jakarta.annotation.Resource;
+import org.apache.commons.compress.utils.Lists;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import vip.xiaonuo.biz.modular.customer.enums.BizCustomerEnum;
+import vip.xiaonuo.biz.modular.customer.param.*;
 import vip.xiaonuo.biz.modular.goodsConf.entity.BizGoodsConf;
 import vip.xiaonuo.biz.modular.goodsConf.enums.BizGoodsConfEnum;
 import vip.xiaonuo.biz.modular.user.entity.BizUser;
@@ -36,16 +39,14 @@ import vip.xiaonuo.common.exception.CommonException;
 import vip.xiaonuo.common.page.CommonPageRequest;
 import vip.xiaonuo.biz.modular.customer.entity.BizCustomer;
 import vip.xiaonuo.biz.modular.customer.mapper.BizCustomerMapper;
-import vip.xiaonuo.biz.modular.customer.param.BizCustomerAddParam;
-import vip.xiaonuo.biz.modular.customer.param.BizCustomerEditParam;
-import vip.xiaonuo.biz.modular.customer.param.BizCustomerIdParam;
-import vip.xiaonuo.biz.modular.customer.param.BizCustomerPageParam;
 import vip.xiaonuo.biz.modular.customer.service.BizCustomerService;
 import vip.xiaonuo.common.util.CommonCryptogramUtil;
 import vip.xiaonuo.dev.api.DevConfigApi;
 import vip.xiaonuo.sys.api.SysUserApi;
 
+import java.math.BigDecimal;
 import java.util.List;
+import java.util.Map;
 
 /**
  * 客户Service接口实现类
@@ -232,4 +233,28 @@ public class BizCustomerServiceImpl extends ServiceImpl<BizCustomerMapper, BizCu
         }
         return bizCustomer;
     }
+
+    @Override
+    public Map<String, Object> getOrderByCustomerId(BizCustomerIdParam bizCustomerIdParam) {
+        Map<String,Object> map = Maps.newHashMap();
+        BizCustomer bizCustomer = this.queryEntity(bizCustomerIdParam.getId());
+        //根据客户记录中用友id查询用友平台销售订单
+        List<BizSaleOrderParam> orderParamList = Lists.newArrayList();
+        BizSaleOrderParam bizSaleOrderParam = new BizSaleOrderParam();
+        bizSaleOrderParam.setOrderNumber("11111");
+        bizSaleOrderParam.setOrderName("订单1");
+        bizSaleOrderParam.setGoodsName("石子");
+        bizSaleOrderParam.setOrderType("1");
+        bizSaleOrderParam.setOrderWeight(new BigDecimal(100));
+        orderParamList.add(bizSaleOrderParam);
+        BizSaleOrderParam bizSaleOrderParam1 = new BizSaleOrderParam();
+        bizSaleOrderParam1.setOrderNumber("22222");
+        bizSaleOrderParam1.setOrderName("订单2");
+        bizSaleOrderParam1.setGoodsName("混凝土");
+        bizSaleOrderParam1.setOrderType("2");
+        bizSaleOrderParam1.setOrderWeight(new BigDecimal(100));
+        orderParamList.add(bizSaleOrderParam1);
+        map.put("orderList",orderParamList);
+        return map;
+    }
 }