Compare commits

..
164 Commits
Author SHA1 Message Date
wule 44553b43d1 新版本号 (该版本更新了上海仓仓库地址) 2026-11-17 16:47:02 +08:00
wule 171064f03f 增量读取订单功能 90% 新的二级oem 50% 2026-11-17 16:43:47 +08:00
wule e3f4e34def 添加新扣费选项筛选条件 2026-11-16 13:41:36 +08:00
wule 9e10d29bfe 修改订单读取函数 2026-11-13 19:37:46 +08:00
wule 8008dfb527 Merge branch 'main' of http://git.ts.e57.cn/chfei/29WxOrder 2026-11-13 14:48:52 +08:00
wule 4ca9c082a1 新版本号 2026-11-13 14:48:46 +08:00
wule 5f08abec0f Merge branch 'main' of http://git.ts.e57.cn/chfei/29WxOrder 2026-11-13 14:48:12 +08:00
wule b8674a11c5 优化礼物单问题 2026-11-13 14:48:01 +08:00
wule 5ef326d19c 新版本号 2026-11-12 19:09:29 +08:00
wule 2295b0df48 Merge branch 'main' of http://git.ts.e57.cn/chfei/29WxOrder 2026-11-12 19:08:40 +08:00
wule 15b8288a98 优化中转仓处理逻辑 2026-11-12 19:08:35 +08:00
chfei d9e8011564 Merge branch 'main' of http://git.ts.e57.cn/chfei/29WxOrder 2026-11-12 15:36:28 +08:00
chfei fb8e6a5479 自动读单 增加启动参数控制 2026-11-12 15:36:22 +08:00
wule c7cdf3ff88 新版本号 2026-11-12 11:33:09 +08:00
wule 82165f25a8 Merge branch 'main' of http://git.ts.e57.cn/chfei/29WxOrder 2026-11-12 11:31:45 +08:00
wule fe8f9851fe 修改繁体字拍单地址可用逻辑 2026-11-12 11:31:41 +08:00
wule 3d091462c5 新版本号 2026-11-11 18:50:50 +08:00
chfei 78a64aa661 利润统计 增加快递费筛选
快递费 页面支持导出全部
2026-11-11 18:24:46 +08:00
wule 71614f64e4 Merge branch 'main' of http://git.ts.e57.cn/chfei/29WxOrder 2026-11-11 17:55:45 +08:00
wule 04a8ba0472 快递费明细页面调整 2026-11-11 17:55:37 +08:00
wule a93ab77028 新版本号 2026-11-11 16:27:05 +08:00
wule d17cb0f139 优化作废按钮显示逻辑 2026-11-11 16:21:32 +08:00
wule 60db6f933d Merge branch 'main' of http://git.ts.e57.cn/chfei/29WxOrder 2026-11-11 14:50:17 +08:00
wule 761e3f102f 读单相关信息查询全部改为异步调用 2026-11-11 14:50:05 +08:00
wule 98531e0344 新版本号 2026-11-10 19:42:02 +08:00
wule ee10fb5ea8 优化名称显示 2026-11-10 19:41:25 +08:00
wule 79b0027b7e 优化读单 2026-11-10 17:33:34 +08:00
wule 344cbb4ac2 过滤订单使用异步方法 优化中转仓额外包裹逻辑 2026-11-10 16:34:57 +08:00
wule 200e5bc8c8 优化更新拍单金额等操作 2026-11-10 13:58:14 +08:00
wule 4b554b55d9 Merge branch 'main' of http://git.ts.e57.cn/chfei/29WxOrder 2026-11-10 10:39:15 +08:00
wule dadbb67914 小改动 2026-11-10 10:39:06 +08:00
wule 4e641928be 新版本号 2026-11-09 19:42:22 +08:00
wule 4bbb46304d 修改注释 2026-11-09 19:41:28 +08:00
wule 42ed8fc929 优化订单操作逻辑 2026-11-09 19:00:42 +08:00
wule ba6da5e85f 修复拍单余额查看闪退bug 优化每单拍单金额逻辑 2026-11-09 11:02:04 +08:00
wule ec13db7cc1 新版本号 2026-11-08 15:16:14 +08:00
wule a03f00fcdb 新版本号 2026-11-08 14:41:54 +08:00
wule_5900x 942ca54dd8 繁体地址需要权限才可使用 2026-11-08 14:41:15 +08:00
wule 6e8ff468f8 新版本号 2026-11-07 22:35:56 +08:00
wule_5900x ac93305d5f 1 修复淘宝拍单窗口可能崩溃问题
2 拼多多中转仓拍单随机地址支持随机繁体字
2026-11-07 22:35:03 +08:00
wule 5b9ed01fa1 1可设置是否直发拍单 2优化订单取号状态判断逻辑 2026-11-06 22:20:18 +08:00
wule 9789a4686f 修复退货包裹按钮功能写反的bug 2026-11-06 21:18:36 +08:00
wule 1ee4c99647 修复拍单后不能立即作废的bug 2026-11-06 18:01:18 +08:00
wule 8fc0e404c3 修复拍单后不能立即作废订单的问题 2026-11-06 17:55:46 +08:00
wule c4c54fc03e 新版本号 2026-11-06 17:00:13 +08:00
wule d43cf21afc Merge branch 'main' of http://git.ts.e57.cn/chfei/29WxOrder 2026-11-06 16:58:53 +08:00
wule 7ac3c67242 放开淘宝直拍,优化拍单按钮显示逻辑 2026-11-06 16:58:47 +08:00
wule 72c85ca3f1 新版本号 2026-11-06 16:12:24 +08:00
wule 518365a0d3 优化中转仓处理拍单流程 隐藏部分不可用功能 2026-11-06 16:11:23 +08:00
wule 27ac748f33 新版本号 2026-11-05 20:12:16 +08:00
wule 3483c99d37 修复买手退款异常单异常重拍按钮不显示的bug 2026-11-05 19:56:42 +08:00
wule a4bc9a788e 新版本号 2026-11-04 10:07:02 +08:00
wule 8f7e190974 优化订单处理 2026-11-04 10:05:52 +08:00
wule 85259d8335 显示买手退款详情 2026-11-03 13:38:50 +08:00
wule 5777c30048 新版本号 2026-11-02 19:28:16 +08:00
wule c40e591317 1更新上海仓库地址 2修复作废售后单后无法再次创建问题 2026-11-02 19:26:55 +08:00
wule 54986faa50 新版本号 2026-11-01 16:11:09 +08:00
wule_5900x 30808d56e8 优化直发单售后判断逻辑 2026-11-01 16:09:55 +08:00
wule_5900x 679f6cc9e6 修复云仓买手秒退导致直发退货仓无法提交的问题 2026-10-31 16:33:19 +08:00
wule a5889085d4 Merge branch 'main' of http://git.ts.e57.cn/chfei/29WxOrder 2026-10-30 20:43:22 +08:00
wule 6d3f9e4118 中转仓详情作废发货包裹功能 2026-10-30 20:43:13 +08:00
wule 96214a54ea 新版本号 2026-10-30 17:33:38 +08:00
wule f167c2585d 修复售后单数量不足10条时漏单问题 2026-10-30 17:33:02 +08:00
wule 671ca453e0 新版本号 2026-10-30 17:12:54 +08:00
wule da01c9f83f 同上一条 2026-10-30 17:11:55 +08:00
wule 70996d5409 Merge branch 'main' of http://git.ts.e57.cn/chfei/29WxOrder 2026-10-30 17:11:31 +08:00
wule bf3b6487f0 云仓详情页作废退货包裹功能 2026-10-30 17:11:19 +08:00
wule be8c0bd1e2 新版本号 2026-10-29 20:11:31 +08:00
wule cefea9dc1a Merge branch 'main' of http://git.ts.e57.cn/chfei/29WxOrder 2026-10-29 20:00:19 +08:00
wule 430bf8d574 修复包裹拒收功能报错 2026-10-29 20:00:14 +08:00
wule e08b4797cb 新版本号 2026-10-29 14:06:00 +08:00
wule 679bd39144 Merge branch 'main' of http://git.ts.e57.cn/chfei/29WxOrder 2026-10-29 14:05:14 +08:00
wule 1a5f40926b 修改拦截工单链接地址及其他一些改动 2026-10-29 14:05:04 +08:00
wule 6029eda6de 新版本号 2026-10-29 11:32:41 +08:00
wule 9545de7684 Merge branch 'main' of http://git.ts.e57.cn/chfei/29WxOrder 2026-10-29 11:31:19 +08:00
wule 6b8557f8b2 修复退货包裹无法创建问题 2026-10-29 11:31:12 +08:00
wule 4b34090cec 新版本号 2026-10-28 14:04:25 +08:00
chfei d76cf5c342 Merge branch 'main' of http://git.ts.e57.cn/chfei/29WxOrder 2026-10-28 14:04:02 +08:00
chfei d70b74ee4a 工单 增加图片复制 2026-10-28 14:03:54 +08:00
wule 1172670a7e Merge branch 'main' of http://git.ts.e57.cn/chfei/29WxOrder 2026-10-28 13:21:38 +08:00
wule be0be1866d 新版本号 2026-10-28 13:21:33 +08:00
wule a31b87b512 优化读拼多多买手单 2026-10-28 13:17:51 +08:00
chfei f89670877d Merge branch 'main' of http://git.ts.e57.cn/chfei/29WxOrder 2026-10-27 17:44:45 +08:00
chfei a9f3ed81af 修复 消费记录导出内容格式化错误 2026-10-27 17:44:38 +08:00
wule 5530b4be2d 修复云仓详情按钮不显示的bug 2026-10-27 17:41:53 +08:00
wule adc3649b59 Merge branch 'main' of http://git.ts.e57.cn/chfei/29WxOrder 2026-10-27 17:28:03 +08:00
wule 2d788bd8b1 查看云仓数据按钮 2026-10-27 17:27:54 +08:00
wule 3dd65bdccc 新版本号 2026-10-27 17:02:19 +08:00
wule c79758f235 优化淘宝买手售后读取 2026-10-27 17:01:51 +08:00
wule e01d9a4681 优化订单读取 显示中转仓状态 2026-10-27 16:12:27 +08:00
wule 3f618707da 新版本号 2026-10-27 10:21:58 +08:00
wule 8e581196af 注释等小改动 2026-10-27 10:19:49 +08:00
wule cb61749cda 仓库单详情列表 中转仓退货包裹如果没有物流使用买手物流 2026-10-27 10:16:34 +08:00
wule c1352264a9 Merge branch 'main' of http://git.ts.e57.cn/chfei/29WxOrder 2026-10-27 10:00:40 +08:00
chfei 61f0fc0edd 修复工单对话列表不能复制bug 2026-10-27 09:11:27 +08:00
wule 279ca6e8e9 Merge branch 'main' of http://git.ts.e57.cn/chfei/29WxOrder 2026-10-26 15:27:31 +08:00
wule f8af5730d3 退货包裹批量展示 2026-10-26 15:27:29 +08:00
wule fe50ca114a 新版本号 2026-10-26 14:53:19 +08:00
wule fb7b623a9f Merge branch 'main' of http://git.ts.e57.cn/chfei/29WxOrder 2026-10-26 14:50:49 +08:00
chfei 39cf75fcbb Merge branch 'main' of http://git.ts.e57.cn/chfei/29WxOrder 2026-10-26 14:50:23 +08:00
chfei 26bf67265d 修复 开票出现错误停止开票的bug 2026-10-26 14:50:13 +08:00
wule 37d879c3e5 model更新 2026-10-26 01:45:07 +08:00
wule fda30c824a 1 退货物流信息如果中转表没有从买手单表读取 2仓库详细信息 2026-10-25 22:10:39 +08:00
wule 19f48e9e6f 新版本号 2026-10-24 20:57:37 +08:00
wule e492457516 修复显示作废(显示错误)订单无法作废重拍的问题 2026-10-24 20:56:08 +08:00
wule 04584600c8 Merge branch 'main' of http://git.ts.e57.cn/chfei/29WxOrder 2026-10-24 11:26:04 +08:00
wule b466645640 中转订单详情 2026-10-24 11:25:55 +08:00
wule 2186281fb5 新版本号 2026-10-23 19:44:41 +08:00
wule 78d8f79089 新版本号 2026-10-23 19:44:18 +08:00
wule 526b009f5e Merge branch 'main' of http://git.ts.e57.cn/chfei/29WxOrder 2026-10-23 19:43:44 +08:00
wule 13cb427d2f 显示订单读取总页数 2026-10-23 19:43:40 +08:00
wule 941f48c8b8 新版本号 2026-10-23 19:39:27 +08:00
wule bcc934c1ba 优化读单卡顿问题 2026-10-23 19:38:28 +08:00
wule 8e88e0f5d7 新版本号 2026-10-23 13:51:57 +08:00
chfei 102af9a15c Merge branch 'main' of http://git.ts.e57.cn/chfei/29WxOrder 2026-10-23 13:49:28 +08:00
chfei e1daca428c 增加 工单 提示 2026-10-23 13:49:18 +08:00
wule 727ed7b8ec 新版本号 2026-10-23 09:46:06 +08:00
wule 2cb616b50a Merge branch 'main' of http://git.ts.e57.cn/chfei/29WxOrder 2026-10-23 09:45:48 +08:00
wule f8e68a6322 优化自动拍单优惠券逻辑 2026-10-23 09:45:39 +08:00
wule 7471b707f1 新版本号 2026-10-22 20:16:19 +08:00
wule 8ec1b63f8a 小改动 2026-10-22 20:12:45 +08:00
wule a37744b284 Merge branch 'main' of http://git.ts.e57.cn/chfei/29WxOrder 2026-10-22 20:07:40 +08:00
wule 3af9a8017a 自动领店铺优惠券 修复平台服务费不显示问题 2026-10-22 20:07:35 +08:00
wule fc83308711 Merge branch 'main' of http://git.ts.e57.cn/chfei/29WxOrder 2026-10-22 16:16:30 +08:00
wule e63d6c896c 新版本号 2026-10-22 16:16:24 +08:00
wule 3f3477d3f4 Merge branch 'main' of http://git.ts.e57.cn/chfei/29WxOrder 2026-10-22 16:15:49 +08:00
wule 50a0668278 服务器优化 2026-10-22 16:15:42 +08:00
chfei 1803a4e5e9 Merge branch 'main' of http://git.ts.e57.cn/chfei/29WxOrder 2026-10-22 09:48:19 +08:00
chfei 6ed2cede16 工单 增加 接收服务端推送的新工单,支持 推送增加消息 2026-10-22 09:48:12 +08:00
wule 2915056795 新版本号 2026-10-21 20:03:25 +08:00
wule 103b2a1a4a 优化订单读取与拍单逻辑 2026-10-21 20:01:53 +08:00
wule e02047ae57 Merge branch 'main' of http://git.ts.e57.cn/chfei/29WxOrder 2026-10-21 15:32:32 +08:00
wule a6e8e5b8cd 优化店铺列表展示 2026-10-21 15:31:59 +08:00
wule 12e9defdb5 新版本号 2026-10-21 12:21:17 +08:00
chfei f0f1f1ed9e Merge branch 'main' of http://git.ts.e57.cn/chfei/29WxOrder 2026-10-21 12:17:31 +08:00
chfei 1d5b6ba0e4 工单 修复 微信复制图片上传不展示的bug 2026-10-21 12:17:24 +08:00
wule c7a87cac28 Merge branch 'main' of http://git.ts.e57.cn/chfei/29WxOrder 2026-10-21 11:59:19 +08:00
wule 4d7fd2c157 拼多多买手读单优化 2026-10-21 11:59:12 +08:00
chfei 9c62e0c03d Merge branch 'main' of http://git.ts.e57.cn/chfei/29WxOrder 2026-10-21 11:30:47 +08:00
chfei 483d87f57d 增加发票助手 开票过程中错误提示 2026-10-21 11:30:39 +08:00
wule b63dacfe7e 售后单读取 2026-10-20 18:37:48 +08:00
wule c76e5c9663 新版本号 2026-10-20 17:04:58 +08:00
chfei 3affb4a732 Merge branch 'main' of http://git.ts.e57.cn/chfei/29WxOrder 2026-10-20 17:03:29 +08:00
chfei cf2efbcb16 工单 优化 ,增加图片 2026-10-20 17:03:23 +08:00
wule af43e6aed5 新版本号 2026-10-20 14:20:28 +08:00
wule 0b94c43fab Merge branch 'main' of http://git.ts.e57.cn/chfei/29WxOrder 2026-10-20 14:14:00 +08:00
wule fd07c9ba40 优化买手单读取 2026-10-20 14:13:55 +08:00
wule 221c0e6648 新版本 2026-10-20 11:35:57 +08:00
chfei bf5a70597c Merge branch 'main' of http://git.ts.e57.cn/chfei/29WxOrder 2026-10-20 11:34:43 +08:00
chfei 6e5dfa92b8 修复 工单第一次连接失败bug
增加工单内log
2026-10-20 10:20:57 +08:00
wule f5c8baef9a 新版本 2026-10-19 19:59:35 +08:00
chfei 324ca0c6e7 优化工单商铺数量限制 2026-10-19 19:58:23 +08:00
chfei f6eef23f96 Merge branch 'main' of http://git.ts.e57.cn/chfei/29WxOrder 2026-10-19 19:58:07 +08:00
chfei ddb23544c7 移除工单商铺数量限制 2026-10-19 19:58:01 +08:00
wule 7380763c1d 优化店铺读取 2026-10-19 19:55:26 +08:00
wule 707efc1723 Merge branch 'main' of http://git.ts.e57.cn/chfei/29WxOrder 2026-10-19 19:22:09 +08:00
wule f722993c3d 优化店铺读取 2026-10-19 19:22:04 +08:00
wule b7c682ef10 新版本 2026-10-19 18:47:49 +08:00
chfei 62e80d3c75 启动工单 日志修复 2026-10-19 18:45:14 +08:00
chfei f7851320ba 工单修改店铺50个bug 2026-10-19 18:42:17 +08:00
wule 12fe0c26fb 新版本 2026-10-19 18:19:45 +08:00
wule d36774ea18 订单排序,优化异常重拍 2026-10-19 18:18:02 +08:00
chfei fd0ff6771f Merge branch 'main' of http://git.ts.e57.cn/chfei/29WxOrder 2026-10-19 18:05:27 +08:00
chfei e96871a87a 修复工单 推送连接失败bug 2026-10-19 18:05:20 +08:00
124 changed files with 19766 additions and 7689 deletions

No files matched your search

+63
View File
@@ -0,0 +1,63 @@
###############################################################################
# Set default behavior to automatically normalize line endings.
###############################################################################
* text=auto
###############################################################################
# Set default behavior for command prompt diff.
#
# This is need for earlier builds of msysgit that does not have it on by
# default for csharp files.
# Note: This is only used by command line
###############################################################################
#*.cs diff=csharp
###############################################################################
# Set the merge driver for project and solution files
#
# Merging from the command prompt will add diff markers to the files if there
# are conflicts (Merging from VS is not affected by the settings below, in VS
# the diff markers are never inserted). Diff markers may cause the following
# file extensions to fail to load in VS. An alternative would be to treat
# these files as binary and thus will always conflict and require user
# intervention with every merge. To do so, just uncomment the entries below
###############################################################################
#*.sln merge=binary
#*.csproj merge=binary
#*.vbproj merge=binary
#*.vcxproj merge=binary
#*.vcproj merge=binary
#*.dbproj merge=binary
#*.fsproj merge=binary
#*.lsproj merge=binary
#*.wixproj merge=binary
#*.modelproj merge=binary
#*.sqlproj merge=binary
#*.wwaproj merge=binary
###############################################################################
# behavior for image files
#
# image files are treated as binary by default.
###############################################################################
#*.jpg binary
#*.png binary
#*.gif binary
###############################################################################
# diff behavior for common document formats
#
# Convert binary document formats to text before diffing them. This feature
# is only available from the command line. Turn it on by uncommenting the
# entries below.
###############################################################################
#*.doc diff=astextplain
#*.DOC diff=astextplain
#*.docx diff=astextplain
#*.DOCX diff=astextplain
#*.dot diff=astextplain
#*.DOT diff=astextplain
#*.pdf diff=astextplain
#*.PDF diff=astextplain
#*.rtf diff=astextplain
#*.RTF diff=astextplain
+2 -1
View File
@@ -67,11 +67,12 @@
<!-- 资源文件:SDK 样式工程默认不会把图片/图标作为 Resource,这里按原工程显式声明 --> <!-- 资源文件:SDK 样式工程默认不会把图片/图标作为 Resource,这里按原工程显式声明 -->
<ItemGroup> <ItemGroup>
<Resource Include="Resources\**\*" /> <Resource Include="Resources\**\*" />
<None Remove="Ctrls\BuyerCtrls\Resources\pdd_afterorder.js" />
<None Remove="Ctrls\PDDInvoice\Resources\invoice.js" /> <None Remove="Ctrls\PDDInvoice\Resources\invoice.js" />
<None Remove="Ctrls\PDDInvoice\Resources\order.js" /> <None Remove="Ctrls\PDDInvoice\Resources\order.js" />
<Resource Include="29wx.ico" /> <Resource Include="29wx.ico" />
<Resource Include="29_common_icon.ico" /> <Resource Include="29_common_icon.ico" />
<Resource Include="Ctrls\OrderCtrls\Resources\tbAutoAddress.js" /> <Resource Include="Ctrls\BuyerCtrls\Resources\pdd_afterorder.js" />
<Resource Include="Ctrls\PDDInvoice\Resources\invoice.js" /> <Resource Include="Ctrls\PDDInvoice\Resources\invoice.js" />
<Resource Include="Ctrls\PDDInvoice\Resources\order.js" /> <Resource Include="Ctrls\PDDInvoice\Resources\order.js" />
<Resource Include="gear.ico" /> <Resource Include="gear.ico" />
@@ -0,0 +1,90 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<OutputType>WinExe</OutputType>
<TargetFramework>net462</TargetFramework>
<RootNamespace>_29WxOrderWpf</RootNamespace>
<AssemblyName>29WxFindOrder</AssemblyName>
<UseWPF>true</UseWPF>
<ApplicationIcon>gear.ico</ApplicationIcon>
<LangVersion>12</LangVersion>
<PlatformTarget>x64</PlatformTarget>
<OutputPath>..\bin\</OutputPath>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
<Platforms>AnyCPU;x64</Platforms>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)' == 'Release'">
<PlatformTarget>x64</PlatformTarget>
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
<OutputPath>..\..\KJD Cef138\Bin\</OutputPath>
<DefineConstants>TRACE;RELEASE</DefineConstants>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="CefSharp.Common" Version="138.0.340" />
<PackageReference Include="CefSharp.Wpf" Version="138.0.340" />
<PackageReference Include="chromiumembeddedframework.runtime.win-x64" Version="138.0.34" />
<PackageReference Include="chromiumembeddedframework.runtime.win-x86" Version="138.0.34" />
<PackageReference Include="Newtonsoft.Json" Version="9.0.1" />
<PackageReference Include="WPFCommon" Version="1.2.0" />
</ItemGroup>
<ItemGroup>
<Reference Include="System" />
<Reference Include="System.Core" />
<Reference Include="System.Data" />
<Reference Include="System.Data.DataSetExtensions" />
<Reference Include="System.Drawing" />
<Reference Include="System.Management" />
<Reference Include="System.Net.Http" />
<Reference Include="System.Windows.Forms" />
<Reference Include="System.Xml" />
<Reference Include="System.Xml.Linq" />
<Reference Include="Microsoft.CSharp" />
<Reference Include="System.Xaml" />
<Reference Include="WindowsBase" />
<Reference Include="PresentationCore" />
<Reference Include="PresentationFramework" />
</ItemGroup>
<ItemGroup>
<Reference Include="NaiBa.Util">
<HintPath>..\DllReference\NaiBa.Util.dll</HintPath>
<Private>true</Private>
</Reference>
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\AllBase\29WxOrderAllBase.csproj" />
<ProjectReference Include="..\OrderSupportTicket\OrderSupportTicket.csproj" />
<ProjectReference Include="..\Work\29WxOrderWork.csproj" />
<ProjectReference Include="..\WxOrder.Framework\WxOrder.Framework.csproj" />
</ItemGroup>
<!-- 资源文件:SDK 样式工程默认不会把图片/图标作为 Resource,这里按原工程显式声明 -->
<ItemGroup>
<Resource Include="Resources\**\*" />
<None Remove="Ctrls\PDDInvoice\Resources\invoice.js" />
<None Remove="Ctrls\PDDInvoice\Resources\order.js" />
<Resource Include="29wx.ico" />
<Resource Include="29_common_icon.ico" />
<Resource Include="Ctrls\PDDInvoice\Resources\invoice.js" />
<Resource Include="Ctrls\PDDInvoice\Resources\order.js" />
<Resource Include="gear.ico" />
</ItemGroup>
<ItemGroup>
<Compile Update="Ctrls\BuyerCtrls\PddBuyOrderCtrl.xaml.cs">
<SubType>Code</SubType>
</Compile>
<Compile Update="Views\ChangePickNoView.xaml.cs">
<SubType>Code</SubType>
</Compile>
</ItemGroup>
<ItemGroup>
<Folder Include="Common\" />
</ItemGroup>
</Project>
+7 -7
View File
@@ -108,7 +108,7 @@ namespace _29WxOrderWpf
string str = GetExceptionMsg(ex, string.Empty); string str = GetExceptionMsg(ex, string.Empty);
NaiBa.Util.Helper.LogHelper.WriteWithTime("SystemError:" + str); NaiBa.Util.Helper.LogHelper.WriteWithTime("SystemError:" + str);
//BaseMsgForm.ShowError(str, "系统错误"); //BaseMsgForm.ShowError(str, "系统错误");
BaseMsgWindow.ShowError(str, "系统错误"); BaseMsgWindow.ShowError(str, "系统错误", null, MsgWindowLevel.LARGE);
} }
#region 初始化cef #region 初始化cef
@@ -157,15 +157,15 @@ namespace _29WxOrderWpf
{ {
string str = GetExceptionMsg(e.Exception, e.ToString()); string str = GetExceptionMsg(e.Exception, e.ToString());
NaiBa.Util.Helper.LogHelper.WriteWithTime("SystemError:" + str); NaiBa.Util.Helper.LogHelper.WriteWithTime("SystemError:" + str);
BaseMsgWindow.ShowError(str, "系统错误"); BaseMsgWindow.ShowError(str, "系统错误", null, MsgWindowLevel.LARGE);
} }
static void CurrentDomain_UnhandledException(object sender, UnhandledExceptionEventArgs e) static void CurrentDomain_UnhandledException(object sender, UnhandledExceptionEventArgs e)
{ {
string str = GetExceptionMsg(e.ExceptionObject as Exception, e.ToString()); string str = GetExceptionMsg(e.ExceptionObject as Exception, e.ToString());
NaiBa.Util.Helper.LogHelper.WriteWithTime("SystemError:" + str); NaiBa.Util.Helper.LogHelper.WriteWithTime("SystemError:" + str);
BaseMsgWindow.ShowError(str, "系统错误"); BaseMsgWindow.ShowError(str, "系统错误", null, MsgWindowLevel.LARGE);
} }
/// <summary> /// <summary>
/// 生成自定义异常消息 /// 生成自定义异常消息
@@ -190,8 +190,8 @@ namespace _29WxOrderWpf
} }
sb.AppendLine("***************************************************************"); sb.AppendLine("***************************************************************");
NaiBa.Util.Helper.LogHelper.WriteWithTime("Error:" + sb); NaiBa.Util.Helper.LogHelper.WriteWithTime("Error:" + sb);
BaseMsgWindow.ShowError(sb.ToString(), "系统错误"); BaseMsgWindow.ShowError(sb.ToString(), "系统错误", null, MsgWindowLevel.LARGE);
return sb.ToString(); return sb.ToString();
} }
/// <summary> /// <summary>
@@ -124,8 +124,8 @@ namespace _29WxOrderWpf.BaseWindows
MainWindow.Instance.borderMessage.BorderBrush = Application.Current.Resources["pageColorBrush"] as SolidColorBrush; MainWindow.Instance.borderMessage.BorderBrush = Application.Current.Resources["pageColorBrush"] as SolidColorBrush;
MainWindow.Instance.tbMessage.Foreground = Application.Current.Resources["pageColorBrush"] as SolidColorBrush; MainWindow.Instance.tbMessage.Foreground = Application.Current.Resources["pageColorBrush"] as SolidColorBrush;
} }
if (type.ToLower() == "error") if (type.ToLower() == "err" || type.ToLower() == "error")
{ {
MainWindow.Instance.borderMessage.BorderBrush = Application.Current.Resources["PageWarningBrush"] as SolidColorBrush; MainWindow.Instance.borderMessage.BorderBrush = Application.Current.Resources["PageWarningBrush"] as SolidColorBrush;
MainWindow.Instance.tbMessage.Foreground = Application.Current.Resources["PageWarningBrush"] as SolidColorBrush; MainWindow.Instance.tbMessage.Foreground = Application.Current.Resources["PageWarningBrush"] as SolidColorBrush;
} }
@@ -19,9 +19,9 @@ namespace _29WxOrderWpf.Converters
return 0; return 0;
return listView.ItemContainerGenerator.IndexFromContainer(item) + 1; return listView.ItemContainerGenerator.IndexFromContainer(item) + 1;
} }
public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture) public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
{ {
throw new NotImplementedException(); throw new NotImplementedException();
} }
@@ -98,9 +98,9 @@
<Button <Button
x:Name="btnNextBuyer" x:Name="btnNextBuyer"
Grid.Column="8" Grid.Column="8"
Padding="4,0"
Height="24" Height="24"
Margin="4,0,0,0" Margin="4,0,0,0"
Padding="4,0"
Click="btnNextBuyer_Click" Click="btnNextBuyer_Click"
Content="下一个买手" Content="下一个买手"
Style="{StaticResource BasePageButtonStyle}" /> Style="{StaticResource BasePageButtonStyle}" />
@@ -273,7 +273,8 @@
Margin="180,0,0,0" Margin="180,0,0,0"
VerticalAlignment="Center" VerticalAlignment="Center"
Panel.ZIndex="1" Panel.ZIndex="1"
Content="正在操作:" /> d:Content="正在操作:"
Content="{Binding LblMsgStr}" />
<TabControl <TabControl
x:Name="tabOrderType" x:Name="tabOrderType"
@@ -363,6 +364,7 @@
RowHeaderWidth="0" RowHeaderWidth="0"
RowHeight="50" RowHeight="50"
SelectionChanged="dgBuyerOrder_SelectionChanged" SelectionChanged="dgBuyerOrder_SelectionChanged"
SelectionUnit="Cell"
VerticalGridLinesBrush="{StaticResource VerticalGridLinesBrush}"> VerticalGridLinesBrush="{StaticResource VerticalGridLinesBrush}">
<DataGrid.Columns> <DataGrid.Columns>
<DataGridTextColumn <DataGridTextColumn
@@ -381,7 +383,7 @@
</DataGridTextColumn> </DataGridTextColumn>
<DataGridTextColumn <DataGridTextColumn
Width="0.6*" Width="0.6*"
Binding="{Binding WxSendTypeStr}" Binding="{Binding WxSendTypeStr, Mode=OneWay}"
Header="是否直发"> Header="是否直发">
<DataGridTextColumn.ElementStyle> <DataGridTextColumn.ElementStyle>
<Style TargetType="TextBlock"> <Style TargetType="TextBlock">
@@ -393,7 +395,7 @@
</DataGridTextColumn> </DataGridTextColumn>
<DataGridTextColumn <DataGridTextColumn
Width="1.5*" Width="1.5*"
Binding="{Binding order_sn}" Binding="{Binding order_sn, Mode=OneWay}"
Header="拍单订单号"> Header="拍单订单号">
<DataGridTextColumn.ElementStyle> <DataGridTextColumn.ElementStyle>
<Style TargetType="TextBlock"> <Style TargetType="TextBlock">
@@ -405,7 +407,7 @@
</DataGridTextColumn> </DataGridTextColumn>
<DataGridTextColumn <DataGridTextColumn
Width="1.5*" Width="1.5*"
Binding="{Binding ShopOrderIdStr}" Binding="{Binding ShopOrderIdStr, Mode=OneWay}"
Header="店铺订单号"> Header="店铺订单号">
<DataGridTextColumn.ElementStyle> <DataGridTextColumn.ElementStyle>
<Style TargetType="TextBlock"> <Style TargetType="TextBlock">
@@ -417,7 +419,7 @@
</DataGridTextColumn> </DataGridTextColumn>
<DataGridTextColumn <DataGridTextColumn
Width="1*" Width="1*"
Binding="{Binding buyerName}" Binding="{Binding buyerName, Mode=OneWay}"
Header="买手名称"> Header="买手名称">
<DataGridTextColumn.ElementStyle> <DataGridTextColumn.ElementStyle>
<Style TargetType="TextBlock"> <Style TargetType="TextBlock">
@@ -429,7 +431,7 @@
</DataGridTextColumn> </DataGridTextColumn>
<DataGridTextColumn <DataGridTextColumn
Width="0.8*" Width="0.8*"
Binding="{Binding OrderTimeStr}" Binding="{Binding OrderTimeStr, Mode=OneWay}"
Header="拍单时间"> Header="拍单时间">
<DataGridTextColumn.ElementStyle> <DataGridTextColumn.ElementStyle>
<Style TargetType="TextBlock"> <Style TargetType="TextBlock">
@@ -441,7 +443,7 @@
</DataGridTextColumn> </DataGridTextColumn>
<DataGridTextColumn <DataGridTextColumn
Width="1.8*" Width="1.8*"
Binding="{Binding ProdInfoStr}" Binding="{Binding ProdInfoStr, Mode=OneWay}"
Header="商品信息"> Header="商品信息">
<DataGridTextColumn.ElementStyle> <DataGridTextColumn.ElementStyle>
<Style TargetType="TextBlock"> <Style TargetType="TextBlock">
@@ -453,7 +455,7 @@
</DataGridTextColumn> </DataGridTextColumn>
<DataGridTextColumn <DataGridTextColumn
Width="0.8*" Width="0.8*"
Binding="{Binding AmoutValue}" Binding="{Binding AmoutValue, Mode=OneWay}"
Header="金额"> Header="金额">
<DataGridTextColumn.ElementStyle> <DataGridTextColumn.ElementStyle>
<Style TargetType="TextBlock"> <Style TargetType="TextBlock">
@@ -465,7 +467,7 @@
</DataGridTextColumn> </DataGridTextColumn>
<DataGridTextColumn <DataGridTextColumn
Width="1*" Width="1*"
Binding="{Binding order_status_prompt}" Binding="{Binding order_status_prompt, Mode=OneWay}"
Header="订单状态"> Header="订单状态">
<DataGridTextColumn.ElementStyle> <DataGridTextColumn.ElementStyle>
<Style TargetType="TextBlock"> <Style TargetType="TextBlock">
@@ -477,7 +479,7 @@
</DataGridTextColumn> </DataGridTextColumn>
<DataGridTextColumn <DataGridTextColumn
Width="1*" Width="1*"
Binding="{Binding outExpressCompanyCode}" Binding="{Binding outExpressCompanyCode, Mode=OneWay}"
Header="物流名称"> Header="物流名称">
<!-- outExpressCompanyName --> <!-- outExpressCompanyName -->
<DataGridTextColumn.ElementStyle> <DataGridTextColumn.ElementStyle>
@@ -490,7 +492,7 @@
</DataGridTextColumn> </DataGridTextColumn>
<DataGridTextColumn <DataGridTextColumn
Width="1*" Width="1*"
Binding="{Binding tracking_number}" Binding="{Binding tracking_number, Mode=OneWay}"
Header="物流单号"> Header="物流单号">
<DataGridTextColumn.ElementStyle> <DataGridTextColumn.ElementStyle>
<Style TargetType="TextBlock"> <Style TargetType="TextBlock">
@@ -502,7 +504,7 @@
</DataGridTextColumn> </DataGridTextColumn>
<DataGridTextColumn <DataGridTextColumn
Width="1*" Width="1*"
Binding="{Binding sendStatus}" Binding="{Binding sendStatus, Mode=OneWay}"
Header="订单信息"> Header="订单信息">
<DataGridTextColumn.ElementStyle> <DataGridTextColumn.ElementStyle>
<Style TargetType="TextBlock"> <Style TargetType="TextBlock">
@@ -532,7 +534,7 @@
Click="btnSendBuyerOrder_Click" Click="btnSendBuyerOrder_Click"
Content="发送" Content="发送"
Foreground="{StaticResource PageLinkBrush}" Foreground="{StaticResource PageLinkBrush}"
Visibility="{Binding TransitWarehouseIdStr, Converter={StaticResource HasTextVisibility}}" /> Visibility="{Binding TransitWarehouseIdStr, Converter={StaticResource HasTextVisibility}, Mode=OneWay}" />
<Button <Button
x:Name="btnSendDirectBuyerOrder" x:Name="btnSendDirectBuyerOrder"
Grid.Row="2" Grid.Row="2"
@@ -545,7 +547,7 @@
Click="btnSendBuyerOrder_Click" Click="btnSendBuyerOrder_Click"
Content="发送" Content="发送"
Foreground="{StaticResource PageLinkBrush}" Foreground="{StaticResource PageLinkBrush}"
Visibility="{Binding WxSendTypeStr, Converter={StaticResource HasTextVisibility}}" /> Visibility="{Binding WxSendTypeStr, Converter={StaticResource HasTextVisibility}, Mode=OneWay}" />
<!-- 直发单直发标注不为空 --> <!-- 直发单直发标注不为空 -->
</Grid> </Grid>
</DataTemplate> </DataTemplate>
@@ -567,11 +569,12 @@
LoadingRow="dgBuyerOrder_LoadingRow" LoadingRow="dgBuyerOrder_LoadingRow"
RowHeaderWidth="0" RowHeaderWidth="0"
RowHeight="50" RowHeight="50"
SelectionUnit="Cell"
VerticalGridLinesBrush="{StaticResource VerticalGridLinesBrush}"> VerticalGridLinesBrush="{StaticResource VerticalGridLinesBrush}">
<DataGrid.Columns> <DataGrid.Columns>
<DataGridTextColumn <DataGridTextColumn
Width="40" Width="40"
Binding="{Binding Header, RelativeSource={RelativeSource AncestorType={x:Type DataGridRow}, Mode=FindAncestor}}" Binding="{Binding Header, RelativeSource={RelativeSource AncestorType={x:Type DataGridRow}, Mode=FindAncestor}, Mode=OneWay}"
CanUserSort="False" CanUserSort="False"
Header="序列" Header="序列"
IsReadOnly="True"> IsReadOnly="True">
@@ -585,7 +588,7 @@
</DataGridTextColumn> </DataGridTextColumn>
<DataGridTextColumn <DataGridTextColumn
Width="0.6*" Width="0.6*"
Binding="{Binding WxSendTypeStr}" Binding="{Binding WxSendTypeStr, Mode=OneWay}"
Header="是否直发"> Header="是否直发">
<DataGridTextColumn.ElementStyle> <DataGridTextColumn.ElementStyle>
<Style TargetType="TextBlock"> <Style TargetType="TextBlock">
@@ -597,7 +600,7 @@
</DataGridTextColumn> </DataGridTextColumn>
<DataGridTextColumn <DataGridTextColumn
Width="1.5*" Width="1.5*"
Binding="{Binding afterSalesId}" Binding="{Binding afterSalesId, Mode=OneWay}"
Header="售后单号"> Header="售后单号">
<DataGridTextColumn.ElementStyle> <DataGridTextColumn.ElementStyle>
<Style TargetType="TextBlock"> <Style TargetType="TextBlock">
@@ -609,7 +612,7 @@
</DataGridTextColumn> </DataGridTextColumn>
<DataGridTextColumn <DataGridTextColumn
Width="1.5*" Width="1.5*"
Binding="{Binding orderSn}" Binding="{Binding orderSn, Mode=OneWay}"
Header="拍单订单号"> Header="拍单订单号">
<DataGridTextColumn.ElementStyle> <DataGridTextColumn.ElementStyle>
<Style TargetType="TextBlock"> <Style TargetType="TextBlock">
@@ -621,7 +624,7 @@
</DataGridTextColumn> </DataGridTextColumn>
<DataGridTextColumn <DataGridTextColumn
Width="1.5*" Width="1.5*"
Binding="{Binding ShopOrderIdStr}" Binding="{Binding ShopOrderIdStr, Mode=OneWay}"
Header="店铺订单号"> Header="店铺订单号">
<DataGridTextColumn.ElementStyle> <DataGridTextColumn.ElementStyle>
<Style TargetType="TextBlock"> <Style TargetType="TextBlock">
@@ -633,7 +636,7 @@
</DataGridTextColumn> </DataGridTextColumn>
<DataGridTextColumn <DataGridTextColumn
Width="1*" Width="1*"
Binding="{Binding buyerName}" Binding="{Binding buyerName, Mode=OneWay}"
Header="买手名称"> Header="买手名称">
<DataGridTextColumn.ElementStyle> <DataGridTextColumn.ElementStyle>
<Style TargetType="TextBlock"> <Style TargetType="TextBlock">
@@ -645,7 +648,7 @@
</DataGridTextColumn> </DataGridTextColumn>
<DataGridTextColumn <DataGridTextColumn
Width="0.8*" Width="0.8*"
Binding="{Binding orderDate}" Binding="{Binding orderDate, Mode=OneWay}"
Header="拍单日期"> Header="拍单日期">
<DataGridTextColumn.ElementStyle> <DataGridTextColumn.ElementStyle>
<Style TargetType="TextBlock"> <Style TargetType="TextBlock">
@@ -657,7 +660,7 @@
</DataGridTextColumn> </DataGridTextColumn>
<DataGridTextColumn <DataGridTextColumn
Width="1.8*" Width="1.8*"
Binding="{Binding ProdInfoStr}" Binding="{Binding ProdInfoStr, Mode=OneWay}"
Header="商品信息"> Header="商品信息">
<DataGridTextColumn.ElementStyle> <DataGridTextColumn.ElementStyle>
<Style TargetType="TextBlock"> <Style TargetType="TextBlock">
@@ -669,7 +672,7 @@
</DataGridTextColumn> </DataGridTextColumn>
<DataGridTextColumn <DataGridTextColumn
Width="0.8*" Width="0.8*"
Binding="{Binding OrderAmountValue}" Binding="{Binding OrderAmountValue, Mode=OneWay}"
Header="订单金额"> Header="订单金额">
<DataGridTextColumn.ElementStyle> <DataGridTextColumn.ElementStyle>
<Style TargetType="TextBlock"> <Style TargetType="TextBlock">
@@ -681,7 +684,7 @@
</DataGridTextColumn> </DataGridTextColumn>
<DataGridTextColumn <DataGridTextColumn
Width="0.8*" Width="0.8*"
Binding="{Binding RefundAmountValue}" Binding="{Binding RefundAmountValue, Mode=OneWay}"
Header="售后金额"> Header="售后金额">
<DataGridTextColumn.ElementStyle> <DataGridTextColumn.ElementStyle>
<Style TargetType="TextBlock"> <Style TargetType="TextBlock">
@@ -693,7 +696,7 @@
</DataGridTextColumn> </DataGridTextColumn>
<DataGridTextColumn <DataGridTextColumn
Width="1*" Width="1*"
Binding="{Binding AfterSaleStatusStr}" Binding="{Binding AfterSaleStatusStr, Mode=OneWay}"
Header="售后状态"> Header="售后状态">
<DataGridTextColumn.ElementStyle> <DataGridTextColumn.ElementStyle>
<Style TargetType="TextBlock"> <Style TargetType="TextBlock">
@@ -705,7 +708,7 @@
</DataGridTextColumn> </DataGridTextColumn>
<DataGridTextColumn <DataGridTextColumn
Width="1*" Width="1*"
Binding="{Binding sendStatus}" Binding="{Binding sendStatus, Mode=OneWay}"
Header="订单信息"> Header="订单信息">
<DataGridTextColumn.ElementStyle> <DataGridTextColumn.ElementStyle>
<Style TargetType="TextBlock"> <Style TargetType="TextBlock">
@@ -720,7 +723,7 @@
<DataTemplate> <DataTemplate>
<Button Grid.Column="1" Grid.Row="2" x:Name="btnSendBuyerOrder" VerticalAlignment="Center" Background="Transparent" HorizontalAlignment="Center" <Button Grid.Column="1" Grid.Row="2" x:Name="btnSendBuyerOrder" VerticalAlignment="Center" Background="Transparent" HorizontalAlignment="Center"
Foreground="{StaticResource PageLinkBrush}" BorderBrush="Transparent" Margin="4,0,0,0" Content="发送" Click="btnSendBuyerOrder_Click" Foreground="{StaticResource PageLinkBrush}" BorderBrush="Transparent" Margin="4,0,0,0" Content="发送" Click="btnSendBuyerOrder_Click"
Visibility="{Binding TransitWarehouseIdStr, Converter={StaticResource HasTextVisibility}}"></Button> Visibility="{Binding TransitWarehouseIdStr, Converter={StaticResource HasTextVisibility}, Mode=OneWay}"></Button>
</DataTemplate> </DataTemplate>
</DataGridTemplateColumn.CellTemplate> </DataGridTemplateColumn.CellTemplate>
</DataGridTemplateColumn>--> </DataGridTemplateColumn>-->
File diff suppressed because it is too large. Load diff
@@ -206,10 +206,9 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
foreach (var order in GlobalConfig.lstOrder) foreach (var order in GlobalConfig.lstOrder)
{ {
//OrderListCtrl.InitOrderObservableProp(order); //OrderListCtrl.InitOrderObservableProp(order);
foreach (var orderItem in order.orderItems) foreach (var orderItem in order.OrderItems)
{ {
orderItem.UpdateOrderItemBuyButton(); orderItem.UpdateOrderItemBuyButton();
orderItem.SetAbnormalAndDirectBtnVisibility();
} }
} }
} }
@@ -221,10 +220,9 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
foreach (var order in GlobalConfig.lstOrder) foreach (var order in GlobalConfig.lstOrder)
{ {
//OrderListCtrl.InitOrderObservableProp(order); //OrderListCtrl.InitOrderObservableProp(order);
foreach (var orderItem in order.orderItems) foreach (var orderItem in order.OrderItems)
{ {
orderItem.UpdateOrderItemBuyButton(); orderItem.UpdateOrderItemBuyButton();
orderItem.SetAbnormalAndDirectBtnVisibility();
} }
} }
} }
@@ -347,7 +345,7 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
foreach (var order in GlobalConfig.lstOrder) foreach (var order in GlobalConfig.lstOrder)
{ {
//OrderListCtrl.InitOrderObservableProp(order); //OrderListCtrl.InitOrderObservableProp(order);
foreach (var orderItem in order.orderItems) foreach (var orderItem in order.OrderItems)
{ {
await Task.Run(() => await Task.Run(() =>
{ {
@@ -366,7 +364,7 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
foreach (var order in GlobalConfig.lstOrder) foreach (var order in GlobalConfig.lstOrder)
{ {
//OrderListCtrl.InitOrderObservableProp(order); //OrderListCtrl.InitOrderObservableProp(order);
foreach (var orderItem in order.orderItems) foreach (var orderItem in order.OrderItems)
{ {
await Task.Run(() => await Task.Run(() =>
{ {
@@ -0,0 +1,735 @@
<UserControl
x:Class="_29WxOrderWpf.Ctrls.BuyerCtrls.PDDMultiBuyerOrderReadCtrl"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:local="clr-namespace:_29WxOrderWpf.Ctrls.BuyerCtrls"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
x:Name="pddMultiBuyerOrderReadCtrl"
d:DesignHeight="450"
d:DesignWidth="1000"
Loaded="UserControl_Loaded"
mc:Ignorable="d">
<Border
Background="White"
BorderBrush="{StaticResource pageColorBrush}"
BorderThickness="1,1,0,1"
CornerRadius="5,0,0,5">
<Grid>
<Grid.RowDefinitions>
<RowDefinition Height="40" />
<RowDefinition Height="*" />
</Grid.RowDefinitions>
<Button
x:Name="btnHideAll"
Grid.Row="1"
Width="25"
Height="60"
Margin="-20,0,0,20"
HorizontalAlignment="left"
Click="btnHideAll_Click"
Style="{StaticResource BasePageButtonStyle}">
<TextBlock Margin="0,0,5,0">
关<LineBreak />
闭</TextBlock>
</Button>
<Grid Margin="0,0,0,0">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="auto" />
<ColumnDefinition Width="auto" />
<ColumnDefinition Width="*" />
<ColumnDefinition Width="auto" />
</Grid.ColumnDefinitions>
<Image
Width="16"
Height="16"
Margin="12,0,4,0"
Cursor="Hand"
MouseLeftButtonUp="btnHideAll_Click"
Source="{StaticResource imgCloseGray}"
Visibility="Collapsed" />
<WrapPanel Grid.Column="1" VerticalAlignment="Center">
<CheckBox
x:Name="chkAutoReadBuyerOrder"
Margin="6,0"
HorizontalAlignment="Left"
VerticalAlignment="Center"
BorderBrush="{StaticResource mainColorBrush}"
Checked="chkAutoReadBuyerOrder_CheckedChanged"
Content="自动读多多买手单"
FontSize="12"
IsChecked="true"
Unchecked="chkAutoReadBuyerOrder_CheckedChanged" />
<CheckBox
x:Name="chkHideNoWxIdOrder"
Margin="6,0"
HorizontalAlignment="Left"
VerticalAlignment="Center"
BorderBrush="{StaticResource mainColorBrush}"
Checked="chkHideNoWxIdOrder_CheckedChanged"
Content="隐藏无微信订单的买手单"
FontSize="12"
IsChecked="True"
Unchecked="chkHideNoWxIdOrder_CheckedChanged" />
<CheckBox
x:Name="chkAutoAfterSale"
Margin="6,0"
HorizontalAlignment="Left"
VerticalAlignment="Center"
BorderBrush="{StaticResource mainColorBrush}"
Checked="chkAutoAfterSale_Checked"
Content="未发货订单自动售后"
FontSize="12"
IsChecked="True"
Unchecked="chkAutoAfterSale_Checked"
Visibility="Visible" />
<Button
x:Name="btnSearch"
Grid.Column="8"
Width="118"
Height="24"
Margin="4,0,0,0"
Click="btnSearch_Click"
Content="刷新订单"
Style="{StaticResource BasePageButtonStyle}" />
<Button
x:Name="btnNextBuyer"
Grid.Column="8"
Height="24"
Margin="4,0,0,0"
Padding="4,0"
Click="btnNextBuyer_Click"
Content="下一个买手"
Style="{StaticResource BasePageButtonStyle}" />
</WrapPanel>
<TextBox
x:Name="txtFilter"
Grid.Column="2"
Height="28"
Margin="28,0,8,0"
VerticalContentAlignment="Center"
BorderBrush="{StaticResource pageColorBrush}"
BorderThickness="1"
Style="{StaticResource BaseRoundCornerTextBoxStyle}"
TextChanged="txtFilter_TextChanged" />
<Button
x:Name="btnFilter"
Grid.Column="3"
Width="50"
Height="24"
Margin="4,0,8,0"
Click="btnFilter_Click"
Content="过滤"
Style="{StaticResource BasePageButtonStyle}" />
</Grid>
<Grid
x:Name="GridCef"
Grid.Row="1"
Background="LightGray" />
<Grid
Grid.Row="1"
Margin="2,2,0,334"
HorizontalAlignment="Left">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="auto" />
<ColumnDefinition Width="auto" />
</Grid.ColumnDefinitions>
<Border
x:Name="borderPddBuyer"
Width="138"
Background="White"
CornerRadius="0,4,4,0">
<Grid>
<ListBox x:Name="lbPddBuyer">
<!-- 使用自定义属性模板去除ListBox高亮显示框 -->
<ListBox.ItemContainerStyle>
<Style TargetType="ListBoxItem">
<Setter Property="Template">
<Setter.Value>
<ControlTemplate TargetType="ListBoxItem">
<ContentPresenter
Content="{TemplateBinding Content}"
ContentStringFormat="{TemplateBinding ContentStringFormat}"
ContentTemplate="{TemplateBinding ContentTemplate}" />
</ControlTemplate>
</Setter.Value>
</Setter>
</Style>
</ListBox.ItemContainerStyle>
<ListBox.ItemTemplate>
<DataTemplate>
<!--<local:ShopListRowCtrl></local:ShopListRowCtrl>-->
<Border
MinHeight="50"
Margin="0,0,0,0"
HorizontalAlignment="Stretch"
VerticalAlignment="Stretch"
BorderBrush="{StaticResource ListRowBorderColorBrush}"
BorderThickness="0,0,0,1"
CornerRadius="0">
<Border.Style>
<!-- 鼠标进入或悬停Border时切换颜色(悬停时Border的填充控件必须有填充Border,所在层级不限,仅填充透明Grid则触发器无效) -->
<Style TargetType="Border">
<Style.Triggers>
<Trigger Property="IsMouseOver" Value="True">
<Setter Property="Background" Value="{StaticResource ListRowHoverBackColorBrush}" />
</Trigger>
</Style.Triggers>
</Style>
</Border.Style>
<Grid x:Name="gridListItem">
<Grid.ColumnDefinitions>
<ColumnDefinition x:Name="colCheck" Width="25*" />
<ColumnDefinition x:Name="colBuyerName" Width="100*" />
</Grid.ColumnDefinitions>
<CheckBox
Grid.Column="0"
HorizontalAlignment="Center"
VerticalAlignment="Center"
Background="Transparent"
Click="CheckBox_Click"
IsChecked="{Binding IsSelect, Mode=TwoWay}" />
<TextBox
x:Name="txtBuyerNick"
Grid.Column="1"
HorizontalContentAlignment="Left"
VerticalContentAlignment="Center"
Background="Transparent"
BorderThickness="0"
Cursor="Hand"
IsReadOnly="True"
Loaded="txtBuyerNick_Loaded"
Text="{Binding buyer_nick}"
TextWrapping="Wrap" />
</Grid>
</Border>
</DataTemplate>
</ListBox.ItemTemplate>
</ListBox>
</Grid>
</Border>
<Border
Grid.Column="1"
Height="60"
Margin="-2,0,0,0"
VerticalAlignment="Center"
Panel.ZIndex="-1"
Background="{StaticResource pageColorBrush}"
CornerRadius="0,5,5,0"
Cursor="Hand">
<Button
x:Name="btnHideBuyer"
Grid.Column="1"
Width="20"
Height="60"
Margin="0,0,0,0"
Padding="0,0,0,0"
VerticalContentAlignment="Center"
Click="btnHideBuyer_Click"
Content="◀"
Style="{StaticResource BasePageButtonStyle}" />
</Border>
</Grid>
<Grid
Grid.Row="1"
Margin="0"
VerticalAlignment="Bottom"
Background="Transparent"
Visibility="Visible">
<Grid.RowDefinitions>
<RowDefinition Height="auto" />
<RowDefinition />
</Grid.RowDefinitions>
<Button
x:Name="btnHide"
Width="60"
Height="25"
Margin="0,0,0,-10"
Padding="0,2,0,0"
VerticalContentAlignment="top"
Click="btnHide_Click"
Content="▼"
Style="{StaticResource BasePageButtonStyle}" />
<Grid
x:Name="gridTable"
Grid.Row="1"
Height="330"
Margin="2"
VerticalAlignment="Bottom"
Background="White"
Visibility="Visible">
<Grid.RowDefinitions>
<RowDefinition Height="40" />
<RowDefinition Height="*" />
</Grid.RowDefinitions>
<Label
x:Name="lblMsg"
Margin="180,0,0,0"
VerticalAlignment="Center"
Panel.ZIndex="1"
Content="正在操作:" />
<TabControl
x:Name="tabOrderType"
Grid.Row="1"
Margin="0,-32,0,1"
VerticalAlignment="Stretch">
<TabControl.Resources>
<Style TargetType="{x:Type TabControl}">
<Setter Property="Template">
<Setter.Value>
<ControlTemplate TargetType="{x:Type TabControl}">
<Grid>
<Grid.RowDefinitions>
<RowDefinition Height="Auto" />
<RowDefinition Height="*" />
</Grid.RowDefinitions>
<Border
Grid.Row="1"
MinHeight="4"
Background="#f8f8f9"
BorderBrush="#e0e0e0"
BorderThickness="1,1,1,0"
CornerRadius="0,4,0,0">
<ContentPresenter x:Name="PART_SelectedContentHost" ContentSource="SelectedContent" />
</Border>
<Border
Margin="0,0,0,0"
HorizontalAlignment="Left"
Background="#e8e8e9"
BorderBrush="#e1e1e1"
BorderThickness="1,1,1,0"
CornerRadius="4,4,0,0">
<TabPanel
x:Name="HeaderPanel"
Background="Transparent"
IsItemsHost="True" />
</Border>
</Grid>
</ControlTemplate>
</Setter.Value>
</Setter>
</Style>
<Style TargetType="TabItem">
<Setter Property="Template">
<Setter.Value>
<ControlTemplate TargetType="TabItem">
<Border
Name="Border"
Margin="-1,-2,-1,0"
BorderThickness="1,1,1,0"
CornerRadius="4,4,0,0">
<ContentPresenter
x:Name="ContentSite"
Margin="10,5"
HorizontalAlignment="Center"
VerticalAlignment="Center"
ContentSource="Header" />
</Border>
<ControlTemplate.Triggers>
<Trigger Property="IsSelected" Value="True">
<Setter TargetName="Border" Property="Background" Value="#f8f8f9" />
<Setter TargetName="Border" Property="BorderBrush" Value="#e0e0e0" />
<Setter TargetName="Border" Property="Margin" Value="-1,-3,-1,-1" />
<Setter Property="Foreground" Value="{StaticResource pageColorBrush}" />
<Setter Property="Panel.ZIndex" Value="100" />
</Trigger>
<Trigger Property="IsSelected" Value="False">
<Setter TargetName="Border" Property="Background" Value="Transparent" />
<Setter Property="Foreground" Value="#999999" />
</Trigger>
</ControlTemplate.Triggers>
</ControlTemplate>
</Setter.Value>
</Setter>
</Style>
</TabControl.Resources>
<TabItem Header="买手订单">
<DataGrid
x:Name="dgBuyerOrder"
Grid.Row="1"
AutoGenerateColumns="False"
CanUserAddRows="False"
CanUserDeleteRows="False"
ColumnHeaderHeight="30"
HorizontalGridLinesBrush="{StaticResource HorizontalGridLinesBrush}"
LoadingRow="dgBuyerOrder_LoadingRow"
RowHeaderWidth="0"
RowHeight="50"
SelectionChanged="dgBuyerOrder_SelectionChanged"
VerticalGridLinesBrush="{StaticResource VerticalGridLinesBrush}">
<DataGrid.Columns>
<DataGridTextColumn
Width="40"
Binding="{Binding Header, RelativeSource={RelativeSource AncestorType={x:Type DataGridRow}, Mode=FindAncestor}}"
CanUserSort="False"
Header="序列"
IsReadOnly="True">
<DataGridTextColumn.ElementStyle>
<Style TargetType="TextBlock">
<Setter Property="TextWrapping" Value="Wrap" />
<Setter Property="VerticalAlignment" Value="Center" />
<Setter Property="Margin" Value="5" />
</Style>
</DataGridTextColumn.ElementStyle>
</DataGridTextColumn>
<DataGridTextColumn
Width="0.6*"
Binding="{Binding WxSendTypeStr}"
Header="是否直发">
<DataGridTextColumn.ElementStyle>
<Style TargetType="TextBlock">
<Setter Property="TextWrapping" Value="Wrap" />
<Setter Property="VerticalAlignment" Value="Center" />
<Setter Property="Margin" Value="5" />
</Style>
</DataGridTextColumn.ElementStyle>
</DataGridTextColumn>
<DataGridTextColumn
Width="1.5*"
Binding="{Binding order_sn}"
Header="拍单订单号">
<DataGridTextColumn.ElementStyle>
<Style TargetType="TextBlock">
<Setter Property="TextWrapping" Value="Wrap" />
<Setter Property="VerticalAlignment" Value="Center" />
<Setter Property="Margin" Value="5" />
</Style>
</DataGridTextColumn.ElementStyle>
</DataGridTextColumn>
<DataGridTextColumn
Width="1.5*"
Binding="{Binding ShopOrderIdStr}"
Header="店铺订单号">
<DataGridTextColumn.ElementStyle>
<Style TargetType="TextBlock">
<Setter Property="TextWrapping" Value="Wrap" />
<Setter Property="VerticalAlignment" Value="Center" />
<Setter Property="Margin" Value="5" />
</Style>
</DataGridTextColumn.ElementStyle>
</DataGridTextColumn>
<DataGridTextColumn
Width="1*"
Binding="{Binding buyerName}"
Header="买手名称">
<DataGridTextColumn.ElementStyle>
<Style TargetType="TextBlock">
<Setter Property="TextWrapping" Value="Wrap" />
<Setter Property="VerticalAlignment" Value="Center" />
<Setter Property="Margin" Value="5" />
</Style>
</DataGridTextColumn.ElementStyle>
</DataGridTextColumn>
<DataGridTextColumn
Width="0.8*"
Binding="{Binding OrderTimeStr}"
Header="拍单时间">
<DataGridTextColumn.ElementStyle>
<Style TargetType="TextBlock">
<Setter Property="TextWrapping" Value="Wrap" />
<Setter Property="VerticalAlignment" Value="Center" />
<Setter Property="Margin" Value="5" />
</Style>
</DataGridTextColumn.ElementStyle>
</DataGridTextColumn>
<DataGridTextColumn
Width="1.8*"
Binding="{Binding ProdInfoStr}"
Header="商品信息">
<DataGridTextColumn.ElementStyle>
<Style TargetType="TextBlock">
<Setter Property="TextWrapping" Value="Wrap" />
<Setter Property="VerticalAlignment" Value="Center" />
<Setter Property="Margin" Value="5" />
</Style>
</DataGridTextColumn.ElementStyle>
</DataGridTextColumn>
<DataGridTextColumn
Width="0.8*"
Binding="{Binding AmoutValue}"
Header="金额">
<DataGridTextColumn.ElementStyle>
<Style TargetType="TextBlock">
<Setter Property="TextWrapping" Value="Wrap" />
<Setter Property="VerticalAlignment" Value="Center" />
<Setter Property="Margin" Value="5" />
</Style>
</DataGridTextColumn.ElementStyle>
</DataGridTextColumn>
<DataGridTextColumn
Width="1*"
Binding="{Binding order_status_prompt}"
Header="订单状态">
<DataGridTextColumn.ElementStyle>
<Style TargetType="TextBlock">
<Setter Property="TextWrapping" Value="Wrap" />
<Setter Property="VerticalAlignment" Value="Center" />
<Setter Property="Margin" Value="5" />
</Style>
</DataGridTextColumn.ElementStyle>
</DataGridTextColumn>
<DataGridTextColumn
Width="1*"
Binding="{Binding outExpressCompanyCode}"
Header="物流名称">
<!-- outExpressCompanyName -->
<DataGridTextColumn.ElementStyle>
<Style TargetType="TextBlock">
<Setter Property="TextWrapping" Value="Wrap" />
<Setter Property="VerticalAlignment" Value="Center" />
<Setter Property="Margin" Value="5" />
</Style>
</DataGridTextColumn.ElementStyle>
</DataGridTextColumn>
<DataGridTextColumn
Width="1*"
Binding="{Binding tracking_number}"
Header="物流单号">
<DataGridTextColumn.ElementStyle>
<Style TargetType="TextBlock">
<Setter Property="TextWrapping" Value="Wrap" />
<Setter Property="VerticalAlignment" Value="Center" />
<Setter Property="Margin" Value="5" />
</Style>
</DataGridTextColumn.ElementStyle>
</DataGridTextColumn>
<DataGridTextColumn
Width="1*"
Binding="{Binding sendStatus}"
Header="订单信息">
<DataGridTextColumn.ElementStyle>
<Style TargetType="TextBlock">
<Setter Property="TextWrapping" Value="Wrap" />
<Setter Property="VerticalAlignment" Value="Center" />
<Setter Property="Margin" Value="5" />
</Style>
</DataGridTextColumn.ElementStyle>
</DataGridTextColumn>
<DataGridTemplateColumn
x:Name="colSendBuyerOrder"
Width="0.6*"
Header="手动发送">
<DataGridTemplateColumn.CellTemplate>
<DataTemplate>
<Grid>
<Button
x:Name="btnSendBuyerOrder"
Grid.Row="2"
Grid.Column="1"
Margin="4,0,0,0"
HorizontalAlignment="Center"
VerticalAlignment="Center"
Background="Transparent"
BorderBrush="Transparent"
Click="btnSendBuyerOrder_Click"
Content="发送"
Foreground="{StaticResource PageLinkBrush}"
Visibility="{Binding TransitWarehouseIdStr, Converter={StaticResource HasTextVisibility}}" />
<Button
x:Name="btnSendDirectBuyerOrder"
Grid.Row="2"
Grid.Column="1"
Margin="4,0,0,0"
HorizontalAlignment="Center"
VerticalAlignment="Center"
Background="Transparent"
BorderBrush="Transparent"
Click="btnSendBuyerOrder_Click"
Content="发送"
Foreground="{StaticResource PageLinkBrush}"
Visibility="{Binding WxSendTypeStr, Converter={StaticResource HasTextVisibility}}" />
<!-- 直发单直发标注不为空 -->
</Grid>
</DataTemplate>
</DataGridTemplateColumn.CellTemplate>
</DataGridTemplateColumn>
</DataGrid.Columns>
</DataGrid>
</TabItem>
<TabItem Header="买手售后">
<DataGrid
x:Name="dgBuyerAfterSale"
Grid.Row="1"
AutoGenerateColumns="False"
CanUserAddRows="False"
CanUserDeleteRows="False"
ColumnHeaderHeight="30"
HorizontalGridLinesBrush="{StaticResource HorizontalGridLinesBrush}"
LoadingRow="dgBuyerOrder_LoadingRow"
RowHeaderWidth="0"
RowHeight="50"
VerticalGridLinesBrush="{StaticResource VerticalGridLinesBrush}">
<DataGrid.Columns>
<DataGridTextColumn
Width="40"
Binding="{Binding Header, RelativeSource={RelativeSource AncestorType={x:Type DataGridRow}, Mode=FindAncestor}}"
CanUserSort="False"
Header="序列"
IsReadOnly="True">
<DataGridTextColumn.ElementStyle>
<Style TargetType="TextBlock">
<Setter Property="TextWrapping" Value="Wrap" />
<Setter Property="VerticalAlignment" Value="Center" />
<Setter Property="Margin" Value="5" />
</Style>
</DataGridTextColumn.ElementStyle>
</DataGridTextColumn>
<DataGridTextColumn
Width="0.6*"
Binding="{Binding WxSendTypeStr}"
Header="是否直发">
<DataGridTextColumn.ElementStyle>
<Style TargetType="TextBlock">
<Setter Property="TextWrapping" Value="Wrap" />
<Setter Property="VerticalAlignment" Value="Center" />
<Setter Property="Margin" Value="5" />
</Style>
</DataGridTextColumn.ElementStyle>
</DataGridTextColumn>
<DataGridTextColumn
Width="1.5*"
Binding="{Binding afterSalesId}"
Header="售后单号">
<DataGridTextColumn.ElementStyle>
<Style TargetType="TextBlock">
<Setter Property="TextWrapping" Value="Wrap" />
<Setter Property="VerticalAlignment" Value="Center" />
<Setter Property="Margin" Value="5" />
</Style>
</DataGridTextColumn.ElementStyle>
</DataGridTextColumn>
<DataGridTextColumn
Width="1.5*"
Binding="{Binding orderSn}"
Header="拍单订单号">
<DataGridTextColumn.ElementStyle>
<Style TargetType="TextBlock">
<Setter Property="TextWrapping" Value="Wrap" />
<Setter Property="VerticalAlignment" Value="Center" />
<Setter Property="Margin" Value="5" />
</Style>
</DataGridTextColumn.ElementStyle>
</DataGridTextColumn>
<DataGridTextColumn
Width="1.5*"
Binding="{Binding ShopOrderIdStr}"
Header="店铺订单号">
<DataGridTextColumn.ElementStyle>
<Style TargetType="TextBlock">
<Setter Property="TextWrapping" Value="Wrap" />
<Setter Property="VerticalAlignment" Value="Center" />
<Setter Property="Margin" Value="5" />
</Style>
</DataGridTextColumn.ElementStyle>
</DataGridTextColumn>
<DataGridTextColumn
Width="1*"
Binding="{Binding buyerName}"
Header="买手名称">
<DataGridTextColumn.ElementStyle>
<Style TargetType="TextBlock">
<Setter Property="TextWrapping" Value="Wrap" />
<Setter Property="VerticalAlignment" Value="Center" />
<Setter Property="Margin" Value="5" />
</Style>
</DataGridTextColumn.ElementStyle>
</DataGridTextColumn>
<DataGridTextColumn
Width="0.8*"
Binding="{Binding orderDate}"
Header="拍单日期">
<DataGridTextColumn.ElementStyle>
<Style TargetType="TextBlock">
<Setter Property="TextWrapping" Value="Wrap" />
<Setter Property="VerticalAlignment" Value="Center" />
<Setter Property="Margin" Value="5" />
</Style>
</DataGridTextColumn.ElementStyle>
</DataGridTextColumn>
<DataGridTextColumn
Width="1.8*"
Binding="{Binding ProdInfoStr}"
Header="商品信息">
<DataGridTextColumn.ElementStyle>
<Style TargetType="TextBlock">
<Setter Property="TextWrapping" Value="Wrap" />
<Setter Property="VerticalAlignment" Value="Center" />
<Setter Property="Margin" Value="5" />
</Style>
</DataGridTextColumn.ElementStyle>
</DataGridTextColumn>
<DataGridTextColumn
Width="0.8*"
Binding="{Binding OrderAmountValue}"
Header="订单金额">
<DataGridTextColumn.ElementStyle>
<Style TargetType="TextBlock">
<Setter Property="TextWrapping" Value="Wrap" />
<Setter Property="VerticalAlignment" Value="Center" />
<Setter Property="Margin" Value="5" />
</Style>
</DataGridTextColumn.ElementStyle>
</DataGridTextColumn>
<DataGridTextColumn
Width="0.8*"
Binding="{Binding RefundAmountValue}"
Header="售后金额">
<DataGridTextColumn.ElementStyle>
<Style TargetType="TextBlock">
<Setter Property="TextWrapping" Value="Wrap" />
<Setter Property="VerticalAlignment" Value="Center" />
<Setter Property="Margin" Value="5" />
</Style>
</DataGridTextColumn.ElementStyle>
</DataGridTextColumn>
<DataGridTextColumn
Width="1*"
Binding="{Binding AfterSaleStatusStr}"
Header="售后状态">
<DataGridTextColumn.ElementStyle>
<Style TargetType="TextBlock">
<Setter Property="TextWrapping" Value="Wrap" />
<Setter Property="VerticalAlignment" Value="Center" />
<Setter Property="Margin" Value="5" />
</Style>
</DataGridTextColumn.ElementStyle>
</DataGridTextColumn>
<DataGridTextColumn
Width="1*"
Binding="{Binding sendStatus}"
Header="订单信息">
<DataGridTextColumn.ElementStyle>
<Style TargetType="TextBlock">
<Setter Property="TextWrapping" Value="Wrap" />
<Setter Property="VerticalAlignment" Value="Center" />
<Setter Property="Margin" Value="5" />
</Style>
</DataGridTextColumn.ElementStyle>
</DataGridTextColumn>
<!--<DataGridTemplateColumn Width="0.6*" Header="手动发送" x:Name="colSendBuyerOrderAfterSale" >
<DataGridTemplateColumn.CellTemplate>
<DataTemplate>
<Button Grid.Column="1" Grid.Row="2" x:Name="btnSendBuyerOrder" VerticalAlignment="Center" Background="Transparent" HorizontalAlignment="Center"
Foreground="{StaticResource PageLinkBrush}" BorderBrush="Transparent" Margin="4,0,0,0" Content="发送" Click="btnSendBuyerOrder_Click"
Visibility="{Binding TransitWarehouseIdStr, Converter={StaticResource HasTextVisibility}}"></Button>
</DataTemplate>
</DataGridTemplateColumn.CellTemplate>
</DataGridTemplateColumn>-->
</DataGrid.Columns>
</DataGrid>
</TabItem>
</TabControl>
</Grid>
</Grid>
</Grid>
</Border>
</UserControl>
File diff suppressed because it is too large. Load diff
@@ -337,7 +337,7 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
ManualUpdateBuyOrderCommand = new DelegateCommand(ManualUpdateBuyOrder); ManualUpdateBuyOrderCommand = new DelegateCommand(ManualUpdateBuyOrder);
UpdateTransitWarehouseCommand = new DelegateCommand(UpdateTransitWarehouse); UpdateTransitWarehouseCommand = new DelegateCommand(UpdateTransitWarehouse);
this.txtShopNameVal = orderItem.Shop.ShopAccount; this.txtShopNameVal = orderItem?.ItemOrder?.Shop?.ShopAccount;
this.txtOrderIdVal = orderItem.order_id; this.txtOrderIdVal = orderItem.order_id;
this.txtShopSkuIdVal = orderItem.sku_id; this.txtShopSkuIdVal = orderItem.sku_id;
this.txtShopGoodsIdVal = orderItem.product_id; this.txtShopGoodsIdVal = orderItem.product_id;
@@ -346,7 +346,7 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
this.txtShopGoodsNameVal = orderItem.title; this.txtShopGoodsNameVal = orderItem.title;
this.txtShopSpecNameVal = orderItem.SkuAttrStr; this.txtShopSpecNameVal = orderItem.SkuAttrStr;
this.txtShopOrderItemCntVal = orderItem.sku_cnt.ParseToString(); this.txtShopOrderItemCntVal = orderItem.sku_cnt.ParseToString();
this.txtShopOrderItemPriceVal = (orderItem.real_price * 0.01m + orderItem.ItemOrder?.postage_price * 0.01m / orderItem.ItemOrder?.orderItems?.Count).ParseToString(); this.txtShopOrderItemPriceVal = (orderItem.real_price * 0.01m + orderItem.ItemOrder?.postage_price * 0.01m / orderItem.ItemOrder?.OrderItems?.Count).ParseToString();
if (!this.IsMappingGoods && orderItem.TbBuyMap != null) if (!this.IsMappingGoods && orderItem.TbBuyMap != null)
{ {
@@ -626,11 +626,11 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
var pddFrontSkuInfo = new frontSkuInfo3() var pddFrontSkuInfo = new frontSkuInfo3()
{ {
skuId = key.ParseToLong(), skuId = key.ParseToLong(),
skuID = key.ParseToLong(), //skuID = key.ParseToLong(),
goodsId = pddFrontGoods3.goodsId, goodsId = pddFrontGoods3.goodsId,
thumbUrl = thumbUrl, thumbUrl = thumbUrl,
quantity = tbSku2.quantity, //quantity = tbSku2.quantity,
isOnsale = 1, //isOnsale = 1,
spec = taobaoSku?.propPath, // 淘宝格式与拼多多存在差异,包含冒号与父类型id spec = taobaoSku?.propPath, // 淘宝格式与拼多多存在差异,包含冒号与父类型id
specs = pddSpecs, specs = pddSpecs,
price = tbSku2.price.priceMoney.ParseToInt() + 100, price = tbSku2.price.priceMoney.ParseToInt() + 100,
@@ -732,7 +732,7 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
var goods = JsonHelper.DeserializeJsonToObject<pddFrontGoods3Lite>(skuInfo.map_skus); var goods = JsonHelper.DeserializeJsonToObject<pddFrontGoods3Lite>(skuInfo.map_skus);
if (goods == null) if (goods == null)
return; return;
var sku = goods.skus.FirstOrDefault(s => s.skuID.ParseToString() == info.map_sku_id); var sku = goods.skus.FirstOrDefault(s => s.skuId.ParseToString() == info.map_sku_id);
if (sku == null) if (sku == null)
return; return;
@@ -763,7 +763,7 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
var goods = JsonHelper.DeserializeJsonToObject<pddFrontGoods3Lite>(skuInfo.map_skus); var goods = JsonHelper.DeserializeJsonToObject<pddFrontGoods3Lite>(skuInfo.map_skus);
if (goods == null) if (goods == null)
return; return;
var sku = goods.skus.FirstOrDefault(s => s.skuID.ParseToString() == info.map_sku_id); var sku = goods.skus.FirstOrDefault(s => s.skuId.ParseToString() == info.map_sku_id);
if (sku == null) if (sku == null)
return; return;
@@ -829,7 +829,7 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
} }
else else
{ {
return "获取失败,请关闭拍单窗口重试 " + BaseRegex.GetStringXml(ref sourceCodeRst, "msg", sourceCodeRst); return "溯源码获取失败,请关闭拍单窗口重试 " + BaseRegex.GetStringXml(ref sourceCodeRst, "msg", sourceCodeRst);
} }
} }
@@ -926,7 +926,7 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
{ {
if (order.IsWaitBuy) if (order.IsWaitBuy)
{ {
foreach (var item in order.orderItems) foreach (var item in order.OrderItems)
{ {
if (item.out_product_id == upSpuCode || item.product_id == upSpuCode) if (item.out_product_id == upSpuCode || item.product_id == upSpuCode)
{ {
@@ -990,7 +990,7 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
{ {
if (order.IsWaitBuy) if (order.IsWaitBuy)
{ {
foreach (var item in order.orderItems) foreach (var item in order.OrderItems)
{ {
if ((item.out_product_id == tbBuyMap.spu_code && item.out_sku_id == tbBuyMap.sku_code) || if ((item.out_product_id == tbBuyMap.spu_code && item.out_sku_id == tbBuyMap.sku_code) ||
(item.out_product_id == tbBuyMap.spu_code && item.SkuAttrStr == tbBuyMap.sku_code) || (item.out_product_id == tbBuyMap.spu_code && item.SkuAttrStr == tbBuyMap.sku_code) ||
@@ -1022,7 +1022,7 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
/// <summary> /// <summary>
/// 更新拍单成功信息 /// 更新拍单成功信息
/// </summary> /// </summary>
public void ManualUpdateBuyOrder() public async void ManualUpdateBuyOrder()
{ {
if (BuyType == "transit" && txtSourceCodeVal.Trim().Length != 6) if (BuyType == "transit" && txtSourceCodeVal.Trim().Length != 6)
{ {
@@ -1112,31 +1112,28 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
string basePostageKey = WarehousePostageInfo.DicWarehousePostage.Keys.FirstOrDefault(pk => (orderItem.ItemOrder?.province_name).ParseToString().Contains(pk)); string basePostageKey = WarehousePostageInfo.DicWarehousePostage.Keys.FirstOrDefault(pk => (orderItem.ItemOrder?.province_name).ParseToString().Contains(pk));
decimal basePostage = basePostageKey.IsNullOrEmpty() ? WarehousePostageInfo.DicWarehousePostage.Values.Min() : WarehousePostageInfo.DicWarehousePostage[basePostageKey]; decimal basePostage = basePostageKey.IsNullOrEmpty() ? WarehousePostageInfo.DicWarehousePostage.Values.Min() : WarehousePostageInfo.DicWarehousePostage[basePostageKey];
body["oemAmount"] = (BaseClass.PostagePerOrderDiff * 100).ParseToInt().ParseToString(); body["parentOemId"] = BaseClass.ParentOemId;
body["postage"] = ((basePostage + BaseClass.PostagePerOrderDiff) * 100).ParseToInt().ParseToString(); body["parentOemAmount"] = (BaseClass.ParentPostageOemAmount * 100).ParseToInt().ParseToString();
body["oemId"] = BaseClass.OemId;
body["oemAmount"] = (BaseClass.PostageOemAmount * 100).ParseToInt().ParseToString();
body["postage"] = ((basePostage + BaseClass.ParentPostageOemAmount + BaseClass.PostageOemAmount) * 100).ParseToInt().ParseToString();
} }
var url = "https://po.e57.cn/prod-api/api/oms-api/externalProcurement/saveOrUpdate"; var url = "https://po.e57.cn/prod-api/api/oms-api/externalProcurement/saveOrUpdate";
var dataStr = JsonHelper.SerializeObject(body); var dataStr = JsonHelper.SerializeObject(body);
//dataStr = "{\"orderNo\":\"3737339733954942720\",\"outOrderNo\":\"2606846854564\",\"buyerAccount\":\"测试\",\"outAmount\":\"2000\",\"purchaserNote\":\"测试\",\"express1Company\":\"\"" + //dataStr = "{\"orderNo\":\"3737339733954942720\",\"outOrderNo\":\"2606846854564\",\"buyerAccount\":\"测试\",\"outAmount\":\"2000\",\"purchaserNote\":\"测试\",\"express1Company\":\"\"" +
// ",\"express1Waybill\":\"\",\"platform\":\"XDYSHC\",\"orderPlatformCode\":\"WEISHOP\"}"; // ",\"express1Waybill\":\"\",\"platform\":\"XDYSHC\",\"orderPlatformCode\":\"WEISHOP\"}";
var exportRst = HttpResponseWXBLL.e57PostResponse(url, dataStr, ""); var exportRst = await HttpResponseWXBLL.e57PostResponseAsync(url, dataStr);
//<AjaxResult><msg>保存成功</msg><code>200</code></AjaxResult> //<AjaxResult><msg>保存成功</msg><code>200</code></AjaxResult>
//<AjaxResult><msg>订单不存在:373733973395494272</msg><code>500</code></AjaxResult> //<AjaxResult><msg>订单不存在:373733973395494272</msg><code>500</code></AjaxResult>
if (!exportRst.ParseToString().Contains("<code>200</code>")) if (!exportRst.ParseToString().Contains("\"code\":200"))
{
await Task.Delay(500);
exportRst = await HttpResponseWXBLL.e57PostResponseAsync(url, dataStr);
}
if (!exportRst.ParseToString().Contains("\"code\":200"))
{ {
string msg = ""; string msg = "";
string code = ""; msg = BaseRegex.GetStringJsonByRegs(ref exportRst, exportRst, "msg");
try
{
System.Xml.XmlDocument xmlDoc = new System.Xml.XmlDocument();
xmlDoc.LoadXml(exportRst);
code = xmlDoc["AjaxResult"]["code"].InnerText;
msg = xmlDoc["AjaxResult"]["msg"].InnerText;
}
catch
{
msg = exportRst.ParseToString();
}
this.ErrorMsg = "拍单保存失败,服务端返回 " + msg; this.ErrorMsg = "拍单保存失败,服务端返回 " + msg;
Enabled = true; Enabled = true;
return; return;
@@ -1148,10 +1145,13 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
{ {
buyer_account = buyer.buyer_id, buyer_account = buyer.buyer_id,
id = 0, id = 0,
order_void_status = 0,
platform = transit.TransId,
order_no = orderItem.order_id, order_no = orderItem.order_id,
order_sku_id = orderItem.sku_id, order_sku_id = orderItem.sku_id,
out_amount = (txtBuyPriceVal.ParseToDecimal() * 100).ParseToInt(), out_amount = (txtBuyPriceVal.ParseToDecimal() * 100).ParseToInt(),
out_order_no = "tb_" + txtBuyOrderIdVal.Trim(), out_order_no = txtBuyOrderIdVal.Trim(),
order_code = txtBuyOrderIdVal.Trim(),
purchaser_note = body["purchaserNote"].ParseToString(), purchaser_note = body["purchaserNote"].ParseToString(),
created_time = DateTime.Now, created_time = DateTime.Now,
}); });
@@ -1222,6 +1222,11 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
if (BuyType == "direct") if (BuyType == "direct")
{ {
#region 直发拍单 #region 直发拍单
if (orderItem.ItemOrder?.Shop == null)
{
this.ErrorMsg = "缺少店铺信息!";
return;
}
var url = BaseClass.Build29WxObjString("order/wx_get_order_item_ext_info"); var url = BaseClass.Build29WxObjString("order/wx_get_order_item_ext_info");
var data = UserLogin.GetSignaturex(); var data = UserLogin.GetSignaturex();
@@ -1241,8 +1246,8 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
order_id = orderItem.order_id, order_id = orderItem.order_id,
sku_id = orderItem.sku_id, sku_id = orderItem.sku_id,
out_order_id = "tb_" + txtBuyOrderIdVal.Trim(), out_order_id = "tb_" + txtBuyOrderIdVal.Trim(),
shop_app_id = orderItem.Shop.ShopId, shop_app_id = orderItem.ItemOrder?.Shop?.ShopId,
shop_name = orderItem.Shop.ShopAccount, shop_name = orderItem.ItemOrder?.Shop?.ShopAccount,
buy_type = "直发", buy_type = "直发",
}; };
var url1 = BaseClass.Build29WxObjString("order/wx_add_order_item_ext_info"); var url1 = BaseClass.Build29WxObjString("order/wx_add_order_item_ext_info");
File diff suppressed because it is too large. Load diff
@@ -1,6 +1,5 @@
using _29WxOrderWpf.BaseWindows; using _29WxOrderWpf.BaseWindows;
using _29WxOrderWpf.CefHelper; using _29WxOrderWpf.CefHelper;
using WxOrder.Framework.Commons;
using _29WxOrderWpf.ViewModels; using _29WxOrderWpf.ViewModels;
using AllBase; using AllBase;
using AllBase.Helper; using AllBase.Helper;
@@ -27,6 +26,7 @@ using System.Threading;
using System.Threading.Tasks; using System.Threading.Tasks;
using System.Windows; using System.Windows;
using System.Windows.Input; using System.Windows.Input;
using System.Windows.Interop;
using System.Windows.Media.Imaging; using System.Windows.Media.Imaging;
using TemuKJD.ToolForms; using TemuKJD.ToolForms;
using Work; using Work;
@@ -338,7 +338,7 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
ManualUpdateBuyOrderCommand = new DelegateCommand(ManualUpdateBuyOrder); ManualUpdateBuyOrderCommand = new DelegateCommand(ManualUpdateBuyOrder);
UpdateTransitWarehouseCommand = new DelegateCommand(UpdateTransitWarehouse); UpdateTransitWarehouseCommand = new DelegateCommand(UpdateTransitWarehouse);
this.txtShopNameVal = orderItem.Shop.ShopAccount; this.txtShopNameVal = orderItem.ItemOrder?.Shop?.ShopAccount;
this.txtOrderIdVal = orderItem.order_id; this.txtOrderIdVal = orderItem.order_id;
this.txtShopSkuIdVal = orderItem.sku_id; this.txtShopSkuIdVal = orderItem.sku_id;
this.txtShopGoodsIdVal = orderItem.product_id; this.txtShopGoodsIdVal = orderItem.product_id;
@@ -347,7 +347,7 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
this.txtShopGoodsNameVal = orderItem.title; this.txtShopGoodsNameVal = orderItem.title;
this.txtShopSpecNameVal = orderItem.SkuAttrStr; this.txtShopSpecNameVal = orderItem.SkuAttrStr;
this.txtShopOrderItemCntVal = orderItem.sku_cnt.ParseToString(); this.txtShopOrderItemCntVal = orderItem.sku_cnt.ParseToString();
this.txtShopOrderItemPriceVal = (orderItem.real_price * 0.01m + orderItem.ItemOrder?.postage_price * 0.01m / orderItem.ItemOrder?.orderItems?.Count).ParseToString(); this.txtShopOrderItemPriceVal = (orderItem.real_price * 0.01m + orderItem.ItemOrder?.postage_price * 0.01m / orderItem.ItemOrder?.OrderItems?.Count).ParseToString();
if (!this.IsMappingGoods && orderItem.TbBuyMap != null) if (!this.IsMappingGoods && orderItem.TbBuyMap != null)
{ {
@@ -1335,17 +1335,17 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
var pddFrontSkuInfo = new frontSkuInfo3() var pddFrontSkuInfo = new frontSkuInfo3()
{ {
skuId = key.ParseToLong(), skuId = key.ParseToLong(),
skuID = key.ParseToLong(), //skuID = key.ParseToLong(),
goodsId = pddFrontGoods3.goodsId, goodsId = pddFrontGoods3.goodsId,
thumbUrl = thumbUrl, thumbUrl = thumbUrl,
quantity = tbSku2.quantity, //quantity = tbSku2.quantity,
isOnsale = 1, //isOnsale = 1,
spec = taobaoSku?.propPath, // 淘宝格式与拼多多存在差异,包含冒号与父类型id spec = taobaoSku?.propPath, // 淘宝格式与拼多多存在差异,包含冒号与父类型id
specs = pddSpecs, specs = pddSpecs,
price = tbSku2.price.priceMoney.ParseToInt() + 100, price = tbSku2.price?.priceMoney.ParseToInt() + 100,
normalPrice = ((tbSku2.price.priceMoney.ParseToInt() + 100) / 100m).ToString("F2"), normalPrice = ((tbSku2.price?.priceMoney.ParseToInt() + 100) / 100m).ParseToDecimal().ToString("F2"),
groupPrice = tbSku2.price.priceText, groupPrice = tbSku2.price?.priceText,
oldGroupPrice = tbSku2.price.priceMoney.ParseToInt(), oldGroupPrice = tbSku2.price?.priceMoney.ParseToInt(),
}; };
pddFrontGoods3.skus.Add(pddFrontSkuInfo); pddFrontGoods3.skus.Add(pddFrontSkuInfo);
} }
@@ -1441,7 +1441,7 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
var goods = JsonHelper.DeserializeJsonToObject<pddFrontGoods3Lite>(skuInfo.map_skus); var goods = JsonHelper.DeserializeJsonToObject<pddFrontGoods3Lite>(skuInfo.map_skus);
if (goods == null) if (goods == null)
return; return;
var sku = goods.skus.FirstOrDefault(s => s.skuID.ParseToString() == info.map_sku_id); var sku = goods.skus.FirstOrDefault(s => s.skuId.ParseToString() == info.map_sku_id);
if (sku == null) if (sku == null)
return; return;
@@ -1472,7 +1472,7 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
var goods = JsonHelper.DeserializeJsonToObject<pddFrontGoods3Lite>(skuInfo.map_skus); var goods = JsonHelper.DeserializeJsonToObject<pddFrontGoods3Lite>(skuInfo.map_skus);
if (goods == null) if (goods == null)
return; return;
var sku = goods.skus.FirstOrDefault(s => s.skuID.ParseToString() == info.map_sku_id); var sku = goods.skus.FirstOrDefault(s => s.skuId.ParseToString() == info.map_sku_id);
if (sku == null) if (sku == null)
return; return;
@@ -1544,7 +1544,7 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
} }
else else
{ {
return "获取失败,请关闭拍单窗口重试 " + BaseRegex.GetStringXml(ref sourceCodeRst, "msg", sourceCodeRst); return "溯源码获取失败,请关闭拍单窗口重试 " + BaseRegex.GetStringXml(ref sourceCodeRst, "msg", sourceCodeRst);
} }
} }
@@ -1641,7 +1641,7 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
{ {
if (order.IsWaitBuy) if (order.IsWaitBuy)
{ {
foreach (var item in order.orderItems) foreach (var item in order.OrderItems)
{ {
if (item.out_product_id == upSpuCode || item.product_id == upSpuCode) if (item.out_product_id == upSpuCode || item.product_id == upSpuCode)
{ {
@@ -1705,7 +1705,7 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
{ {
if (order.IsWaitBuy) if (order.IsWaitBuy)
{ {
foreach (var item in order.orderItems) foreach (var item in order.OrderItems)
{ {
if ((item.out_product_id == tbBuyMap.spu_code && item.out_sku_id == tbBuyMap.sku_code) || if ((item.out_product_id == tbBuyMap.spu_code && item.out_sku_id == tbBuyMap.sku_code) ||
(item.out_product_id == tbBuyMap.spu_code && item.SkuAttrStr == tbBuyMap.sku_code) || (item.out_product_id == tbBuyMap.spu_code && item.SkuAttrStr == tbBuyMap.sku_code) ||
@@ -1737,9 +1737,9 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
/// <summary> /// <summary>
/// 更新拍单成功信息 /// 更新拍单成功信息
/// </summary> /// </summary>
public void ManualUpdateBuyOrder() public async void ManualUpdateBuyOrder()
{ {
if (BuyType == "transit" && txtSourceCodeVal.Trim().Length != 6) if (BuyType == "transit" && txtSourceCodeVal.ParseToString().Trim().Length != 6)
{ {
ErrorMsg = "溯源码长度错误!"; ErrorMsg = "溯源码长度错误!";
return; return;
@@ -1827,31 +1827,24 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
string basePostageKey = WarehousePostageInfo.DicWarehousePostage.Keys.FirstOrDefault(pk => (orderItem.ItemOrder?.province_name).ParseToString().Contains(pk)); string basePostageKey = WarehousePostageInfo.DicWarehousePostage.Keys.FirstOrDefault(pk => (orderItem.ItemOrder?.province_name).ParseToString().Contains(pk));
decimal basePostage = basePostageKey.IsNullOrEmpty() ? WarehousePostageInfo.DicWarehousePostage.Values.Min() : WarehousePostageInfo.DicWarehousePostage[basePostageKey]; decimal basePostage = basePostageKey.IsNullOrEmpty() ? WarehousePostageInfo.DicWarehousePostage.Values.Min() : WarehousePostageInfo.DicWarehousePostage[basePostageKey];
body["oemAmount"] = (BaseClass.PostagePerOrderDiff * 100).ParseToInt().ParseToString(); body["parentOemId"] = BaseClass.ParentOemId;
body["postage"] = ((basePostage + BaseClass.PostagePerOrderDiff) * 100).ParseToInt().ParseToString(); body["parentOemAmount"] = (BaseClass.ParentPostageOemAmount * 100).ParseToInt().ParseToString();
body["oemId"] = BaseClass.OemId;
body["oemAmount"] = (BaseClass.PostageOemAmount * 100).ParseToInt().ParseToString();
body["postage"] = ((basePostage + BaseClass.ParentPostageOemAmount + BaseClass.PostageOemAmount) * 100).ParseToInt().ParseToString();
} }
var url = "https://po.e57.cn/prod-api/api/oms-api/externalProcurement/saveOrUpdate"; var url = "https://po.e57.cn/prod-api/api/oms-api/externalProcurement/saveOrUpdate";
var dataStr = JsonHelper.SerializeObject(body); var dataStr = JsonHelper.SerializeObject(body);
//dataStr = "{\"orderNo\":\"3737339733954942720\",\"outOrderNo\":\"2606846854564\",\"buyerAccount\":\"测试\",\"outAmount\":\"2000\",\"purchaserNote\":\"测试\",\"express1Company\":\"\"" + var exportRst = await HttpResponseWXBLL.e57PostResponseAsync(url, dataStr);
// ",\"express1Waybill\":\"\",\"platform\":\"XDYSHC\",\"orderPlatformCode\":\"WEISHOP\"}"; if (!exportRst.ParseToString().Contains("\"code\":200"))
var exportRst = HttpResponseWXBLL.e57PostResponse(url, dataStr, ""); {
//<AjaxResult><msg>保存成功</msg><code>200</code></AjaxResult> await Task.Delay(500);
//<AjaxResult><msg>订单不存在:373733973395494272</msg><code>500</code></AjaxResult> exportRst = await HttpResponseWXBLL.e57PostResponseAsync(url, dataStr);
if (!exportRst.ParseToString().Contains("<code>200</code>")) }
if (!exportRst.ParseToString().Contains("\"code\":200"))
{ {
string msg = ""; string msg = "";
string code = ""; msg = BaseRegex.GetStringJsonByRegs(ref exportRst, exportRst, "msg");
try
{
System.Xml.XmlDocument xmlDoc = new System.Xml.XmlDocument();
xmlDoc.LoadXml(exportRst);
code = xmlDoc["AjaxResult"]["code"].InnerText;
msg = xmlDoc["AjaxResult"]["msg"].InnerText;
}
catch (Exception ex)
{
msg = exportRst.ParseToString();
}
this.ErrorMsg = "拍单保存失败,服务端返回 " + msg; this.ErrorMsg = "拍单保存失败,服务端返回 " + msg;
Enabled = true; Enabled = true;
return; return;
@@ -1863,10 +1856,13 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
{ {
buyer_account = buyer.buyer_id, buyer_account = buyer.buyer_id,
id = 0, id = 0,
order_void_status = 0,
platform = transit.TransId,
order_no = orderItem.order_id, order_no = orderItem.order_id,
order_sku_id = orderItem.sku_id, order_sku_id = orderItem.sku_id,
out_amount = (txtBuyPriceVal.ParseToDecimal() * 100).ParseToInt(), out_amount = (txtBuyPriceVal.ParseToDecimal() * 100).ParseToInt(),
out_order_no = "tb_" + txtBuyOrderIdVal.Trim(), out_order_no = "tb_" + txtBuyOrderIdVal.Trim(),
order_code = "tb_" + txtBuyOrderIdVal.Trim(),
purchaser_note = body["purchaserNote"].ParseToString(), purchaser_note = body["purchaserNote"].ParseToString(),
created_time = DateTime.Now, created_time = DateTime.Now,
}); });
@@ -1937,6 +1933,11 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
if (BuyType == "direct") if (BuyType == "direct")
{ {
#region 直发拍单 #region 直发拍单
if (orderItem.ItemOrder?.Shop == null)
{
this.ErrorMsg = "缺少店铺信息!";
return;
}
var url = BaseClass.Build29WxObjString("order/wx_get_order_item_ext_info"); var url = BaseClass.Build29WxObjString("order/wx_get_order_item_ext_info");
var data = UserLogin.GetSignaturex(); var data = UserLogin.GetSignaturex();
@@ -1956,8 +1957,8 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
order_id = orderItem.order_id, order_id = orderItem.order_id,
sku_id = orderItem.sku_id, sku_id = orderItem.sku_id,
out_order_id = "tb_" + txtBuyOrderIdVal.Trim(), out_order_id = "tb_" + txtBuyOrderIdVal.Trim(),
shop_app_id = orderItem.Shop.ShopId, shop_app_id = orderItem.ItemOrder?.Shop?.ShopId,
shop_name = orderItem.Shop.ShopAccount, shop_name = orderItem.ItemOrder?.Shop?.ShopAccount,
buy_type = "直发", buy_type = "直发",
}; };
var url1 = BaseClass.Build29WxObjString("order/wx_add_order_item_ext_info"); var url1 = BaseClass.Build29WxObjString("order/wx_add_order_item_ext_info");
@@ -433,52 +433,6 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
return transitOrderList; return transitOrderList;
} }
/// <summary>
/// 读取订单详情信息
/// </summary>
/// <param name="order_ids"></param>
/// <returns></returns>
List<oms_wei_order_info> GetOrderInfo(string order_ids)
{
if (string.IsNullOrEmpty(order_ids))
return new List<oms_wei_order_info>();
Thread.Sleep(100);
var url1 = BaseClass.Build29WxObjString("order/get_erp_order_list");
var data1 = UserLogin.GetSignaturex();
data1 += "&erp_order_id_in=" + order_ids;
data1 += "&page_size=" + 100;
var html1 = GetHtml.PostUtf8(url1, data1);
if (string.IsNullOrEmpty(html1) || !html1.Contains("\"code\":200"))
html1 = GetHtml.PostUtf8(url1, data1);
if (string.IsNullOrEmpty(html1) || !html1.Contains("\"code\":200"))
{
//BaseMsgWindow.ShowError("订单读取失败 " + BaseRegex.GetStringJson(ref html, "msg"));
//break;
}
List<oms_wei_order_info> orders = new List<oms_wei_order_info>();
try
{
orders = JsonHelper.DeserializeJsonToList<oms_wei_order_info>(JObject.Parse(html1)["data"].ParseToString());
if (orders == null)
orders = new List<oms_wei_order_info>();
var orderItems = OrderListCtrl.GetOrderItemInfo(order_ids);
foreach (var orderItem in orderItems)
{
var order = orders.FirstOrDefault(o => o.order_id == orderItem.order_id);
orderItem.ItemOrder = order;
order.orderItems.Add(orderItem);
}
return orders;
}
catch
{
return new List<oms_wei_order_info>();
}
}
public static List<order_tb_buyer_after_sale> GetOrderAfterSales(string order_ids) public static List<order_tb_buyer_after_sale> GetOrderAfterSales(string order_ids)
{ {
if (order_ids.IsNullOrEmpty()) if (order_ids.IsNullOrEmpty())
@@ -660,9 +614,17 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
oList.Add(o); oList.Add(o);
if (o.order_sn == "tb_5127890185262007919")
{
}
// 售后单放在同一个列表中统一处理 // 售后单放在同一个列表中统一处理
var refundStatus = BaseRegex.GetStringJson(ref orderItemInfoStr, "refundStatus"); var refundStatus = BaseRegex.GetStringJson(ref orderItemInfoStr, "refundStatus");
if (!string.IsNullOrEmpty(refundStatus) && !string.IsNullOrEmpty(orderStatus)) if (refundStatus.IsNullOrEmpty())
{
refundStatus = BaseRegex.GetStringJson(ref shopInfoStr, "tradeTitle") == "交易关闭" ? "退款成功" : "";
}
if ((!string.IsNullOrEmpty(refundStatus) && !string.IsNullOrEmpty(orderStatus)) || refundStatus == "退款成功")
{ {
TbBuyerAfterSaleLiteInfo af = new TbBuyerAfterSaleLiteInfo(); TbBuyerAfterSaleLiteInfo af = new TbBuyerAfterSaleLiteInfo();
af.buyerId = o.buyerId; af.buyerId = o.buyerId;
@@ -724,7 +686,7 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
var out_order_nos = string.Join(",", list.Select(bo => bo.order_sn)); var out_order_nos = string.Join(",", list.Select(bo => bo.order_sn));
// 装载同步单 // 装载同步单
var syncOrderList = OrderListCtrl.GetSyncLogistics(out_order_nos); var syncOrderList = await OrderGetOrderListHelper.GetSyncLogistics(out_order_nos);
foreach (var syncOrder in syncOrderList) foreach (var syncOrder in syncOrderList)
{ {
if (!lstSyncLogistics.Contains(syncOrder)) if (!lstSyncLogistics.Contains(syncOrder))
@@ -746,16 +708,16 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
var order_id_lst = transitOrderList.Select(ts => ts.order_no).ToList(); var order_id_lst = transitOrderList.Select(ts => ts.order_no).ToList();
order_id_lst.AddRange(orderExtList.Select(ts => ts.order_id)); order_id_lst.AddRange(orderExtList.Select(ts => ts.order_id));
var order_ids = string.Join(",", order_id_lst.Distinct()); var order_ids = string.Join(",", order_id_lst.Distinct());
var orders = GetOrderInfo(order_ids); var orders = await OrderGetOrderListHelper.GetOrderInfo(order_ids);
//var buyerAfterSales = GetOrderAfterSales(order_ids); //var buyerAfterSales = GetOrderAfterSales(order_ids);
// 处理这些获取到的微信订单 // 处理这些获取到的微信订单
foreach (var order in orders) foreach (var order in orders)
{ {
foreach (var orderItem in order.orderItems) foreach (var orderItem in order.OrderItems)
{ {
if (orderItem.ItemOrder.orderItems.Count > 1) if (orderItem.ItemOrder.OrderItems.Count > 1)
orderItem.ItemTransitOrders.AddRange(transitOrderList.Where(t => t.order_no == orderItem.order_id && t.order_sku_id == orderItem.sku_id)); orderItem.ItemTransitOrders.AddRange(transitOrderList.Where(t => t.order_no == orderItem.order_id && t.order_sku_id == orderItem.sku_id));
else else
orderItem.ItemTransitOrders.AddRange(transitOrderList.Where(t => t.order_no == orderItem.order_id)); orderItem.ItemTransitOrders.AddRange(transitOrderList.Where(t => t.order_no == orderItem.order_id));
@@ -769,7 +731,7 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
o.buyerId = buyer.buyer_id; o.buyerId = buyer.buyer_id;
o.buyerName = buyer.buyer_name; o.buyerName = buyer.buyer_name;
if (o.order_sn == "tb_5127796188031004903") if (o.order_sn == "tb_5127890185262007919")
{ {
} }
@@ -786,7 +748,7 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
if (wxOrder != null) if (wxOrder != null)
{ {
o.ShopOrderRefundStr = ""; // "店铺售后" 或者 ""; o.ShopOrderRefundStr = ""; // "店铺售后" 或者 "";
var wxOrderItem = wxOrder.orderItems.FirstOrDefault(oi => oi.sku_id == o.ShopOrderSkuIdStr); var wxOrderItem = wxOrder.OrderItems.FirstOrDefault(oi => oi.sku_id == o.ShopOrderSkuIdStr);
if (wxOrderItem != null) if (wxOrderItem != null)
{ {
o.ShopOrderSkuNameStr = wxOrderItem.SkuAttrStr; o.ShopOrderSkuNameStr = wxOrderItem.SkuAttrStr;
@@ -807,7 +769,7 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
if (transit_item != null) if (transit_item != null)
{ {
shopOrder = orders.FirstOrDefault(o1 => o1.order_id == transit_item.order_no); shopOrder = orders.FirstOrDefault(o1 => o1.order_id == transit_item.order_no);
orderItem = shopOrder?.orderItems.FirstOrDefault(oi => oi.ItemTransitOrders.Any(t1 => t1.out_order_no == o.order_sn)); orderItem = shopOrder?.OrderItems.FirstOrDefault(oi => oi.ItemTransitOrders.Any(t1 => t1.out_order_no == o.order_sn));
//var refund_item = refunds.FirstOrDefault(ri => ri.order_id == order_item?.order_id) ?? order_item?.ItemRefund; //var refund_item = refunds.FirstOrDefault(ri => ri.order_id == order_item?.order_id) ?? order_item?.ItemRefund;
UpdateOrderStatus(o, shopOrder, orderItem, transit_item); UpdateOrderStatus(o, shopOrder, orderItem, transit_item);
} }
@@ -1095,12 +1057,12 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
order_id_lst.AddRange(orderExtList.Select(ts => ts.order_id)); order_id_lst.AddRange(orderExtList.Select(ts => ts.order_id));
var order_ids = string.Join(",", order_id_lst.Distinct()); var order_ids = string.Join(",", order_id_lst.Distinct());
var orders = GetOrderInfo(order_ids); var orders = await OrderGetOrderListHelper.GetOrderInfo(order_ids);
foreach (var order in orders) foreach (var order in orders)
{ {
foreach (var orderItem in order.orderItems) foreach (var orderItem in order.OrderItems)
{ {
if (orderItem.ItemOrder.orderItems.Count > 1) if (orderItem.ItemOrder.OrderItems.Count > 1)
orderItem.ItemTransitOrders.AddRange(transitOrderList.Where(t => t.order_no == orderItem.order_id && t.order_sku_id == orderItem.sku_id)); orderItem.ItemTransitOrders.AddRange(transitOrderList.Where(t => t.order_no == orderItem.order_id && t.order_sku_id == orderItem.sku_id));
else else
orderItem.ItemTransitOrders.AddRange(transitOrderList.Where(t => t.order_no == orderItem.order_id)); orderItem.ItemTransitOrders.AddRange(transitOrderList.Where(t => t.order_no == orderItem.order_id));
@@ -1116,11 +1078,6 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
foreach (TbBuyerAfterSaleLiteInfo af in list) foreach (TbBuyerAfterSaleLiteInfo af in list)
{ {
if (af?.orderSn == "tb_5127796188031004903")
{
}
af.buyerId = buyer.buyer_id; af.buyerId = buyer.buyer_id;
af.buyerName = buyer.buyer_name; af.buyerName = buyer.buyer_name;
@@ -1142,7 +1099,7 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
var wxOrder = orders.FirstOrDefault(ord => ord.order_id == af.ShopOrderIdStr); var wxOrder = orders.FirstOrDefault(ord => ord.order_id == af.ShopOrderIdStr);
if (wxOrder != null) if (wxOrder != null)
{ {
var wxOrderItem = wxOrder.orderItems.FirstOrDefault(oi => oi.sku_id == af.ShopOrderSkuIdStr); var wxOrderItem = wxOrder.OrderItems.FirstOrDefault(oi => oi.sku_id == af.ShopOrderSkuIdStr);
if (wxOrderItem != null) if (wxOrderItem != null)
{ {
af.ShopOrderSkuNameStr = wxOrderItem.SkuAttrStr; af.ShopOrderSkuNameStr = wxOrderItem.SkuAttrStr;
@@ -1156,7 +1113,7 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
if (transitItem != null) if (transitItem != null)
{ {
shopOrder = orders.FirstOrDefault(o1 => o1.order_id == transitItem.order_no); shopOrder = orders.FirstOrDefault(o1 => o1.order_id == transitItem.order_no);
orderItem = shopOrder?.orderItems.FirstOrDefault(oi => oi.ItemTransitOrders.Any(t1 => t1.out_order_no == af.orderSn)); orderItem = shopOrder?.OrderItems.FirstOrDefault(oi => oi.ItemTransitOrders.Any(t1 => t1.out_order_no == af.orderSn));
buyerAfterSale = buyerAfterSales.FirstOrDefault(ba => ba.orderSn == transitItem.out_order_no && !ba.afterSaleAddress.IsNullOrEmpty()); buyerAfterSale = buyerAfterSales.FirstOrDefault(ba => ba.orderSn == transitItem.out_order_no && !ba.afterSaleAddress.IsNullOrEmpty());
//refundItem = refunds.FirstOrDefault(ri => ri.order_id == orderItem?.order_id) ?? orderItem?.ItemRefund; //refundItem = refunds.FirstOrDefault(ri => ri.order_id == orderItem?.order_id) ?? orderItem?.ItemRefund;
@@ -1353,7 +1310,7 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
if (!lstTbBuyerOrderVoidAfterSaleOrderSn.Contains(orderItem.order_id + orderItem.sku_id)) if (!lstTbBuyerOrderVoidAfterSaleOrderSn.Contains(orderItem.order_id + orderItem.sku_id))
{ {
lstTbBuyerOrderVoidAfterSaleOrderSn.Add(orderItem.order_id + orderItem.sku_id); lstTbBuyerOrderVoidAfterSaleOrderSn.Add(orderItem.order_id + orderItem.sku_id);
OrderListRowItemCtrl.VoidOrder(orderItem, true); await OrderTransitService.VoidOrder(orderItem, null, true);
} }
} }
} }
@@ -1664,19 +1621,19 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
if (btn.DataContext is TbBuyerOrderLiteInfo buyerOrder) if (btn.DataContext is TbBuyerOrderLiteInfo buyerOrder)
{ {
btn.IsEnabled = false; btn.IsEnabled = false;
Task.Run(() => Task.Run(async () =>
{ {
var out_order_nos = buyerOrder.order_sn; var out_order_nos = buyerOrder.order_sn;
var transitOrderList = GetOrderTransitWarehouseInfo(out_order_nos); var transitOrderList = GetOrderTransitWarehouseInfo(out_order_nos);
var order_ids = string.Join(",", transitOrderList.Select(ts => ts.order_no)); var order_ids = string.Join(",", transitOrderList.Select(ts => ts.order_no));
var orders = GetOrderInfo(order_ids); var orders = await OrderGetOrderListHelper.GetOrderInfo(order_ids);
foreach (var order in orders) foreach (var order in orders)
{ {
foreach (var orderItem in order.orderItems) foreach (var orderItem in order.OrderItems)
{ {
// 中转仓订单 // 中转仓订单
if (orderItem.ItemOrder.orderItems.Count > 1) if (orderItem.ItemOrder.OrderItems.Count > 1)
orderItem.ItemTransitOrders.AddRange(transitOrderList.Where(t => t.order_no == orderItem.order_id && t.order_sku_id == orderItem.sku_id)); orderItem.ItemTransitOrders.AddRange(transitOrderList.Where(t => t.order_no == orderItem.order_id && t.order_sku_id == orderItem.sku_id));
else else
orderItem.ItemTransitOrders.AddRange(transitOrderList.Where(t => t.order_no == orderItem.order_id)); orderItem.ItemTransitOrders.AddRange(transitOrderList.Where(t => t.order_no == orderItem.order_id));
@@ -1692,7 +1649,7 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
if (transit_item != null) if (transit_item != null)
{ {
var shopOrder = orders.FirstOrDefault(o => o.order_id == transit_item.order_no); var shopOrder = orders.FirstOrDefault(o => o.order_id == transit_item.order_no);
var order_item = shopOrder.orderItems.FirstOrDefault(oi => oi.ItemTransitOrders.Any(t1 => t1.out_order_no == buyerOrder.order_sn)); var order_item = shopOrder.OrderItems.FirstOrDefault(oi => oi.ItemTransitOrders.Any(t1 => t1.out_order_no == buyerOrder.order_sn));
//var refund_item = refunds.FirstOrDefault(ri => ri.order_id == order_item.order_id) ?? order_item?.ItemRefund; //var refund_item = refunds.FirstOrDefault(ri => ri.order_id == order_item.order_id) ?? order_item?.ItemRefund;
UpdateOrderStatus(buyerOrder, shopOrder, order_item, transit_item); UpdateOrderStatus(buyerOrder, shopOrder, order_item, transit_item);
@@ -1829,10 +1786,10 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
{ {
var msg = BaseRegex.GetStringXml(ref dispatchRst, "msg"); var msg = BaseRegex.GetStringXml(ref dispatchRst, "msg");
order.sendStatus = "取号成功"; order.sendStatus = "取号成功";
var shopOrder = GlobalConfig.lstOrder.FirstOrDefault(o => o.orderItems.Any(oi => oi.ItemTransitOrders.Any(t => t.out_order_no == order.order_sn))); var shopOrder = GlobalConfig.lstOrder.FirstOrDefault(o => o.OrderItems.Any(oi => oi.ItemTransitOrders.Any(t => t.out_order_no == order.order_sn)));
if (shopOrder != null) if (shopOrder != null)
{ {
var orderItem = shopOrder.orderItems.FirstOrDefault(oi => oi.ItemTransitOrders.Any(t => t.out_order_no == order.order_sn)); var orderItem = shopOrder.OrderItems.FirstOrDefault(oi => oi.ItemTransitOrders.Any(t => t.out_order_no == order.order_sn));
if (orderItem != null) if (orderItem != null)
{ {
var transit = orderItem.ItemTransitOrders.FirstOrDefault(t => t.out_order_no == order.order_sn); var transit = orderItem.ItemTransitOrders.FirstOrDefault(t => t.out_order_no == order.order_sn);
@@ -1885,10 +1842,10 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
} }
order.sendStatus = "修改提前取号成功"; order.sendStatus = "修改提前取号成功";
var shopOrder = GlobalConfig.lstOrder.FirstOrDefault(o => o.orderItems.Any(oi => oi.ItemTransitOrders.Any(t => t.out_order_no == order.order_sn))); var shopOrder = GlobalConfig.lstOrder.FirstOrDefault(o => o.OrderItems.Any(oi => oi.ItemTransitOrders.Any(t => t.out_order_no == order.order_sn)));
if (shopOrder != null) if (shopOrder != null)
{ {
var orderItem = shopOrder.orderItems.FirstOrDefault(oi => oi.ItemTransitOrders.Any(t => t.out_order_no == order.order_sn)); var orderItem = shopOrder.OrderItems.FirstOrDefault(oi => oi.ItemTransitOrders.Any(t => t.out_order_no == order.order_sn));
if (orderItem != null) if (orderItem != null)
{ {
var transit = orderItem.ItemTransitOrders.FirstOrDefault(t => t.out_order_no == order.order_sn); var transit = orderItem.ItemTransitOrders.FirstOrDefault(t => t.out_order_no == order.order_sn);
@@ -2008,7 +1965,7 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
} }
} }
public void SetPickUpNo(TbPickInfo tbPickInfo) public async Task SetPickUpNo(TbPickInfo tbPickInfo)
{ {
List<combine_track_info> orderSnTracks = new List<combine_track_info>(); List<combine_track_info> orderSnTracks = new List<combine_track_info>();
foreach (var combine in tbPickInfo.combine_list) foreach (var combine in tbPickInfo.combine_list)
@@ -2023,8 +1980,8 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
if (orderSnTracks.Count == 0) if (orderSnTracks.Count == 0)
return; return;
//var syncOrderAllList = OrderListCtrl.GetSyncLogistics(string.Join(",", orderSnTracks.Select(o => o.order_sn))); //var syncOrderAllList = OrderGetOrderListHelper.GetSyncLogistics(string.Join(",", orderSnTracks.Select(o => o.order_sn)));
var syncOrderList = OrderListCtrl.GetSyncLogistics(string.Join(",", orderSnTracks.Select(o => o.order_sn)), 1); var syncOrderList = await OrderGetOrderListHelper.GetSyncLogistics(string.Join(",", orderSnTracks.Select(o => o.order_sn)), 1);
foreach (var sOrder in syncOrderList) foreach (var sOrder in syncOrderList)
{ {
var orderSnTrack = orderSnTracks.FirstOrDefault(o => o.order_sn == sOrder.order_id); var orderSnTrack = orderSnTracks.FirstOrDefault(o => o.order_sn == sOrder.order_id);
@@ -2105,7 +2062,7 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
} }
} }
public void SendAsyncWaybillOrder(TbBuyerOrderLiteInfo order, bool showErrBox = false) public async Task SendAsyncWaybillOrder(TbBuyerOrderLiteInfo order, bool showErrBox = false)
{ {
try try
{ {
@@ -2116,7 +2073,7 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
} }
// 取最新订单状态 // 取最新订单状态
var wxOrder = GetOrderInfo(order.ShopOrderIdStr).FirstOrDefault(); var wxOrder = (await OrderGetOrderListHelper.GetOrderInfo(order.ShopOrderIdStr)).FirstOrDefault();
if (wxOrder == null) if (wxOrder == null)
throw new Exception("买手单对应微信订单不存在!"); throw new Exception("买手单对应微信订单不存在!");
var shop = GlobalConfig.ShopLoginList.FirstOrDefault(s => s.ErpShopId == wxOrder.shop_id.ToString()); var shop = GlobalConfig.ShopLoginList.FirstOrDefault(s => s.ErpShopId == wxOrder.shop_id.ToString());
@@ -2186,7 +2143,7 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
var mainOrder = GlobalConfig.lstOrder.FirstOrDefault(o => o.order_id == order.ShopOrderIdStr); var mainOrder = GlobalConfig.lstOrder.FirstOrDefault(o => o.order_id == order.ShopOrderIdStr);
if (mainOrder != null) if (mainOrder != null)
{ {
var orderItem = mainOrder.orderItems?.FirstOrDefault(oi => oi.sku_id == order.ShopOrderSkuIdStr); var orderItem = mainOrder.OrderItems?.FirstOrDefault(oi => oi.sku_id == order.ShopOrderSkuIdStr);
if (orderItem != null) if (orderItem != null)
orderItem.SyncLogisticsMsg = ex.Message; orderItem.SyncLogisticsMsg = ex.Message;
} }
@@ -0,0 +1,91 @@
using _29WxOrderWpf.BaseWindows;
using _29WxOrderWpf.Ctrls.BuyerCtrls;
using _29WxOrderWpf.ViewModels;
using AllBase;
using AllBase.Helper;
using AllBase.Model.DBModel;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Windows;
using TemuKJD.ToolForms;
using WxOrder.Framework.Commons;
namespace _29WxOrderWpf.Ctrls.OrderCtrls;
internal class OrderBuyerOrdersHelper
{
public static void ShowBuyerOrder(oms_wei_order_item_info orderItem, string buyerAccount, string buyerName, string outOrderId, bool isShowOrderList = false)
{
if (outOrderId.StartsWith("tb_")) // 淘宝买手及订单
{
var buyer = GlobalConfig.TaobaoBuyerLoginList.FirstOrDefault(p => p.buyer_id == buyerAccount || p.buyer_name == buyerName);
if (buyer == null)
{
BaseMsgWindow.ShowError("该订单买手号未在当前账户登录");
return;
}
var url = "";
if (isShowOrderList)
url = "https://buyertrade.taobao.com/trade/itemlist/list_bought_items.htm?";
else
url = "https://trade.tmall.com/detail/orderDetail.htm?bizOrderId=" + outOrderId.Replace("tb_", "");
TaobaoBuyOrderCtrl taobaoBuyView = new TaobaoBuyOrderCtrl(GlobalConfig.CurrentTaobaoBuyer, orderItem);
taobaoBuyView.ViewModel.InitUrl = url;
new DialogWindow()
{
Title = "订单查看 - 当前买手 " + buyer.buyer_nick,
Content = taobaoBuyView,
Width = SystemParameters.PrimaryScreenWidth < 1920 ? SystemParameters.PrimaryScreenWidth : SystemParameters.PrimaryScreenWidth * 90 / 100,
Height = SystemParameters.PrimaryScreenHeight * 90 / 100,
WindowStartupLocation = WindowStartupLocation.CenterScreen,
}.ShowDialog();
}
else // 拼多多买手及订单
{
var buyer = GlobalConfig.PDDBuyerLoginList.FirstOrDefault(p => p.buyer_id == buyerAccount || p.buyer_name == buyerName);
if (buyer == null)
{
BaseMsgWindow.ShowError("该订单买手号未在当前账户登录");
return;
}
var url = "";
if (isShowOrderList)
url = "https://mobile.yangkeduo.com/index.html"; /* 订单列表 */
else
url = "https://mobile.yangkeduo.com/order.html?order_sn=" + outOrderId + "&page_from=1&main_orders=1&is_tester=1&refer_page_name=my_order" +
"&refer_page_id=10032_" + BaseClass.DateTimeToTimestampMilliseconds(DateTime.Now) + "_" + Randomx.GetWordNumber(10) + "&refer_page_sn=10032";
// 拍单的时候检测一下买手号
if (buyer.status == "在线")
{
PddMobileLoginViewModel.CheckBuyerLogin(buyer);
}
if (buyer.status != "在线")
{
BaseMsgWindow.ShowError("买手号掉线");
return;
}
PddMobileBuyOrderForm buyOrderForm = new PddMobileBuyOrderForm(MainWindow.Instance.orderListCtrl.FilterOneOrder, StartUp.UpdateBalance, orderItem, buyer, orderItem.PddBuyMap)
{
TitleText = "订单查看 - 当前买手 " + buyer.buyer_nick,
InitUrl = url /* 订单页面 */
};
buyOrderForm.pnlBuy.Visible = false;
//已有拍单关联的控制界面显示隐藏
if (orderItem.PddBuyMap != null)
{
buyOrderForm.pnlBuy.Visible = true;
buyOrderForm.pnlMap.Visible = false;
}
buyOrderForm.ShowDialog();
}
}
}
File diff suppressed because it is too large. Load diff
@@ -1,6 +1,5 @@
using _29WxOrderWpf.BaseWindows; using _29WxOrderWpf.BaseWindows;
using WxOrder.Framework.Commons; using WxOrder.Framework.Commons;
using WxOrder.Framework.Commons;
using _29WxOrderWpf.Ctrls.PDDInvoice; using _29WxOrderWpf.Ctrls.PDDInvoice;
using _29WxOrderWpf.Ctrls.Statistics; using _29WxOrderWpf.Ctrls.Statistics;
using _29WxOrderWpf.Services; using _29WxOrderWpf.Services;
@@ -84,7 +83,7 @@ public partial class OrderListCtrl
{ {
sucessCount++; sucessCount++;
item.gift_order_status = 1; item.gift_order_status = 1;
foreach (var orderItem in item.orderItems) foreach (var orderItem in item.OrderItems)
{ {
InitOrderItemObservableProp(orderItem); InitOrderItemObservableProp(orderItem);
} }
@@ -110,7 +109,7 @@ public partial class OrderListCtrl
} }
SetProgress(index, count); SetProgress(index, count);
BottomMsg = $"礼品单发送进度:{index}/{count}\t\t{item.orderItems.FirstOrDefault()?.title ?? ""}"; BottomMsg = $"礼品单发送进度:{index}/{count}\t\t{item.OrderItems.FirstOrDefault()?.title ?? ""}";
index++; index++;
} }
@@ -159,7 +158,7 @@ public partial class OrderListCtrl
if (ret) if (ret)
{ {
sucessCount++; sucessCount++;
this.GetOrder(item.order_id); await this.GetOrder(item.order_id);
SetProgress(index, count); SetProgress(index, count);
item.IsSelect = false; item.IsSelect = false;
} }
@@ -167,7 +166,7 @@ public partial class OrderListCtrl
{ {
errorCount++; errorCount++;
} }
BottomMsg = $"订单同步进度:{index}/{count}\t\t{item.orderItems.FirstOrDefault()?.title ?? ""}"; BottomMsg = $"订单同步进度:{index}/{count}\t\t{item.OrderItems.FirstOrDefault()?.title ?? ""}";
index++; index++;
} }
BottomMsg = $"订单同步进度完成 成功:{sucessCount} 失败:{errorCount} 总数:{count}"; BottomMsg = $"订单同步进度完成 成功:{sucessCount} 失败:{errorCount} 总数:{count}";
@@ -204,7 +203,7 @@ public partial class OrderListCtrl
{ {
long shopid = item.Key; long shopid = item.Key;
string shopName = item.Value.FirstOrDefault()?.shop_name ?? ""; string shopName = item.Value.FirstOrDefault()?.shop_name ?? "";
string[] afterSaleOrderIds = item.Value.SelectMany(a => a.refundItems).Where(a => a != null).Select(a => a.after_sale_order_id).ToArray(); string[] afterSaleOrderIds = item.Value.SelectMany(a => a.RefundItems).Where(a => a != null).Select(a => a.after_sale_order_id).ToArray();
var ret = await PullWXOrderService.Instance.PullAfterSaleOrdersAsync(shopid, afterSaleOrderIds); var ret = await PullWXOrderService.Instance.PullAfterSaleOrdersAsync(shopid, afterSaleOrderIds);
if (ret) if (ret)
{ {
@@ -269,11 +269,14 @@
Margin="2,0" Margin="2,0"
HorizontalAlignment="Left" HorizontalAlignment="Left"
VerticalAlignment="Center" VerticalAlignment="Center"
d:Opacity="0.5"
d:Visibility="Visible"
BorderBrush="{StaticResource mainColorBrush}" BorderBrush="{StaticResource mainColorBrush}"
Click="chkSyncDirectOrderWaybill_Click" Click="chkSyncDirectOrderWaybill_Click"
Content="同步物流单" Content="同步物流单"
FontSize="12" FontSize="12"
IsChecked="False" /> IsChecked="False"
Visibility="Collapsed" />
</WrapPanel> </WrapPanel>
<wpf:SpacingStackPanel Grid.Column="13" HorizontalSpacing="5"> <wpf:SpacingStackPanel Grid.Column="13" HorizontalSpacing="5">
@@ -1416,7 +1419,8 @@
CanUserReorderColumns="False" CanUserReorderColumns="False"
ColumnDisplayIndexChanged="dgOrderHeader_ColumnDisplayIndexChanged" ColumnDisplayIndexChanged="dgOrderHeader_ColumnDisplayIndexChanged"
ColumnHeaderHeight="{Binding ElementName=lstTitle, Path=ActualHeight}" ColumnHeaderHeight="{Binding ElementName=lstTitle, Path=ActualHeight}"
LayoutUpdated="dgOrderHeader_LayoutUpdated"> LayoutUpdated="dgOrderHeader_LayoutUpdated"
Sorting="dgOrderHeader_Sorting">
<DataGrid.Columns> <DataGrid.Columns>
<DataGridTextColumn <DataGridTextColumn
Width="38" Width="38"
@@ -1463,9 +1467,20 @@
Header="店铺单号" Header="店铺单号"
HeaderStyle="{StaticResource BaseDataGridColumnHeaderStyle}" /> HeaderStyle="{StaticResource BaseDataGridColumnHeaderStyle}" />
<DataGridTextColumn <DataGridTextColumn
x:Name="dgHeaderTime"
Width="90*" Width="90*"
Header="交易时间" Header="交易时间 ▼"
HeaderStyle="{StaticResource BaseDataGridColumnHeaderStyle}" /> HeaderStyle="{StaticResource BaseDataGridColumnHeaderStyle}">
<DataGridTextColumn.HeaderTemplate>
<DataTemplate>
<!-- 设置 Cursor 为 Hand -->
<TextBlock
x:Name="tbHeaderTimeTxt"
Cursor="Hand"
Text="{Binding RelativeSource={RelativeSource AncestorType={x:Type DataGrid}}, Path=DataContext.ColumnHeaderTitle}" />
</DataTemplate>
</DataGridTextColumn.HeaderTemplate>
</DataGridTextColumn>
<DataGridTextColumn <DataGridTextColumn
Width="65*" Width="65*"
Header="利润" Header="利润"
@@ -1497,6 +1512,7 @@
Grid.Row="4" Grid.Row="4"
Margin="7,0,7,0" Margin="7,0,7,0"
HorizontalContentAlignment="Stretch" HorizontalContentAlignment="Stretch"
AlternationCount="1000000"
BorderThickness="0" BorderThickness="0"
ScrollViewer.CanContentScroll="True" ScrollViewer.CanContentScroll="True"
VirtualizingPanel.IsVirtualizingWhenGrouping="True" VirtualizingPanel.IsVirtualizingWhenGrouping="True"
File diff suppressed because it is too large. Load diff
@@ -51,23 +51,23 @@
</Grid.RowDefinitions> </Grid.RowDefinitions>
<local:OrderListRowItemCtrl <local:OrderListRowItemCtrl
Grid.Row="1" Grid.Row="1"
DataContext="{Binding orderItem}" DataContext="{Binding OrderItem}"
Visibility="{Binding OrderItemVisibility}" /> Visibility="{Binding OrderItemVisibility}" />
<!--<local:OrderListRowItemCtrl <!--<local:OrderListRowItemCtrl
Grid.Row="2" Grid.Row="2"
DataContext="{Binding orderItem2}" DataContext="{Binding OrderItem2}"
Visibility="{Binding OrderItemVisibility}" /> Visibility="{Binding OrderItemVisibility}" />
<local:OrderListRowItemCtrl <local:OrderListRowItemCtrl
Grid.Row="3" Grid.Row="3"
DataContext="{Binding orderItem2}" DataContext="{Binding OrderItem2}"
Visibility="{Binding OrderItemVisibility}" /> Visibility="{Binding OrderItemVisibility}" />
<local:OrderListRowItemCtrl <local:OrderListRowItemCtrl
Grid.Row="4" Grid.Row="4"
DataContext="{Binding orderItem3}" DataContext="{Binding OrderItem3}"
Visibility="{Binding OrderItemVisibility}" /> Visibility="{Binding OrderItemVisibility}" />
<local:OrderListRowItemCtrl <local:OrderListRowItemCtrl
Grid.Row="5" Grid.Row="5"
DataContext="{Binding orderItem4}" DataContext="{Binding OrderItem4}"
Visibility="{Binding OrderItemVisibility}" />--> Visibility="{Binding OrderItemVisibility}" />-->
<!--<ItemsControl Grid.Row="1" ItemsSource="{Binding orderItems}"> <!--<ItemsControl Grid.Row="1" ItemsSource="{Binding orderItems}">
<ItemsControl.ItemTemplate> <ItemsControl.ItemTemplate>
@@ -78,7 +78,7 @@
</ItemsControl>--> </ItemsControl>-->
<!--<ListBox <!--<ListBox
Grid.Row="1" Grid.Row="1"
ItemsSource="{Binding orderItems}" ItemsSource="{Binding OrderItems}"
ScrollViewer.HorizontalScrollBarVisibility="Disabled" ScrollViewer.HorizontalScrollBarVisibility="Disabled"
ScrollViewer.VerticalScrollBarVisibility="Disabled" ScrollViewer.VerticalScrollBarVisibility="Disabled"
VirtualizingStackPanel.IsVirtualizing="True" VirtualizingStackPanel.IsVirtualizing="True"
@@ -7,7 +7,7 @@
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:uc="clr-namespace:_29WxOrderWpf.UserControls" xmlns:uc="clr-namespace:_29WxOrderWpf.UserControls"
d:DesignHeight="50" d:DesignHeight="50"
d:DesignWidth="800" d:DesignWidth="850"
mc:Ignorable="d"> mc:Ignorable="d">
<Border Background="{StaticResource ListRowBorderColorBrush}" CornerRadius="12,12,0,0"> <Border Background="{StaticResource ListRowBorderColorBrush}" CornerRadius="12,12,0,0">
@@ -26,6 +26,7 @@
<ColumnDefinition Width="*" /> <ColumnDefinition Width="*" />
<ColumnDefinition Width="auto" /> <ColumnDefinition Width="auto" />
<ColumnDefinition Width="auto" /> <ColumnDefinition Width="auto" />
<ColumnDefinition Width="auto" />
<ColumnDefinition Width="20" /> <ColumnDefinition Width="20" />
</Grid.ColumnDefinitions> </Grid.ColumnDefinitions>
<TextBox <TextBox
@@ -167,6 +168,7 @@
Grid.Column="6" Grid.Column="6"
Margin="4,8,4,8" Margin="4,8,4,8"
VerticalAlignment="Center" VerticalAlignment="Center"
d:Text="店铺名称"
Background="Transparent" Background="Transparent"
BorderThickness="0" BorderThickness="0"
Cursor="Hand" Cursor="Hand"
@@ -212,7 +214,20 @@
<TextBlock <TextBlock
Grid.Column="11" Grid.Column="11"
Margin="10" Margin="0,0,8,0"
HorizontalAlignment="Right"
Cursor="Hand"
FontSize="20"
FontWeight="Bold"
Foreground="{StaticResource mainColorBrush}"
MouseLeftButtonUp="TextBlock_MouseLeftButtonUp"
Style="{StaticResource TextBlockIcon}"
Text="{StaticResource txt-arrow_sync}"
ToolTip="刷新订单状态" />
<!-- Foreground="{Binding ElementName=b_gift, Path=BorderBrush}" -->
<TextBlock
Grid.Column="12"
Margin="0,0,8,0"
VerticalAlignment="Center" VerticalAlignment="Center"
d:Text="仅退款/退货退款" d:Text="仅退款/退货退款"
Foreground="Gray" Foreground="Gray"
@@ -220,7 +235,7 @@
<Border <Border
x:Name="borderFlag" x:Name="borderFlag"
Grid.Column="12" Grid.Column="13"
Width="auto" Width="auto"
Margin="2" Margin="2"
VerticalAlignment="Center" VerticalAlignment="Center"
@@ -31,6 +31,8 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
/// </summary> /// </summary>
public partial class OrderListRowHeaderCtrl : UserControl public partial class OrderListRowHeaderCtrl : UserControl
{ {
public static DateTime LastRefreshTime = DateTime.Now.AddSeconds(-5);
public OrderListRowHeaderCtrl() public OrderListRowHeaderCtrl()
{ {
InitializeComponent(); InitializeComponent();
@@ -87,7 +89,7 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
foreach (var ord in GlobalConfig.lstFilterOrder.Where(o => o.shop_id.ParseToString() == shop.ErpShopId).ToList()) foreach (var ord in GlobalConfig.lstFilterOrder.Where(o => o.shop_id.ParseToString() == shop.ErpShopId).ToList())
{ {
// 更新代发管理情况 // 更新代发管理情况
foreach (var orderItem in ord.orderItems) foreach (var orderItem in ord.OrderItems)
Dispatcher.Invoke(new Action(() => { orderItem.UpdateOrderItemBuyButton(); })); Dispatcher.Invoke(new Action(() => { orderItem.UpdateOrderItemBuyButton(); }));
} }
} }
@@ -119,7 +121,7 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
{ {
if (this.DataContext is oms_wei_order_info order) if (this.DataContext is oms_wei_order_info order)
{ {
if (order.orderItems.Count > 5) if (order.OrderItems.Count > 5)
{ {
//txtCount.Text = "该订单共计 " + order.orderItems.Count + " 件商品"; //txtCount.Text = "该订单共计 " + order.orderItems.Count + " 件商品";
} }
@@ -235,5 +237,20 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
BaseMsgWindow.ShowError("打开工单窗口失败:" + ex.Message); BaseMsgWindow.ShowError("打开工单窗口失败:" + ex.Message);
} }
} }
}
private async void TextBlock_MouseLeftButtonUp(object sender, MouseButtonEventArgs e)
{
if (!(this.DataContext is oms_wei_order_info order))
return;
if (LastRefreshTime > DateTime.Now.AddSeconds(-5))
{
BaseMsgWindow.ShowAnimateMessage("操作太快了请稍候再点击", "Error", 5);
return;
}
LastRefreshTime = DateTime.Now;
await Task.Run(async () => { await MainWindow.Instance.orderListCtrl.GetOrder(order.order_id); });
}
}
} }
@@ -58,10 +58,13 @@
<ColumnDefinition Width="120*" /> <ColumnDefinition Width="120*" />
<ColumnDefinition Width="72*" /> <ColumnDefinition Width="72*" />
</Grid.ColumnDefinitions> </Grid.ColumnDefinitions>
<TextBlock d:Text="No.1" <TextBlock
HorizontalAlignment="Center" HorizontalAlignment="Center"
VerticalAlignment="Center" VerticalAlignment="Center"
Text="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type ListBoxItem}}, Converter={StaticResource listBoxIndexConverter}}" /> d:Text="1"
Text="{Binding ItemOrder.Index}" />
<!-- Text="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(ItemsControl.AlternationIndex)}" -->
<!-- Text="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type ListBoxItem}}, Converter={StaticResource listBoxIndexConverter}}" -->
<CheckBox <CheckBox
Grid.Column="1" Grid.Column="1"
Margin="0,0,0,0" Margin="0,0,0,0"
@@ -92,7 +95,15 @@
Cursor="Hand" Cursor="Hand"
MouseDown="imgOrderItem_MouseDown" MouseDown="imgOrderItem_MouseDown"
MouseEnter="imgOrderItem_MouseEnter" MouseEnter="imgOrderItem_MouseEnter"
MouseLeave="imgOrderItem_MouseLeave" /> MouseLeave="imgOrderItem_MouseLeave">
<Image.Source>
<MultiBinding Converter="{StaticResource ImageUrlToBitmapImage}" Mode="OneWay">
<Binding IsAsync="True" Path="ThumbImgStr" />
<Binding IsAsync="True" Path="IsLoadThumbImg" />
<!--<Binding Path="DataContext.IsLoadImage" RelativeSource="{RelativeSource AncestorType=UserControl}" />-->
</MultiBinding>
</Image.Source>
</Image>
<wpf:SpacingStackPanel <wpf:SpacingStackPanel
Grid.Column="1" Grid.Column="1"
@@ -623,8 +634,8 @@
Foreground="{Binding BuyerTransitWaybillStatusStrColor}" Foreground="{Binding BuyerTransitWaybillStatusStrColor}"
Text="{Binding BuyerTransitWaybillStatusStr}" /> Text="{Binding BuyerTransitWaybillStatusStr}" />
</Border> </Border>
<Border <!--<Border
x:Name="borderWarehouseStatas" x:Name="borderWarehouseStatus"
Height="auto" Height="auto"
MinWidth="30" MinWidth="30"
Margin="0,0,4,0" Margin="0,0,4,0"
@@ -635,6 +646,8 @@
BorderBrush="{Binding WarehouseWaybillStatusBorderColor}" BorderBrush="{Binding WarehouseWaybillStatusBorderColor}"
BorderThickness="1" BorderThickness="1"
CornerRadius="2" CornerRadius="2"
Cursor="Hand"
MouseUp="borderWarehouseStatus_MouseUp"
Visibility="{Binding WarehouseWaybillStatusStrVisibility}"> Visibility="{Binding WarehouseWaybillStatusStrVisibility}">
<TextBlock <TextBlock
x:Name="txtWarehouseStatus" x:Name="txtWarehouseStatus"
@@ -645,8 +658,33 @@
Foreground="{Binding WarehouseWaybillStatusStrColor}" Foreground="{Binding WarehouseWaybillStatusStrColor}"
MouseEnter="txtWarehouseStatus_MouseEnter" MouseEnter="txtWarehouseStatus_MouseEnter"
Text="{Binding WarehouseWaybillStatusStr}" /> Text="{Binding WarehouseWaybillStatusStr}" />
</Border> </Border>-->
<Border <Border
x:Name="borderWarehousePackageStatus"
Height="auto"
MinWidth="30"
Margin="0,0,4,0"
HorizontalAlignment="Center"
d:Background="{StaticResource PageOkBrush50}"
d:BorderBrush="{StaticResource PageOkBrush}"
Background="{Binding WarehouseWaybillStatusBackColor}"
BorderBrush="{Binding WarehouseWaybillStatusBorderColor}"
BorderThickness="1"
CornerRadius="2"
Cursor="Hand"
MouseUp="borderWarehouseStatus_MouseUp"
Visibility="{Binding TransitPackageLatestWarehouseStatusStrVisibility}">
<TextBlock
x:Name="txtWarehouseStatus"
MinWidth="20"
VerticalAlignment="Center"
d:Text="包裹状态"
Background="Transparent"
Foreground="{Binding WarehouseWaybillStatusStrColor}"
MouseEnter="txtWarehouseStatus_MouseEnter"
Text="{Binding TransitPackageLatestWarehouseStatusStr}" />
</Border>
<!--<Border
Height="auto" Height="auto"
MinWidth="30" MinWidth="30"
Margin="0,0,4,0" Margin="0,0,4,0"
@@ -664,6 +702,25 @@
Background="Transparent" Background="Transparent"
Foreground="White" Foreground="White"
Text="{Binding TransitRefundVoidStatusStr}" /> Text="{Binding TransitRefundVoidStatusStr}" />
</Border>-->
<Border
Height="auto"
MinWidth="30"
Margin="0,0,4,0"
HorizontalAlignment="Center"
Background="{StaticResource pageColorBrush}"
BorderBrush="{StaticResource pageColorBrush}"
BorderThickness="1"
CornerRadius="2"
Visibility="{Binding TransitPackageLatestVoidStatusStrVisibility}">
<TextBlock
MinWidth="20"
Padding="0"
VerticalAlignment="Center"
d:Text="作废状态"
Background="Transparent"
Foreground="White"
Text="{Binding TransitPackageLatestVoidStatusStr}" />
</Border> </Border>
</WrapPanel> </WrapPanel>
@@ -767,6 +824,7 @@
Margin="-2,0" Margin="-2,0"
Padding="0" Padding="0"
VerticalAlignment="Top" VerticalAlignment="Top"
d:Text="2026-10-09 15:59:59"
Background="Transparent" Background="Transparent"
BorderThickness="0" BorderThickness="0"
Foreground="{Binding OutOrderTimeQualifiedBrush}" Foreground="{Binding OutOrderTimeQualifiedBrush}"
@@ -785,6 +843,7 @@
Margin="-2,0" Margin="-2,0"
Padding="0" Padding="0"
VerticalAlignment="Top" VerticalAlignment="Top"
d:Text="JTSD-JT12345678"
Background="Transparent" Background="Transparent"
BorderThickness="0" BorderThickness="0"
Foreground="{StaticResource PageOkBrush}" Foreground="{StaticResource PageOkBrush}"
@@ -816,6 +875,7 @@
Margin="-2,0" Margin="-2,0"
Padding="0" Padding="0"
VerticalAlignment="Center" VerticalAlignment="Center"
d:Text="YD-3123456789999"
Background="Transparent" Background="Transparent"
BorderThickness="0" BorderThickness="0"
IsReadOnly="True" IsReadOnly="True"
@@ -904,7 +964,7 @@
<wpf:TitleContent <wpf:TitleContent
Title="外采单号:" Title="外采单号:"
Foreground="#0099ff" Foreground="#0099ff"
Visibility="{Binding ItemOrder.out_order_no, Converter={StaticResource HasTextVisibility}}"> Visibility="{Binding OutOrderNoVisibility}">
<WrapPanel Orientation="Horizontal"> <WrapPanel Orientation="Horizontal">
<uc:UcWaterMarkTextBox1 <uc:UcWaterMarkTextBox1
x:Name="txtDirectBuyerOrderNo" x:Name="txtDirectBuyerOrderNo"
@@ -928,7 +988,7 @@
Background="Transparent" Background="Transparent"
Cursor="Hand" Cursor="Hand"
MouseLeftButtonDown="PathCopyDirectBuyerOrderNo_MouseLeftButtonDown" MouseLeftButtonDown="PathCopyDirectBuyerOrderNo_MouseLeftButtonDown"
Visibility="{Binding ElementName=txtDirectBuyerOrderNo, Path=Text, Converter={StaticResource HasTextVisibility}}"> Visibility="{Binding OutOrderNoVisibility}">
<Path <Path
Data="M80 432a128 128 0 0 1 128-128h384a128 128 0 0 1 128 128v384a128 128 0 0 1-128 128h-384a128 128 0 0 1-128-128v-384z m128-64a64 64 0 0 0-64 64v384a64 64 0 0 0 64 64h384a64 64 0 0 0 64-64v-384a64 64 0 0 0-64-64h-384z M816 144h-384a64 64 0 0 0-64 64 32 32 0 0 1-64 0 128 128 0 0 1 128-128h384a128 128 0 0 1 128 128v384a128 128 0 0 1-128 128 32 32 0 0 1 0-64 64 64 0 0 0 64-64v-384a64 64 0 0 0-64-64z" Data="M80 432a128 128 0 0 1 128-128h384a128 128 0 0 1 128 128v384a128 128 0 0 1-128 128h-384a128 128 0 0 1-128-128v-384z m128-64a64 64 0 0 0-64 64v384a64 64 0 0 0 64 64h384a64 64 0 0 0 64-64v-384a64 64 0 0 0-64-64h-384z M816 144h-384a64 64 0 0 0-64 64 32 32 0 0 1-64 0 128 128 0 0 1 128-128h384a128 128 0 0 1 128 128v384a128 128 0 0 1-128 128 32 32 0 0 1 0-64 64 64 0 0 0 64-64v-384a64 64 0 0 0-64-64z"
Fill="{StaticResource PageLinkBrush}" Fill="{StaticResource PageLinkBrush}"
@@ -1358,7 +1418,6 @@
</wpf:SpacingStackPanel> </wpf:SpacingStackPanel>
<!-- 操作 --> <!-- 操作 -->
<wpf:SpacingStackPanel <wpf:SpacingStackPanel
Grid.Column="8" Grid.Column="8"
HorizontalAlignment="Right" HorizontalAlignment="Right"
@@ -1376,107 +1435,74 @@
Orientation="Vertical" Orientation="Vertical"
VerticalSpacing="6"> VerticalSpacing="6">
<Button
x:Name="btnMapSkus"
Height="22"
MinWidth="38"
Margin="0,0,0,0"
HorizontalAlignment="Center"
Click="btnMapSkus_Click"
Content="选择SKU"
Style="{StaticResource BasePageButtonLightStyle}"
Visibility="{Binding MapSkusBtnVisibility}" />
<wpf:TitleContent> <Button
<Button x:Name="btnBuyOrder"
x:Name="btnMapSkus" Height="22"
Height="22" MinWidth="38"
MinWidth="38" Margin="0,0,0,0"
Margin="0,0,0,0" HorizontalAlignment="Center"
HorizontalAlignment="Center" d:Background="{StaticResource pageColorLightBrush}"
Click="btnMapSkus_Click" d:BorderBrush="{StaticResource pageColorBrush}"
Content="选择SKU" d:Content="拍  单"
Style="{StaticResource BasePageButtonLightStyle}" d:Foreground="{StaticResource pageColorBrush}"
Visibility="{Binding MapSkusBtnVisibility}" /> d:Visibility="Visible"
</wpf:TitleContent> Background="{Binding BuyGoodsBtnBackColor}"
BorderBrush="{Binding BuyGoodsBtnColor}"
Click="btnBuyOrder_Click"
Content="{Binding BuyGoodsBtnTxt}"
Foreground="{Binding BuyGoodsBtnColor}"
IsEnabled="{Binding IsBuyGoodsBtnEnabled}"
Style="{StaticResource BasePageButtonLightStyle}"
Visibility="{Binding ItemOrder.IsWaitBuy, Converter={StaticResource visibleToVisibilityConverter}}" />
<wpf:TitleContent> <Button
<Button x:Name="btnVoidTransitOrder"
x:Name="btnBuyOrder" Height="22"
Height="22" MinWidth="38"
MinWidth="38" Margin="0,0,0,0"
Margin="0,0,0,0" HorizontalAlignment="Center"
HorizontalAlignment="Center" d:Visibility="Visible"
d:Background="{StaticResource pageColorLightBrush}" Click="btnVoidTransitOrder_Click"
d:BorderBrush="{StaticResource pageColorBrush}" Content="作废重拍"
d:Content="拍  单" Style="{StaticResource BasePageButtonLightStyle}"
d:Foreground="{StaticResource pageColorBrush}" Visibility="{Binding BtnVoidTransitOrderVisibility}" />
d:Visibility="Visible"
Background="{Binding BuyGoodsBtnBackColor}"
BorderBrush="{Binding BuyGoodsBtnColor}"
Click="btnBuyOrder_Click"
Content="{Binding BuyGoodsBtnTxt}"
Foreground="{Binding BuyGoodsBtnColor}"
IsEnabled="{Binding IsBuyGoodsBtnEnabled}"
Style="{StaticResource BasePageButtonLightStyle}"
Visibility="{Binding ItemOrder.IsWaitBuy, Converter={StaticResource visibleToVisibilityConverter}}" />
</wpf:TitleContent>
<wpf:TitleContent>
<Button
x:Name="btnVoidTransitOrder"
Height="22"
MinWidth="38"
Margin="0,0,0,0"
HorizontalAlignment="Center"
d:Visibility="Visible"
Click="btnVoidTransitOrder_Click"
Content="作废重拍"
Style="{StaticResource BasePageButtonLightStyle}"
Visibility="{Binding BtnVoidTransitOrderVisibility}" />
</wpf:TitleContent>
<wpf:TitleContent>
<Button
x:Name="btnAbnormalOrderRebuy"
Height="22"
MinWidth="38"
Margin="0,0,0,0"
HorizontalAlignment="Center"
d:Visibility="Visible"
Click="btnAbnormalOrderRebuy_Click"
Content="异常重拍"
Style="{StaticResource BasePageButtonLightStyle}"
Visibility="{Binding BtnAbnormalOrderRebuyVisibility}" />
</wpf:TitleContent>
<Button
x:Name="btnAbnormalOrderRebuy"
Height="22"
MinWidth="38"
Margin="0,0,0,0"
HorizontalAlignment="Center"
d:Visibility="Visible"
Click="btnAbnormalOrderRebuy_Click"
Content="异常重拍"
Style="{StaticResource BasePageButtonLightStyle}"
Visibility="{Binding BtnAbnormalOrderRebuyVisibility}" />
<!-- 直发拍单 --> <!-- 直发拍单 -->
<wpf:TitleContent> <Button
<Button x:Name="btnDirectBuyOrder"
x:Name="btnDirectBuyOrder" Height="22"
Height="22" MinWidth="38"
MinWidth="38" Margin="0,0,0,0"
Margin="0,0,0,0" HorizontalAlignment="Center"
HorizontalAlignment="Center" d:Visibility="Visible"
Click="btnDirectBuyOrder_Click" Click="btnDirectBuyOrder_Click"
Content="直发拍单" Content="直发拍单"
Style="{StaticResource BasePageButtonLightStyle}" Style="{StaticResource BasePageButtonLightStyle}"
Visibility="{Binding BtnDirectBuyOrderVisibility}" /> Visibility="{Binding BtnDirectBuyOrderVisibility}" />
</wpf:TitleContent>
<!-- 礼品发货 -->
<wpf:TitleContent>
<Button
x:Name="btnShipGift"
Height="22"
MinWidth="38"
Margin="0,0,0,0"
HorizontalAlignment="Center"
d:Visibility="Visible"
Click="btn_ShipGiftCommand"
Content="礼品发货"
Style="{StaticResource BasePageButtonLightStyle}"
Visibility="{Binding ItemOrder.IsWaitSend, Converter={StaticResource VisibleToVisibilityConverter}}" />
</wpf:TitleContent>
</wpf:SpacingStackPanel>
<wpf:SpacingStackPanel
Grid.Column="8"
HorizontalAlignment="Right"
VerticalAlignment="Center"
Orientation="Vertical"
VerticalSpacing="3">
<Button <Button
x:Name="btnChangeWaybill" x:Name="btnChangeWaybill"
MinWidth="38" MinWidth="38"
@@ -1486,11 +1512,46 @@
HorizontalAlignment="Center" HorizontalAlignment="Center"
d:Visibility="Visible" d:Visibility="Visible"
Click="btnChangeWaybill_Click" Click="btnChangeWaybill_Click"
Content="补发/修改物流"
FontSize="11" FontSize="11"
Style="{StaticResource BasePageButtonLightStyle}" Style="{StaticResource BasePageButtonLightStyle}"
Visibility="{Binding ItemOrder.IsShowChangeWaybillBtn, Converter={StaticResource VisibleToVisibilityConverter}}" /> Visibility="{Binding ItemOrder.IsShowChangeWaybillBtn, Converter={StaticResource VisibleToVisibilityConverter}}">
<TextBlock TextAlignment="Center">
补发/修改<LineBreak />
物流</TextBlock>
</Button>
<!-- 礼品发货 -->
<Button <Button
x:Name="btnShipGift"
Height="22"
MinWidth="38"
Margin="0,0,0,0"
HorizontalAlignment="Center"
Click="btn_ShipGiftCommand"
Content="礼品发货"
Style="{StaticResource BasePageButtonLightStyle}"
Visibility="{Binding ItemOrder.IsWaitSend, Converter={StaticResource VisibleToVisibilityConverter}}" />
</wpf:SpacingStackPanel>
<wpf:SpacingStackPanel
Grid.Column="8"
HorizontalAlignment="Right"
VerticalAlignment="Center"
Orientation="Vertical"
VerticalSpacing="5">
<Button
x:Name="btnTransitInfo"
Height="22"
MinWidth="38"
Margin="0,0,0,0"
HorizontalAlignment="Center"
Click="btnTransitInfo_Click"
Content="云仓详情"
Style="{StaticResource BasePageButtonLightStyle}"
Visibility="{Binding ItemTransitOrderWithVoid, Converter={StaticResource hasValueToVisibilityConverter}}" />
<!--<Button
x:Name="btnAddEditTransitWarehouseReject_New" x:Name="btnAddEditTransitWarehouseReject_New"
MinWidth="38" MinWidth="38"
MinHeight="20" MinHeight="20"
@@ -1543,7 +1604,75 @@
Content="滞留补发买家" Content="滞留补发买家"
FontSize="11" FontSize="11"
Style="{StaticResource BasePageButtonLightStyle}" Style="{StaticResource BasePageButtonLightStyle}"
Visibility="{Binding ItemOrder.IsShowTransitExtraPackagesBtn, Converter={StaticResource VisibleToVisibilityConverter}}" /> Visibility="{Binding ItemOrder.IsShowTransitExtraPackagesBtn, Converter={StaticResource VisibleToVisibilityConverter}}" />-->
<Button
x:Name="btnVoidPackage"
MinWidth="38"
MinHeight="20"
Margin="0,0,0,0"
Padding="0"
HorizontalAlignment="Center"
d:Content="作废包裹"
d:Visibility="Visible"
Click="btnVoidTransitOrder_Click"
Content="{Binding VoidPackageTypeStr}"
FontSize="11"
Style="{StaticResource BasePageButtonLightStyle}"
Visibility="{Binding TransitPackageLatest.VoidPackageBtnVisibility}" />
<Button
x:Name="btnAddEditTransitWarehouseReject_New"
MinWidth="38"
MinHeight="20"
Margin="0,0,0,0"
Padding="0"
HorizontalAlignment="Center"
d:Visibility="Visible"
Click="btnAddEditTransitWarehouseReject_Click"
Style="{StaticResource BasePageButtonLightStyle}"
Visibility="{Binding TransitPackageLatest.RejectPackageBtnVisibility}">
<TextBlock>
云仓拒收<LineBreak />
退回总店</TextBlock>
</Button>
<Button
x:Name="btnAddEditTransitWarehouseAfterSale_n1"
MinWidth="38"
MinHeight="20"
Margin="0,0,0,0"
Padding="0"
Click="btnAddEditTransitWarehouseAfterSale_Click"
Style="{StaticResource BasePageButtonLightStyle}"
Visibility="{Binding TransitPackageLatest.ReturnPackageBtnVisibility}">
<TextBlock>
拒收失败<LineBreak />
转寄总店</TextBlock>
</Button>
<Button
x:Name="btnAddEditTransitWarehouseAfterSale_n2"
MinWidth="38"
MinHeight="20"
Margin="0,0,0,0"
Padding="0"
Click="btnAddEditTransitWarehouseAfterSale_Click"
Style="{StaticResource BasePageButtonLightStyle}"
Visibility="{Binding TransitPackageLatest.InterceptPackageBtnVisibility}">
<TextBlock>
出库拦截<LineBreak />
退回仓库</TextBlock>
</Button>
<Button
x:Name="btnTransitExtraPackages"
Height="20"
MinWidth="38"
Margin="0,0,0,0"
Padding="0"
HorizontalAlignment="Center"
d:Visibility="Visible"
Click="btnTransitExtraPackages_Click"
Content="滞留补发买家"
FontSize="11"
Style="{StaticResource BasePageButtonLightStyle}"
Visibility="{Binding TransitPackageLatest.ExtraPackagesBtnVisibility}" />
</wpf:SpacingStackPanel> </wpf:SpacingStackPanel>
</wpf:SpacingStackPanel> </wpf:SpacingStackPanel>
</Grid> </Grid>
File diff suppressed because it is too large. Load diff
@@ -0,0 +1,85 @@
<UserControl
x:Class="_29WxOrderWpf.Ctrls.OrderCtrls.OrderTransitListCtrl"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:local="clr-namespace:_29WxOrderWpf.Ctrls.OrderCtrls"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:wpf="WPFCommon"
d:DesignHeight="450"
d:DesignWidth="800"
Background="White"
Foreground="DimGray"
Loaded="OrderTransitListCtrl_Loaded"
mc:Ignorable="d">
<UserControl.Resources>
<Style BasedOn="{StaticResource TitleContentBaseStyle}" TargetType="wpf:TitleContent">
<Setter Property="Placement" Value="Left" />
<Setter Property="TitleVerticalAlignment" Value="Center" />
<Setter Property="LeftTitlePadding" Value="0,0,0,0" />
</Style>
<Style TargetType="wpf:SpacingStackPanel">
<Setter Property="Margin" Value="3,0" />
</Style>
</UserControl.Resources>
<Grid>
<Grid.RowDefinitions>
<RowDefinition Height="auto" />
<RowDefinition Height="*" />
</Grid.RowDefinitions>
<StackPanel Height="30" Orientation="Horizontal">
<TextBlock
Margin="10,0,0,0"
VerticalAlignment="Center"
Text="店铺:" />
<TextBox
VerticalContentAlignment="Center"
d:Text="音诉云仓"
Background="Transparent"
BorderThickness="0"
Foreground="DimGray"
IsReadOnly="True"
Text="{Binding ShopNameStr}" />
<TextBlock
Margin="10,0,0,0"
VerticalAlignment="Center"
Text="订单号:" />
<TextBox
VerticalContentAlignment="Center"
d:Text="3700000000000000"
Background="Transparent"
BorderThickness="0"
Foreground="DimGray"
IsReadOnly="True"
Text="{Binding OrderIdStr}" />
</StackPanel>
<ListBox
x:Name="lbxTransitList"
Grid.Row="4"
Margin="7,0,7,0"
HorizontalContentAlignment="Stretch"
BorderThickness="0">
<!-- 使用自定义属性模板去除ListBox高亮显示框 -->
<ListBox.ItemContainerStyle>
<Style TargetType="ListBoxItem">
<Setter Property="Template">
<Setter.Value>
<ControlTemplate TargetType="ListBoxItem">
<ContentPresenter
Content="{TemplateBinding Content}"
ContentStringFormat="{TemplateBinding ContentStringFormat}"
ContentTemplate="{TemplateBinding ContentTemplate}" />
</ControlTemplate>
</Setter.Value>
</Setter>
</Style>
</ListBox.ItemContainerStyle>
<ListBox.ItemTemplate>
<DataTemplate>
<!-- 此处绑定将数据源传递给子自定义控件 -->
<local:OrderTransitListDetailCtrl DataContext="{Binding}" />
</DataTemplate>
</ListBox.ItemTemplate>
</ListBox>
</Grid>
</UserControl>
@@ -0,0 +1,64 @@
using AllBase.Model.DBModel;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Windows;
using System.Windows.Controls;
using System.Windows.Data;
using System.Windows.Documents;
using System.Windows.Input;
using System.Windows.Media;
using System.Windows.Media.Imaging;
using System.Windows.Navigation;
using System.Windows.Shapes;
namespace _29WxOrderWpf.Ctrls.OrderCtrls;
/// <summary>
/// OrderTransitListCtrl.xaml 的交互逻辑
/// </summary>
public partial class OrderTransitListCtrl : UserControl
{
OrderTransitListCtrlViewModel ViewModel;
public OrderTransitListCtrl(oms_wei_order_item_transit_model transitInfo)
{
InitializeComponent();
UpdateViewModel(transitInfo);
}
public void UpdateViewModel(oms_wei_order_item_transit_model transitInfo)
{
ViewModel = new OrderTransitListCtrlViewModel(transitInfo);
ViewModel.RequestClose += ViewModel_RequestClose;
DataContext = ViewModel;
this.lbxTransitList.ItemsSource = ViewModel.TransitInfo.OrderItemTransitDetailList;
}
private void ViewModel_RequestClose()
{
Window parentWindow = Window.GetWindow(this);
if (this.IsLoaded && parentWindow != null)
parentWindow.Close();
}
private void OrderTransitListCtrl_Loaded(object sender, RoutedEventArgs e)
{
Window parentWindow = Window.GetWindow(this);
if (parentWindow != null)
{
parentWindow.Closed += ChangeWaybillView_Closed;
}
ViewModel.Start();
}
private void ChangeWaybillView_Closed(object sender, EventArgs e)
{
ViewModel.Stop();
}
}
@@ -0,0 +1,62 @@
using AllBase.Model.DBModel;
using AllBase.Model.MvvmBaseClasses;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace _29WxOrderWpf.Ctrls.OrderCtrls;
public class OrderTransitListCtrlViewModel : PropertyNotifyObject
{
private volatile bool _isWindowLoaded = false;
public oms_wei_order_item_transit_model TransitInfo
{
get { return this.GetValue(x => x.TransitInfo); }
set { this.SetValue(x => x.TransitInfo, value); }
}
public oms_wei_order_item_info OrderItem
{
get { return this.GetValue(x => x.OrderItem); }
set { this.SetValue(x => x.OrderItem, value); }
}
public string OrderIdStr
{
get { return this.GetValue(x => x.OrderIdStr); }
set { this.SetValue(x => x.OrderIdStr, value); }
}
public string ShopNameStr
{
get { return this.GetValue(x => x.ShopNameStr); }
set { this.SetValue(x => x.ShopNameStr, value); }
}
/// <summary>请求关闭窗口</summary>
public event Action RequestClose;
public OrderTransitListCtrlViewModel(oms_wei_order_item_transit_model transitInfo)
{
TransitInfo = transitInfo;
OrderItem = transitInfo?.OrderItem;
OrderIdStr = OrderItem?.order_id;
ShopNameStr = OrderItem?.ItemOrder?.Shop?.ShopAccount;
}
/// <summary>
/// 窗口加载完成时调用
/// </summary>
public void Start()
{
_isWindowLoaded = true;
}
/// <summary>
/// 窗口关闭时调用,停止后台任务
/// </summary>
public void Stop()
{
_isWindowLoaded = false;
}
}
@@ -0,0 +1,411 @@
<UserControl
x:Class="_29WxOrderWpf.Ctrls.OrderCtrls.OrderTransitListDetailCtrl"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:local="clr-namespace:_29WxOrderWpf.Ctrls.OrderCtrls"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:wpf="WPFCommon"
d:DesignHeight="280"
d:DesignWidth="1200"
Background="White"
mc:Ignorable="d">
<UserControl.Resources>
<Style BasedOn="{StaticResource TitleContentBaseStyle}" TargetType="wpf:TitleContent">
<Setter Property="Placement" Value="Left" />
<Setter Property="TitleVerticalAlignment" Value="Center" />
<Setter Property="LeftTitlePadding" Value="0,0,0,0" />
</Style>
<Style TargetType="wpf:SpacingStackPanel">
<Setter Property="Margin" Value="3,0" />
</Style>
</UserControl.Resources>
<Border
MinHeight="50"
Margin="5"
BorderBrush="#8087CEEB"
BorderThickness="1"
CornerRadius="10">
<Grid Opacity="{Binding Opacity}">
<Grid.RowDefinitions>
<RowDefinition Height="auto" />
<RowDefinition Height="*" />
</Grid.RowDefinitions>
<Border Background="#5087CEEB" CornerRadius="8,8,0,0">
<StackPanel MinHeight="30" Orientation="Horizontal">
<TextBlock
Margin="10,0,0,0"
HorizontalAlignment="Left"
VerticalAlignment="Center"
Text="仓库订单号" />
<TextBox
VerticalContentAlignment="Center"
d:Text="261008-123456789012345"
Background="Transparent"
BorderThickness="0"
Foreground="DimGray"
IsReadOnly="True"
Text="{Binding OrderCode}" />
<TextBlock
Margin="10,0,0,0"
HorizontalAlignment="Left"
VerticalAlignment="Center"
d:Text="发货包裹"
FontWeight="Bold"
Foreground="{Binding TransitTypeStrColor}"
Text="{Binding TransitTypeStr}" />
<TextBox
VerticalContentAlignment="Center"
d:Text="ABCDEF1"
Background="Transparent"
BorderThickness="0"
Foreground="DimGray"
IsReadOnly="True"
Text="{Binding SourceCode}" />
</StackPanel>
</Border>
<Grid Grid.Row="1">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="*" />
<ColumnDefinition Width="*" />
<ColumnDefinition Width="0.7*" />
<ColumnDefinition Width="*" />
<ColumnDefinition Width="0.5*" />
</Grid.ColumnDefinitions>
<Border
Margin="0,10"
BorderBrush="LightSkyBlue"
BorderThickness="0,0,1,0">
<wpf:SpacingStackPanel
Margin="10,10"
VerticalAlignment="Center"
Orientation="Vertical"
VerticalSpacing="4">
<wpf:TitleContent Title="交易单号:" Foreground="#FF666666">
<TextBox
d:Text="371234567890123456"
Background="Transparent"
BorderThickness="0"
Foreground="#FF888888"
IsReadOnly="True"
Text="{Binding WxOrderId}"
TextWrapping="Wrap" />
</wpf:TitleContent>
<wpf:TitleContent Title="采购账户:" Foreground="#FF666666">
<WrapPanel>
<TextBox
x:Name="txtOutOrderBuyer"
d:Text="张三"
Background="Transparent"
BorderThickness="0"
Cursor="Hand"
Foreground="#AA0000FF"
IsReadOnly="True"
Tag="{Binding OutBuyerId}"
Text="{Binding OutBuyerName}"
TextWrapping="Wrap" />
<Border
x:Name="borderTransitBuyerRefundStatus"
Height="auto"
MinWidth="30"
Margin="2,0,0,0"
HorizontalAlignment="Center"
d:Background="{StaticResource PageOkBrush}"
d:BorderBrush="{StaticResource PageOkBrush}"
Background="{Binding TransitDetailRefundStatusBackColor}"
BorderBrush="{Binding TransitDetailRefundStatusBackColor}"
BorderThickness="1"
CornerRadius="2"
Visibility="{Binding TransitDetailRefundStatusStrVisibility}">
<TextBlock
x:Name="txtRefundStatus"
MinWidth="20"
Padding="0"
VerticalAlignment="Center"
d:Text="退货成功"
Background="Transparent"
Foreground="White"
Text="{Binding TransitDetailRefundStatusStr}" />
</Border>
</WrapPanel>
</wpf:TitleContent>
<wpf:TitleContent Title="采购单号:" Foreground="#FF666666">
<TextBox
x:Name="txtOutOrderId"
d:Text="261008-1234567890123456"
Background="Transparent"
BorderThickness="0"
Cursor="Hand"
Foreground="#AA0000FF"
IsReadOnly="True"
Text="{Binding OutOrderId}"
TextWrapping="Wrap" />
</wpf:TitleContent>
<wpf:TitleContent Title="下单时间:" Foreground="#FF666666">
<TextBox
d:Text="26-10-07 10:33:33"
Background="Transparent"
BorderThickness="0"
Foreground="#FF888888"
IsReadOnly="True"
Text="{Binding WxOrderCreateTimeStr}"
TextWrapping="Wrap" />
</wpf:TitleContent>
<wpf:TitleContent Title="添加时间:" Foreground="#FF666666">
<TextBox
d:Text="26-10-07 18:33:33"
Background="Transparent"
BorderThickness="0"
Foreground="#FF888888"
IsReadOnly="True"
Text="{Binding TransitAddTimeStr}"
TextWrapping="Wrap" />
</wpf:TitleContent>
<wpf:TitleContent Title="创建时间:" Foreground="#FF666666">
<TextBox
d:Text="26-10-08 00:33:33"
Background="Transparent"
BorderThickness="0"
Foreground="#FF888888"
IsReadOnly="True"
Text="{Binding CreateTimeStr}"
TextWrapping="Wrap" />
</wpf:TitleContent>
<!--<wpf:TitleContent Title="店铺名称:">
<TextBox
d:Text="芥麦亚"
Background="Transparent"
BorderThickness="0"
IsReadOnly="True"
Text="{Binding ShopName}"
TextWrapping="Wrap" />
</wpf:TitleContent>-->
</wpf:SpacingStackPanel>
</Border>
<Border
Grid.Column="1"
Margin="0,10"
BorderBrush="LightSkyBlue"
BorderThickness="0,0,1,0"
Opacity="0.5">
<wpf:SpacingStackPanel
Margin="10,10"
VerticalAlignment="Center"
Orientation="Vertical"
VerticalSpacing="4">
<wpf:TitleContent
Title="{Binding WarehouseName}"
d:Title="上海仓"
FontWeight="Bold">
<WrapPanel>
<TextBox
d:Text="已出仓"
Background="Transparent"
BorderThickness="0"
FontWeight="Normal"
IsReadOnly="True"
Text="{Binding WarehouseStatus}"
TextWrapping="Wrap" />
</WrapPanel>
</wpf:TitleContent>
<wpf:TitleContent Title="入库单号:">
<TextBox
d:Text="JTSD-JT12345678901122"
Background="Transparent"
BorderThickness="0"
IsReadOnly="True"
Text="{Binding UpperWaybill}"
TextWrapping="Wrap" />
</wpf:TitleContent>
<wpf:TitleContent Title="出库单号:">
<TextBox
d:Text="YD-3111111555555123"
Background="Transparent"
BorderThickness="0"
IsReadOnly="True"
Text="{Binding DownWaybill}"
TextWrapping="Wrap" />
</wpf:TitleContent>
<wpf:TitleContent Title="货架号:">
<TextBox
d:Text="EB3021"
Background="Transparent"
BorderThickness="0"
IsReadOnly="True"
Text="{Binding ShelfCodeStr}"
TextWrapping="Wrap" />
</wpf:TitleContent>
<wpf:TitleContent Title="货架记录时间:">
<TextBox
d:Text="26-10-08 00:33:33"
Background="Transparent"
BorderThickness="0"
IsReadOnly="True"
Text="{Binding ShelfTimeStr}"
TextWrapping="Wrap" />
</wpf:TitleContent>
</wpf:SpacingStackPanel>
</Border>
<Border
Grid.Column="2"
Margin="0,10"
BorderBrush="LightSkyBlue"
BorderThickness="0,0,1,0"
Opacity="0.5">
<wpf:SpacingStackPanel
Margin="10,10"
VerticalAlignment="Center"
Orientation="Vertical"
VerticalSpacing="4">
<wpf:TitleContent Title="作废状态:" FontWeight="Bold">
<TextBox
d:Text="已作废"
Background="Transparent"
BorderThickness="0"
FontWeight="Normal"
IsReadOnly="True"
Text="{Binding TransitVoidStatus}"
TextWrapping="Wrap" />
</wpf:TitleContent>
<wpf:TitleContent Title="拒收状态:" FontWeight="Bold">
<TextBox
d:Text="拒收失败"
Background="Transparent"
BorderThickness="0"
FontWeight="Normal"
IsReadOnly="True"
Text="{Binding TransitRejectStatus}"
TextWrapping="Wrap" />
</wpf:TitleContent>
<wpf:TitleContent Title="拦截状态:" FontWeight="Bold">
<TextBox
d:Text="已拦截"
Background="Transparent"
BorderThickness="0"
FontWeight="Normal"
IsReadOnly="True"
Text="{Binding TransitReturnStatus}"
TextWrapping="Wrap" />
</wpf:TitleContent>
</wpf:SpacingStackPanel>
</Border>
<Border
Grid.Column="3"
Margin="0,10"
BorderBrush="LightSkyBlue"
BorderThickness="0,0,1,0"
Opacity="0.5">
<wpf:SpacingStackPanel
Margin="10,10"
VerticalAlignment="Center"
Orientation="Vertical"
VerticalSpacing="4">
<wpf:TitleContent Title="到仓时间:">
<TextBox
d:Text="26-10-07 10:33:33"
Background="Transparent"
BorderThickness="0"
IsReadOnly="True"
Text="{Binding InboundTimeStr}"
TextWrapping="Wrap" />
</wpf:TitleContent>
<wpf:TitleContent Title="取号时间:">
<TextBox
d:Text="26-10-08 00:33:33"
Background="Transparent"
BorderThickness="0"
IsReadOnly="True"
Text="{Binding PickUpTimeStr}"
TextWrapping="Wrap" />
</wpf:TitleContent>
<wpf:TitleContent Title="出仓时间:">
<TextBox
d:Text="26-10-07 10:33:33"
Background="Transparent"
BorderThickness="0"
IsReadOnly="True"
Text="{Binding OutboundTimeStr}"
TextWrapping="Wrap" />
</wpf:TitleContent>
</wpf:SpacingStackPanel>
</Border>
<Border Grid.Column="4">
<wpf:SpacingStackPanel
Grid.Column="8"
HorizontalAlignment="Center"
VerticalAlignment="Center"
Orientation="Vertical"
VerticalSpacing="5">
<Button
x:Name="btnVoidPackage"
MinWidth="38"
MinHeight="20"
Margin="0,0,0,0"
Padding="2"
HorizontalAlignment="Center"
d:Visibility="Visible"
Click="btnVoidPackage_Click"
Style="{StaticResource BasePageButtonLightStyle}"
Visibility="{Binding VoidPackageBtnVisibility}">
作废包裹
</Button>
<Button
x:Name="btnAddEditTransitWarehouseReject_New"
MinWidth="38"
MinHeight="20"
Margin="0,0,0,0"
Padding="2"
HorizontalAlignment="Center"
d:Visibility="Visible"
Click="btnAddEditTransitWarehouseReject_Click"
Style="{StaticResource BasePageButtonLightStyle}"
Visibility="{Binding RejectPackageBtnVisibility}">
<!--<TextBlock>
云仓拒收<LineBreak />
退回总店</TextBlock>-->
云仓拒收退回总店
</Button>
<Button
x:Name="btnAddEditTransitWarehouseAfterSale_n1"
MinWidth="38"
MinHeight="20"
Margin="0,0,0,0"
Padding="2"
Click="btnAddEditTransitWarehouseAfterSale_Click"
Style="{StaticResource BasePageButtonLightStyle}"
Visibility="{Binding ReturnPackageBtnVisibility}">
拒收失败转寄总店
</Button>
<Button
x:Name="btnAddEditTransitWarehouseAfterSale_n2"
MinWidth="38"
MinHeight="20"
Margin="0,0,0,0"
Padding="2"
Click="btnAddEditTransitWarehouseAfterSale_Click"
Style="{StaticResource BasePageButtonLightStyle}"
Visibility="{Binding InterceptPackageBtnVisibility}">
出库拦截退回仓库
</Button>
<Button
x:Name="btnTransitExtraPackages"
Height="20"
MinWidth="38"
Margin="0,0,0,0"
Padding="2"
HorizontalAlignment="Center"
d:Visibility="Visible"
Click="btnTransitExtraPackages_Click"
Content="滞留补发买家"
FontSize="11"
Style="{StaticResource BasePageButtonLightStyle}"
Visibility="{Binding ExtraPackagesBtnVisibility}" />
</wpf:SpacingStackPanel>
</Border>
</Grid>
</Grid>
</Border>
</UserControl>
@@ -0,0 +1,246 @@
using _29WxOrderWpf.BaseWindows;
using _29WxOrderWpf.Views;
using AllBase;
using AllBase.Helper;
using AllBase.Model.DBModel;
using NaiBa.Util.Extension;
using Newtonsoft.Json.Linq;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Windows;
using System.Windows.Controls;
using System.Windows.Data;
using System.Windows.Documents;
using System.Windows.Input;
using System.Windows.Media;
using System.Windows.Media.Imaging;
using System.Windows.Navigation;
using System.Windows.Shapes;
using Work;
using Work._29Tools.BLL;
using WxOrder.Framework.Commons;
namespace _29WxOrderWpf.Ctrls.OrderCtrls;
/// <summary>
/// OrderTransitListDetailCtrl.xaml 的交互逻辑
/// </summary>
public partial class OrderTransitListDetailCtrl : UserControl
{
public OrderTransitListDetailCtrl()
{
InitializeComponent();
this.txtOutOrderId.AddHandler(TextBox.MouseUpEvent, new MouseButtonEventHandler(txtOutOrderId_MouseLeftButtonUp), true);
this.txtOutOrderBuyer.AddHandler(TextBox.MouseUpEvent, new MouseButtonEventHandler(txtOutOrderId_MouseLeftButtonUp), true);
}
/// <summary> 作废包裹 </summary>
private async void btnVoidPackage_Click(object sender, RoutedEventArgs e)
{
if (this.DataContext is oms_wei_order_item_transit_detail_info transitDetailInfo)
{
btnVoidPackage.IsEnabled = false;
var orderItem = transitDetailInfo.oms_wei_order_item_info;
var transitOrder = transitDetailInfo.oms_wei_external_procurement_log_info;
var returnOrder = transitDetailInfo.oms_wei_external_procurement_after_sale_info;
var extOrder = transitDetailInfo.oms_wei_transfer_extra_package;
// 作废发货包裹
if (transitOrder != null)
{
transitOrder = orderItem.ItemTransitOrders.FirstOrDefault(t => t.order_code == transitOrder.order_code) ?? transitOrder;
await OrderTransitService.VoidOrder(orderItem, transitOrder);
}
// 作废退货包裹
else if (returnOrder != null)
{
try
{
var voidResult = await OrderTransitService.VoidAfterSalePackage(orderItem, returnOrder);
if (!string.IsNullOrEmpty(voidResult))
BaseMsgWindow.ShowInfo(voidResult);
}
catch (Exception ex)
{
BaseMsgWindow.ShowError(ex.Message);
}
}
// 作废额外包裹
else if (extOrder != null)
{
try
{
var voidResult = await OrderTransitService.VoidExtraPackage(orderItem, extOrder);
if (!string.IsNullOrEmpty(voidResult))
BaseMsgWindow.ShowInfo(voidResult);
}
catch (Exception ex)
{
BaseMsgWindow.ShowError(ex.Message);
}
}
RefreshListCtrl(orderItem);
btnVoidPackage.IsEnabled = true;
}
}
/// <summary> 拒收包裹 </summary>
private async void btnAddEditTransitWarehouseReject_Click(object sender, RoutedEventArgs e)
{
if (this.DataContext is oms_wei_order_item_transit_detail_info transitDetailInfo)
{
btnAddEditTransitWarehouseReject_New.IsEnabled = false;
var orderItem = transitDetailInfo.oms_wei_order_item_info;
var transitOrder = transitDetailInfo.oms_wei_external_procurement_log_info;
var returnOrder = transitDetailInfo.oms_wei_external_procurement_after_sale_info;
var extOrder = transitDetailInfo.oms_wei_transfer_extra_package;
// 拒收发货包裹
if (transitOrder != null)
{
try
{
var rejectRst = await OrderTransitService.RejectTransitOrder(orderItem, transitOrder);
if (!string.IsNullOrEmpty(rejectRst))
BaseMsgWindow.ShowInfo(rejectRst);
}
catch (Exception ex)
{
BaseMsgWindow.ShowError(ex.Message);
}
}
// 拒收额外包裹(额外包裹暂不支持多件商品发货,故暂不存在拒收功能)
else if (extOrder != null)
{
}
RefreshListCtrl(orderItem);
btnAddEditTransitWarehouseReject_New.IsEnabled = true;
}
}
private void btnAddEditTransitWarehouseAfterSale_Click(object sender, RoutedEventArgs e)
{
if (this.DataContext is oms_wei_order_item_transit_detail_info transitDetailInfo)
{
btnAddEditTransitWarehouseAfterSale_n1.IsEnabled = false;
btnAddEditTransitWarehouseAfterSale_n2.IsEnabled = false;
var orderItem = transitDetailInfo.oms_wei_order_item_info;
var transitOrder = transitDetailInfo.oms_wei_external_procurement_log_info;
var returnOrder = transitDetailInfo.oms_wei_external_procurement_after_sale_info;
var extOrder = transitDetailInfo.oms_wei_transfer_extra_package;
if (transitOrder != null)
{
bool isOutWarehouse = sender == btnAddEditTransitWarehouseAfterSale_n2;
OrderListRowItemCtrl.ShowReturnPackageWindow(orderItem, transitDetailInfo, isOutWarehouse);
}
else if (extOrder != null)
{
bool isOutWarehouse = sender == btnAddEditTransitWarehouseAfterSale_n2;
OrderListRowItemCtrl.ShowReturnPackageWindow(orderItem, transitDetailInfo, isOutWarehouse);
}
RefreshListCtrl(orderItem);
btnAddEditTransitWarehouseAfterSale_n1.IsEnabled = true;
btnAddEditTransitWarehouseAfterSale_n2.IsEnabled = true;
}
}
private void btnTransitExtraPackages_Click(object sender, RoutedEventArgs e)
{
// 滞留补发买家(补发包裹)
if (this.DataContext is oms_wei_order_item_transit_detail_info transitDetailInfo)
{
var orderItem = transitDetailInfo.oms_wei_order_item_info;
var transitOrder = transitDetailInfo.oms_wei_external_procurement_log_info;
var returnOrder = transitDetailInfo.oms_wei_external_procurement_after_sale_info;
var extOrder = transitDetailInfo.oms_wei_transfer_extra_package;
if (transitOrder != null)
{
// 不是中转仓,直接返回
if (transitOrder == null)
{
BaseMsgWindow.ShowError("非中转仓订单不支持补发!");
return;
}
TransitExtraPackagesView transitExtraPackagesView = new TransitExtraPackagesView(orderItem.ItemOrder, orderItem, transitOrder);
new DialogWindow()
{
Title = "滞留补发买家",
Content = transitExtraPackagesView,
}.ShowDialog();
}
RefreshListCtrl(orderItem);
}
}
public void RefreshListCtrl(oms_wei_order_item_info orderItem)
{
// 更新列表
if (FindParent<OrderTransitListCtrl>(this) is OrderTransitListCtrl transitListCtrl)
{
oms_wei_order_item_transit_model transitInfo = new oms_wei_order_item_transit_model()
{
OrderItem = GlobalConfig.lstOrder.FirstOrDefault(o => o.order_id == orderItem?.order_id)?.OrderItems.FirstOrDefault(oi => oi.sku_id == orderItem?.sku_id),
};
transitListCtrl.UpdateViewModel(transitInfo);
}
}
/// <summary>
/// 查找指定类型的父级控件
/// </summary>
/// <typeparam name="T">目标父控件类型</typeparam>
/// <param name="child">起始子控件</param>
/// <returns>找到的父控件,未找到则返回 null</returns>
public static T FindParent<T>(DependencyObject child) where T : DependencyObject
{
DependencyObject parentObject = VisualTreeHelper.GetParent(child);
if (parentObject == null) return null;
if (parentObject is T parent)
{
return parent;
}
else
{
// 递归继续向上查找
return FindParent<T>(parentObject);
}
}
private void txtOutOrderId_MouseLeftButtonUp(object sender, MouseButtonEventArgs e)
{
if (this.DataContext is oms_wei_order_item_transit_detail_info transitDetailInfo && transitDetailInfo.oms_wei_order_item_info is oms_wei_order_item_info orderItem)
{
var buyerId = txtOutOrderBuyer.Tag as string;
var buyerName = txtOutOrderBuyer.Text;
var outOrderId = txtOutOrderId.Text;
if (string.IsNullOrEmpty(buyerName) || string.IsNullOrEmpty(outOrderId))
{
return;
}
bool isShowOrderList = sender == txtOutOrderBuyer;
OrderBuyerOrdersHelper.ShowBuyerOrder(orderItem, buyerId, buyerName, outOrderId, isShowOrderList);
}
}
}
@@ -0,0 +1,351 @@
using _29WxOrderWpf.BaseWindows;
using _29WxOrderWpf.Ctrls.BuyerCtrls;
using _29WxOrderWpf.ViewModels;
using _29WxOrderWpf.Views;
using AllBase;
using AllBase.Helper;
using AllBase.Model.DBModel;
using AllBase.Model.Result;
using NaiBa.Util.Extension;
using Newtonsoft.Json.Linq;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using Work;
using Work._29Tools.BLL;
using WxOrder.Framework.Commons;
namespace _29WxOrderWpf.Ctrls.OrderCtrls;
internal class OrderTransitService
{
/// <summary>
/// 作废中转仓发货包裹
/// </summary>
/// <param name="orderItem"></param>
/// <param name="isSilent"></param>
/// <param name="UpdateOrderBeforeVoid">作废前是否更新服务端订单状态</param>
public static async Task VoidOrder(oms_wei_order_item_info orderItem, oms_wei_external_procurement_log_info transitOrder = null, bool isSilent = false, bool UpdateOrderBeforeVoid = true)
{
if (!isSilent)
{
if (BaseMsgWindow.ShowConfirm("确定作废当前包裹吗?").DialogResult == false)
return;
}
// 作废前查询订单状态
var orderId = orderItem.order_id;
var skuId = orderItem.sku_id;
if (UpdateOrderBeforeVoid)
await Task.Run(async() => { await MainWindow.Instance.orderListCtrl.GetOrder(orderId); });
var newOrder = GlobalConfig.lstOrder.FirstOrDefault(or => or.order_id == orderId);
if (newOrder?.OrderItems.Count == 1)
orderItem = newOrder?.OrderItems?.FirstOrDefault();
else
orderItem = newOrder?.OrderItems?.FirstOrDefault(oi => oi.sku_id == skuId);
if (orderItem == null)
{
if (!isSilent)
BaseMsgWindow.ShowError("订单查询失败,请重试");
return;
}
if (transitOrder == null)
transitOrder = orderItem.ItemTransitOrder ?? orderItem.ItemTransitOrderWithVoid;
if (transitOrder == null)
{
if (!isSilent)
BaseMsgWindow.ShowError("要作废的中转订单不存在,请确认后重试");
return;
}
// 先作废后申请买手退款
// 订单作废接口(作废重拍)
//postman request POST 'http://localhost:8088/oms-api/external_procurement/discardOrder' \
// --header 'Content-Type: application/json' \
// --body '{
// "orderNo":"12334534534",
// "outOrderNo":"12312312"
//}' 成功返回code:0 失败返回code:1
string url2 = "https://po.e57.cn/prod-api/api/oms-api/external_procurement/discardOrder";
var data2 = new JObject();
data2["orderNo"] = orderItem.order_id;
//data2["outOrderNo"] = transitOrder.out_order_no;
data2["outOrderNo"] = transitOrder.order_code;
var dataStr2 = JsonHelper.SerializeObject(data2);
var discardRst = await HttpResponseWXBLL.e57PostResponseAsync(url2, dataStr2);
if (discardRst.Contains("\"code\":0") || discardRst.Contains("\"code\":200"))
{
//MainWindow.Instance.orderListCtrl.GetOrder(orderId);
// 修改为在买手退款流程后提示作废信息
}
else
{
var msg = BaseRegex.GetStringJsonByRegs(ref discardRst, discardRst, "msg");
if (!isSilent)
BaseMsgWindow.ShowInfo("订单作废失败,服务端返回 " + msg);
return;
}
#region 处理买手售后
if (transitOrder.out_order_no.ParseToString().StartsWith("tb_")) // 淘宝买手售后
{
if (!isSilent)
BaseMsgWindow.ShowError("淘宝买手暂不支持自动售后,作废后请手动申请售后");
else
transitOrder.refund_status = "淘宝买手暂不支持自动售后,作废后需手动申请售后";
}
else // 拼多多买手售后
{
bool noBuyer = false;
var buyer = GlobalConfig.PDDBuyerLoginList.FirstOrDefault(b => b.buyer_id == transitOrder.buyer_account || b.buyer_name == transitOrder.buyer_account);
if (buyer == null)
{
if (!isSilent)
if (BaseMsgWindow.ShowConfirm("拍单买手不存在,点击确定直接作废中转单并手动取消买手单,点击取消登录买手后重试").DialogResult != true)
return;
noBuyer = true;
}
// 检测一下买手号
if (GlobalConfig.CurrentPddBuyer.status == "在线")
{
await Task.Run(() =>
{
PddMobileLoginViewModel.CheckBuyerLogin(GlobalConfig.CurrentPddBuyer);
});
}
if (GlobalConfig.CurrentPddBuyer.status != "在线")
{
if (!isSilent)
if (BaseMsgWindow.ShowConfirm("买手号掉线,点击确定直接作废中转单并手动取消买手单,点击取消登录买手后重试").DialogResult != true)
return;
noBuyer = true;
}
if (!noBuyer)
{
PddBuyerOrderLiteInfo order = null;
order = PDDBuyerOrderReadCtrl.lstPddBuyerOrderInfoLite.FirstOrDefault(o => o.order_sn == transitOrder.out_order_no);
if (order == null)
order = new PddBuyerOrderLiteInfo()
{
order_status_prompt = "待发货",
order_amount = transitOrder.out_amount,
order_sn = transitOrder.out_order_no
};
PDDBuyerOrderReadCtrl.lstPddBuyerOrderInfoLite.Add(order);
var pddAfterRst = "";
await Task.Run(() =>
{
pddAfterRst = PDDBuyerOrderReadCtrl.SimPddAfterSale(buyer, order);
});
if (pddAfterRst.Contains("\"after_sales_status\":1") || pddAfterRst.Contains("该订单已全额退款") || pddAfterRst.Contains("订单未付款"))
{
// 保存退款成功状态
order.order_status_prompt = pddAfterRst.Contains("订单未付款") ? "订单未付款" : "退款成功";
// 中转仓订单买手号售后信息 存到服务端
var refundRst = PDDBuyerOrderReadCtrl.SendTransitAfterSaleE57(order);
if (refundRst.Contains("<code>0</code>") || refundRst.Contains("<code>200</code>"))
{
order.sendStatus = "退款成功 买手退款信息更新成功";
}
else
{
var msg = BaseRegex.GetStringXml(ref refundRst, "msg");
order.sendStatus = "退款成功 买手退款信息更新失败,服务端返回 " + msg;
}
NaiBa.Util.Helper.ConfigHelper.SaveConfig("pdd_buyer_order_list", PDDBuyerOrderReadCtrl.lstPddBuyerOrderInfoLite);
}
else
{
if (!isSilent)
if (BaseMsgWindow.ShowConfirm("买手退款失败,点击确定直接作废中转单并手动取消买手单,点击取消稍候重试").DialogResult != true)
return;
}
}
}
#endregion
#region 更新拍单余额
StartUp.UpdateBalance();
#endregion
#region 立即更新订单
transitOrder = orderItem.ItemTransitOrders.FirstOrDefault(o => o.order_code == transitOrder.order_code) ?? transitOrder;
transitOrder.order_void_status = 1;
orderItem.SetOrderItemTextProperty();
#endregion
#region 重新过滤订单
OrderListCtrl.InitOrderItemObservableProp(orderItem);
MainWindow.Instance.orderListCtrl.FilterOrders();
if (!isSilent)
BaseMsgWindow.ShowInfo("订单作废成功,请重新拍单");
#endregion
}
/// <summary>
/// 作废售后包裹
/// </summary>
/// <param name="returnOrder"></param>
/// <returns></returns>
public static async Task<string> VoidAfterSalePackage(oms_wei_order_item_info orderItem, oms_wei_external_procurement_after_sale_info returnOrder)
{
string typeStr = returnOrder?.pack_type == 1 ? "作废分销发货退货包裹" : "作废额外包裹退货包裹";
string msg = $@"确定{typeStr}吗?";
if (BaseMsgWindow.ShowConfirm(msg, typeStr, null, MsgWindowLevel.MEDIUM, 300).DialogResult != true)
return "";
string url2 = "https://po.e57.cn/prod-api/api/oms-api/external_procurement/orders/interceptReturn";
var data = new JObject();
data["externalOrderNo"] = returnOrder.external_order_no;
data["orderNo"] = returnOrder.order_no; // 订单编号
data["orderCode"] = returnOrder.order_code;
data["packType"] = returnOrder.pack_type; /* 1作废分销发货退货包裹 2作废额外包裹退货包裹 */
var dataStr2 = JsonHelper.SerializeObject(data);
var voidRst = await HttpResponseWXBLL.e57PostResponseAsync(url2, dataStr2);
if (voidRst.Contains("\"code\":0") || voidRst.Contains("\"code\":200"))
{
StartUp.UpdateBalance();
returnOrder.order_void_status = 1;
orderItem.SetOrderItemTextProperty();
return typeStr + "成功!";
}
else
{
throw new Exception(typeStr + "失败,服务端返回:" + BaseRegex.GetStringJsonByRegs(ref voidRst, voidRst, "msg"));
}
}
/// <summary>
/// 作废额外包裹
/// </summary>
/// <param name="orderItem"></param>
/// <param name="extraOrder"></param>
/// <returns></returns>
/// <exception cref="Exception"></exception>
public static async Task<string> VoidExtraPackage(oms_wei_order_item_info orderItem, oms_wei_transfer_extra_package extraOrder)
{
string typeStr = "作废额外包裹";
string msg = $@"确定{typeStr}吗?";
if (BaseMsgWindow.ShowConfirm(msg, typeStr, null, MsgWindowLevel.MEDIUM, 300).DialogResult != true)
return "";
var data = new JObject();
data["batchId"] = extraOrder.batchId;
data["orderCode"] = extraOrder.order_code;
var dataStr = JsonHelper.SerializeObject(data);
var url = "https://po.e57.cn/prod-api/api/oms-api/external_procurement/extraOrders/void";
var voidRst = await HttpResponseWXBLL.e57PostResponseAsync(url, dataStr);
if (BaseRegex.GetStringJson(ref voidRst, "code") != "0" && BaseRegex.GetStringJson(ref voidRst, "code") != "200")
{
throw new Exception("作废额外包裹失败,服务端返回:" + BaseRegex.GetStringJsonByRegs(ref voidRst, voidRst, "msg"));
}
StartUp.UpdateBalance();
extraOrder.order_void_status = 1;
orderItem.SetOrderItemTextProperty();
//MainWindow.Instance.orderListCtrl.FilterOneOrder(orderItem.order_id);
return "作废额外包裹成功!";
}
/// <summary>
/// 云仓申请拒收退回总店
/// </summary>
/// <param name="orderItem"></param>
public static async Task<string> RejectTransitOrder(oms_wei_order_item_info orderItem, oms_wei_external_procurement_log_info _itemTransitOrder)
{
string msg = $@"
        云仓拒收退回总店
说  明:店铺产生售后,拒收成功,货物会原物流退回总店。
拒收条件:(总店物流没到云仓/未签收前)。顺丰/京东无法
     拒收,直接总店申请仅退款让总店拦截。
收  费:免费";
if (BaseMsgWindow.ShowConfirm(msg, "云仓拒收退回总店", null, MsgWindowLevel.LARGE, 300).DialogResult != true)
return "";
orderItem.ItemTransitOrders = await OrderGetOrderListHelper.GetTransitWarehouseList(orderItem.order_id);
orderItem.PddBuyerOrders = (await OrderGetOrderListHelper.GetPddBuyerOrders(orderItem.order_id)).Where(o => o.wx_send_type == 0).ToList();
orderItem.PddBuyerOrders.AddRange((await OrderGetOrderListHelper.GetTbBuyerOrders(orderItem.order_id)).Where(o => o.wx_send_type == 0).ToList());
OrderListCtrl.InitOrderItemObservableProp(orderItem);
var itemTransitOrder = orderItem.ItemTransitOrders.FirstOrDefault(o => o.order_code == _itemTransitOrder?.order_code && o.out_order_no == _itemTransitOrder?.out_order_no);
if (itemTransitOrder == null)
itemTransitOrder = _itemTransitOrder;
//if (itemTransitOrder?.warehouse_status == 3) { BaseMsgWindow.ShowError("商品已拒收或拦截!"); return; }
//if (itemTransitOrder?.warehouse_status == 2) { BaseMsgWindow.ShowError("商品已出库,请选择退回中转仓!"); return; }
//if (string.IsNullOrEmpty(orderItem.PddBuyerOrder?.order_sn)) { BaseMsgWindow.ShowError("商品未出单,请直接去拼多多买手申请退款"); return; }
if (itemTransitOrder?.has_reject == 1 || itemTransitOrder?.has_reject == 3)
{
//BaseMsgWindow.ShowAnimateMessage("已申请拒收", "Msg", 3);
return "已申请过拒收";
}
// 中转仓拒收(已产生物流)
string url = "https://po.e57.cn/prod-api/api/oms-api/external_procurement/orders/rejectApply";
var dataObj = new JObject();
dataObj["orderCode"] = itemTransitOrder?.order_code;
dataObj["orderId"] = orderItem.order_id;
dataObj["logisticsExpressCode"] = orderItem.PddBuyerOrder?.order_sn;
var data = JsonHelper.SerializeObject(dataObj);
var html = HttpResponseWXBLL.e57PostResponse(url, data, "");
int rejectStatus = 0;
if (html.Contains("<code>0</code>") || html.Contains("<code>200</code>"))
{
rejectStatus = 1;
//BaseMsgWindow.ShowAnimateMessage("申请成功", "Msg", 3);
}
else
{
rejectStatus = 2;
var err = BaseRegex.GetStringXmlByRegs(ref html, html, "msg");
//BaseMsgWindow.ShowAnimateMessage("申请失败", "Error", 3);
throw new Exception("申请失败" + err);
}
url = BaseClass.Build29WxObjString("order/wx_update_transit_order_reject_status");
data = UserLogin.GetSignaturex();
data += "&order_no=" + orderItem.order_id;
data += "&order_sku_id=" + orderItem.sku_id;
data += "&has_reject=" + rejectStatus;
html = await GetHtml.PostUtf8Async(url, data);
itemTransitOrder.has_reject = rejectStatus;
OrderListCtrl.InitOrderItemObservableProp(orderItem);
return "申请成功";
}
/// <summary>
/// 申请拒收后查询拒收状态
/// </summary>
/// <param name="orderItem"></param>
/// <param name="upperWaybill"></param>
public static void ShowRejectTransitOrder(oms_wei_order_item_info orderItem, string upperWaybill)
{
BaiduGetWaybillInfoView buyerLoginForm = new BaiduGetWaybillInfoView(orderItem);
buyerLoginForm.ViewModel.InitUrl = "https://www.baidu.com/s?ie=UTF-8&wd=" + upperWaybill;
new DialogWindow()
{
Width = 1280,
Height = 800,
Title = "物流拒收查询",
Content = buyerLoginForm,
}.Show();
return;
}
}
@@ -63,13 +63,18 @@ public class PddBrowserOrderInvoiceViewModel : BindableBaseEx
set set
{ {
SetValue(value); SetValue(value);
base.RaisePropertyChanged(nameof(InvoiceStatusText)); InvoiceStatusText = value ? "已提交申请" : "待开票";
} }
} }
public int Quantity => order_Goods?.Sum(a => a.goods_number.Value) ?? 0; public int Quantity => order_Goods?.Sum(a => a.goods_number.Value) ?? 0;
private string _invoiceStatusText = "待开票";
/// <summary> 发票状态文案:已开票 / 待开票 </summary> /// <summary> 发票状态文案:已开票 / 待开票 </summary>
public string InvoiceStatusText => IsInvoiced ? "已提交申请" : "待开票"; public string InvoiceStatusText
{
get => _invoiceStatusText;
set => SetValue(ref _invoiceStatusText, value);
}
public DateTime OrderTime public DateTime OrderTime
@@ -2,6 +2,8 @@
using CefSharp; using CefSharp;
using CefSharp.Handler; using CefSharp.Handler;
using CefSharp.Wpf; using CefSharp.Wpf;
using Newtonsoft.Json.Linq;
using NPOI.XWPF.UserModel;
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
@@ -11,6 +13,7 @@ using System.Threading.Tasks;
using System.Windows.Controls; using System.Windows.Controls;
using Work._29Tools.CefTools; using Work._29Tools.CefTools;
using Work.BaseForms; using Work.BaseForms;
using WxOrder.Framework.Commons;
using WxOrder.Framework.Helpers; using WxOrder.Framework.Helpers;
namespace _29WxOrderWpf.Ctrls.PDDInvoice.ViewModels; namespace _29WxOrderWpf.Ctrls.PDDInvoice.ViewModels;
@@ -29,11 +32,10 @@ public partial class PDDInvoiceViewModel
BrowserDetailZIndex = -1; BrowserDetailZIndex = -1;
BrowserDetail = WPFCEFBrowser.CreateChromiumWebBrowser("about:blank", false); BrowserDetail = WPFCEFBrowser.CreateChromiumWebBrowser("about:blank", false);
LocalResourceRequestHandler resourceRequestHandler = new LocalResourceRequestHandler();
LocalResourceRequestHandler detailResourceRequestHandler = new LocalResourceRequestHandler(); LocalResourceRequestHandler detailResourceRequestHandler = new LocalResourceRequestHandler();
detailResourceRequestHandler.ResourceLoadCompleteEvent += DetailRequestHandler_ResourceLoadComplete; detailResourceRequestHandler.ResourceLoadCompleteEvent += DetailRequestHandler_ResourceLoadComplete;
BrowserDetail.RequestHandler = new LocalRequestHandler(resourceRequestHandler); BrowserDetail.RequestHandler = new LocalRequestHandler(detailResourceRequestHandler);
BrowserDetail.LifeSpanHandler = new LocalLifeSpanHandler(PopWindowType.SelfWindow); BrowserDetail.LifeSpanHandler = new LocalLifeSpanHandler(PopWindowType.SelfWindow);
BrowserDetail.KeyboardHandler = new KeyboardHandler(); BrowserDetail.KeyboardHandler = new KeyboardHandler();
BrowserDetail.LoadingStateChanged += BrowserDetail_LoadingStateChanged; BrowserDetail.LoadingStateChanged += BrowserDetail_LoadingStateChanged;
@@ -68,12 +70,17 @@ public partial class PDDInvoiceViewModel
string html = await b.GetBrowser().GetSourceAsync(); string html = await b.GetBrowser().GetSourceAsync();
if (html.Contains("window.rawData")) if (html.Contains("window.rawData"))
{ {
await ExecuteInvoiceApplyScriptAsync(b, orderSN); if (html.Contains("\"hasApplied\":true,"))
{
_currentInvoiceTcs?.TrySetResult(new Result<bool> { Data = true });
return;
}
await ExecuteInvoiceApplyScriptAsync(b);
} }
else else
{ {
// 页面异常(未渲染出发票表单)时直接判定失败,避免批量开票长时间等待 // 页面异常(未渲染出发票表单)时直接判定失败,避免批量开票长时间等待
_currentInvoiceTcs?.TrySetResult(false); _currentInvoiceTcs?.TrySetResult(new Result<bool> { Data = false });
} }
} }
}); });
@@ -85,54 +92,40 @@ public partial class PDDInvoiceViewModel
/// 单张申请模式保持原有行为;批量开票模式下轮询脚本写入的 /// 单张申请模式保持原有行为;批量开票模式下轮询脚本写入的
/// <c>window.__invoiceApplyResult</c>,完成后通过 <see cref="_currentInvoiceTcs"/> 回传结果。 /// <c>window.__invoiceApplyResult</c>,完成后通过 <see cref="_currentInvoiceTcs"/> 回传结果。
/// </summary> /// </summary>
private async Task ExecuteInvoiceApplyScriptAsync(ChromiumWebBrowser b, string orderSn) private async Task ExecuteInvoiceApplyScriptAsync(ChromiumWebBrowser b)
{ {
string content = ResourceHelper.GetResourceText("/Ctrls/PDDInvoice/Resources/invoice.js", "29WxFindOrder"); string content = ResourceHelper.GetResourceText("/Ctrls/PDDInvoice/Resources/invoice.js", "29WxFindOrder");
content = content.Replace("{公司}", Config.Title); content = content.Replace("{公司}", Config.Title);
content = content.Replace("{税号}", Config.TaxNo); content = content.Replace("{税号}", Config.TaxNo);
if (string.IsNullOrEmpty(content)) return; if (string.IsNullOrEmpty(content)) return;
await b.EvaluateScriptAsync(content); await b.EvaluateScriptAsync(content);//执行js
if (_currentInvoiceTcs == null)
{
var temp = Orders?.FirstOrDefault(a => a.order_sn == orderSn);
if (temp != null) temp.IsInvoiced = true;
return; // 单张申请模式:保持原有行为
}
// 捕获当前 TCS,避免批量循环超时进入下一个订单后,迟到的轮询误触发新订单的结果
var tcs = _currentInvoiceTcs;
// 检查是否注入成功 // 检查是否注入成功
if (await IsInstalledDetailAsync(b) == false) if (await IsInstalledDetailAsync(b) == false)
{ {
IsBatchInvoicing = false; IsBatchInvoicing = false;
BaseMsgForm.ShowError("JS错误,开票失败"); BaseMsgForm.ShowError("JS错误,开票失败");
tcs.TrySetResult(false); _currentInvoiceTcs.TrySetResult(new Result<bool> { Data = false });
return; return;
} }
//for (int i = 0; i < 120; i++)//循环获取结果
//{
// await Task.Delay(500);
// try
for (int i = 0; i < 120; i++) // {
{ // var res = await b.EvaluateScriptAsync("window.__invoiceApplyResult");
await Task.Delay(500); // if (res.Success && res.Result != null)
try // {
{ // _currentInvoiceTcs.TrySetResult(Convert.ToBoolean(res.Result));
var res = await b.EvaluateScriptAsync("window.__invoiceApplyResult"); // return;
if (res.Success && res.Result != null) // }
{ // }
tcs.TrySetResult(Convert.ToBoolean(res.Result)); // catch
return; // {
} // }
} //}
catch //_currentInvoiceTcs.TrySetResult(false);
{
}
}
tcs.TrySetResult(false);
} }
@@ -151,9 +144,38 @@ public partial class PDDInvoiceViewModel
private void DetailRequestHandler_ResourceLoadComplete(object sender, string url, string postData, string responseData, IRequest request) private void DetailRequestHandler_ResourceLoadComplete(object sender, string url, string postData, string responseData, IRequest request)
{ {
if (url.StartsWith("https://mobile.yangkeduo.com/transac_return_compensation.html")) if (url.StartsWith("https://mobile.yangkeduo.com/proxy/api/api/order/invoice/apply"))
{ {
var obj = JObject.Parse(responseData);
bool isSuccess = obj.Value<bool?>("result") == true;
if (isSuccess)
{
_currentInvoiceTcs.TrySetResult(new Result<bool> { Data = true });
}
else
{
string errMsg = obj.Value<string>("error_msg");
_currentInvoiceTcs.TrySetResult(new Result<bool> { Data = false, Msg = errMsg });
}
return;
//{"order_sn":"260921-458426969742556","mall_id":697300659,"trigger_status":1,"business_type":1,"payer_name":"合肥弘贸电子商务有限公司","invoice_kind":0,"invoice_type":0,"letter_head_id":"690562059266556","letterhead_snapshot_id":"SI298036413700604","paper_certificate_url":"","entrust_certify_url":"","source":1,"anti_content":"0asAfoyqYiPs6gd2J0WQ9QOUtOrZ44_LwPI3lrN83FY_wympvl577D6QppXrSLrHJn8eNWv8uXBTdg6_iPUC1aDYt-JuCI1dMpKg2wsf65KUBPzEhRU8pGAbTnWhcJ29ooVcncR90coLgWQiLJ0Xjo0Y4aHEJnnk2lr2PRkY2Kj9ibYc9QW-i2Mr23mjyQMQIahwAhEX-xjSVJEd35qSDQo9VrbY0Fb4kiiL0tHoKEQqmgMcn1BIH9LQB30NJ9s857b25NDDXQyuIT9hR2fCiRoY-96khLJ8QI6wqNL8Q406RBojM6oYsKqEGEFNn7Qyr4N3q-FELBTkkmyToyzs4cM1iUKl3Zaqe0MtFefxmZcLUj3FFxQ6GdAAfKO2WlAkwx7QuMppG7UtkEpRuNjrkojzegy1jaIBWzPrzevvx3egES52PIHEFZASpZ2gNPXaDGSbVGu8shqGDmXuu94aWgXxEE3CzPfVcUZooGs40ThX0ouQF7IFTKM6-NSsk8ZrVjEHdWO1-EE_SCngMCC1vFeAr1g5NvaUCC_87CibfVcWPe5lhgRaq6dKfSAYDoT_bA0nPm6wSDZSxAQbSk-1JZC-O6OpFqXcrkKVUZk0atnozQtKlf1cxcyCl_EkEMnpwZll4g3jEKUxLK_XCIUz0TjDUbF1dpZOsWd39crq7VktSKKZ32b_e0sk6ZkvAf5F7GKwfvfy6RX5YbcrCcpfsjJqaXNGy2G2Y_Oj0iPcpgaXv0zmJjkB217RMtwxBybZnjdOMIlGJWUFls4unwncEvdy4Udgi7EdgB_MXwgn2zGa1_wHKltF7n37wKjKBKlysnfv8mFfqzH3Jv7L4jj9cCQ7P5Fb3E8KQ9J","payer_register_no":"91340103MAKBDKB764","payer_phone":"","payer_account":"","payer_address":"","payer_bank":""}
//{"server_time":1792493897,"result":true}
/*
{
"server_time": 1792493128,
"error_code": 17003,
"error_msg": "商家已与您协商开票,如有需要,请联系商家"
}*/
} }
} }
} }
@@ -1,7 +1,5 @@
using _29WxOrderWpf.BaseWindows; using _29WxOrderWpf.BaseWindows;
using _29WxOrderWpf.CefHelper; using _29WxOrderWpf.CefHelper;
using WxOrder.Framework.Commons;
using WxOrder.Framework.Commons;
using _29WxOrderWpf.Ctrls.Statistics; using _29WxOrderWpf.Ctrls.Statistics;
using AllBase; using AllBase;
using AllBase.Helper; using AllBase.Helper;
@@ -14,6 +12,7 @@ using CefSharp.Wpf;
using NaiBa.Util.Extension; using NaiBa.Util.Extension;
using Newtonsoft.Json; using Newtonsoft.Json;
using NPOI.SS.Formula.Functions; using NPOI.SS.Formula.Functions;
using Org.BouncyCastle.Asn1.X509;
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Collections.ObjectModel; using System.Collections.ObjectModel;
@@ -37,6 +36,8 @@ using WPFCommon.Converters;
using WPFCommon.Helpers; using WPFCommon.Helpers;
using WPFCommon.Models; using WPFCommon.Models;
using WxOrder.Framework.Commons; using WxOrder.Framework.Commons;
using WxOrder.Framework.Commons;
using WxOrder.Framework.Commons;
using WxOrder.Framework.Commons.Dialogs; using WxOrder.Framework.Commons.Dialogs;
using WxOrder.Framework.Helpers; using WxOrder.Framework.Helpers;
@@ -284,7 +285,7 @@ public partial class PDDInvoiceViewModel : BindableBaseEx, IDialogAware, IDispos
public ICommand ResetCommand => new DelegateCommand(ResetSearch); public ICommand ResetCommand => new DelegateCommand(ResetSearch);
public ICommand OpenInvoiceCommand => new DelegateCommand<PddBrowserOrderInvoiceViewModel>(OpenInvoice); public ICommand OpenInvoiceCommand => new AsyncDelegateCommand<PddBrowserOrderInvoiceViewModel>(OpenInvoice);
public ICommand ShowInvoiceCommand => new DelegateCommand<PddBrowserOrderInvoiceViewModel>(ShowInvoice); public ICommand ShowInvoiceCommand => new DelegateCommand<PddBrowserOrderInvoiceViewModel>(ShowInvoice);
@@ -434,7 +435,7 @@ public partial class PDDInvoiceViewModel : BindableBaseEx, IDialogAware, IDispos
} }
/// <summary> 当前正在批量处理的订单,页面脚本执行完成后通过它回传结果 </summary> /// <summary> 当前正在批量处理的订单,页面脚本执行完成后通过它回传结果 </summary>
private TaskCompletionSource<bool> _currentInvoiceTcs; private TaskCompletionSource<Result<bool>> _currentInvoiceTcs;
public ICommand BatchInvoiceCommand => new AsyncDelegateCommand(BatchInvoice); public ICommand BatchInvoiceCommand => new AsyncDelegateCommand(BatchInvoice);
@@ -471,8 +472,19 @@ public partial class PDDInvoiceViewModel : BindableBaseEx, IDialogAware, IDispos
//Config.TaxNo = TaxNo; //Config.TaxNo = TaxNo;
//Config.MaxAmount = MaxAmount; //Config.MaxAmount = MaxAmount;
//NaiBa.Util.Helper.ConfigHelper.SaveConfig(ConfigPath, Config); //NaiBa.Util.Helper.ConfigHelper.SaveConfig(ConfigPath, Config);
try
{
await BatchInvoiceAsync(targets);
}
catch (Exception ex)
{
BaseMsgWindow.ShowError("批量开票异常:" + ex.Message);
await BatchInvoiceAsync(targets); }
finally
{
BaseMsgWindow.ShowInfo(BottomMsg);
}
} }
public ICommand StopBatchInvoiceCommand => new AsyncDelegateCommand(StopBatchInvoice); public ICommand StopBatchInvoiceCommand => new AsyncDelegateCommand(StopBatchInvoice);
@@ -541,12 +553,12 @@ public partial class PDDInvoiceViewModel : BindableBaseEx, IDialogAware, IDispos
} }
else else
{ {
_currentInvoiceTcs = new TaskCompletionSource<bool>(TaskCreationOptions.RunContinuationsAsynchronously); _currentInvoiceTcs = new TaskCompletionSource<Result<bool>>(TaskCreationOptions.RunContinuationsAsynchronously);
BrowserDetail.Load($"https://mobile.yangkeduo.com/transac_return_compensation.html?_t_timestamp=transac_modify_invoice&order_sn={order.order_sn}"); BrowserDetail.Load($"https://mobile.yangkeduo.com/transac_return_compensation.html?_t_timestamp=transac_modify_invoice&order_sn={order.order_sn}");
// 等待页面脚本执行完成(最长 60 秒) // 等待页面脚本执行完成(最长 60 秒)
var done = await Task.WhenAny(_currentInvoiceTcs.Task, Task.Delay(TimeSpan.FromSeconds(60))); Task done = await Task.WhenAny(_currentInvoiceTcs.Task, Task.Delay(TimeSpan.FromSeconds(10)));
ok = done == _currentInvoiceTcs.Task && _currentInvoiceTcs.Task.Result; ok = done == _currentInvoiceTcs.Task && _currentInvoiceTcs.Task.Result.Data;
} }
if (ok) if (ok)
{ {
@@ -562,6 +574,10 @@ public partial class PDDInvoiceViewModel : BindableBaseEx, IDialogAware, IDispos
} }
else else
{ {
if (_currentInvoiceTcs.Task.IsCompleted)
{
order.InvoiceStatusText = _currentInvoiceTcs.Task.Result.Msg;
}
fail++; fail++;
} }
ProgressValue = success + fail; ProgressValue = success + fail;
@@ -580,7 +596,7 @@ public partial class PDDInvoiceViewModel : BindableBaseEx, IDialogAware, IDispos
catch (Exception ex) catch (Exception ex)
{ {
fail = targets.Count - success; fail = targets.Count - success;
BaseMsgWindow.ShowError("批量开票异常:" + ex.Message); throw ex;
} }
finally finally
{ {
@@ -588,7 +604,6 @@ public partial class PDDInvoiceViewModel : BindableBaseEx, IDialogAware, IDispos
ProgressMaximum = targets.Count; ProgressMaximum = targets.Count;
ProgressValue = targets.Count; ProgressValue = targets.Count;
IsBatchInvoicing = false; IsBatchInvoicing = false;
BaseMsgWindow.ShowInfo(BottomMsg);
} }
} }
/// <summary> /// <summary>
@@ -642,7 +657,7 @@ public partial class PDDInvoiceViewModel : BindableBaseEx, IDialogAware, IDispos
/// 申请开票 /// 申请开票
/// </summary> /// </summary>
/// <param name="order"></param> /// <param name="order"></param>
private void OpenInvoice(PddBrowserOrderInvoiceViewModel order) private async Task OpenInvoice(PddBrowserOrderInvoiceViewModel order)
{ {
SelectedOrder = order; SelectedOrder = order;
if (string.IsNullOrEmpty(Config.Title) || string.IsNullOrEmpty(Config.TaxNo)) if (string.IsNullOrEmpty(Config.Title) || string.IsNullOrEmpty(Config.TaxNo))
@@ -650,8 +665,19 @@ public partial class PDDInvoiceViewModel : BindableBaseEx, IDialogAware, IDispos
BaseMsgWindow.ShowError("未填写公司或税号"); BaseMsgWindow.ShowError("未填写公司或税号");
return; return;
} }
BrowserDetail.Load($"https://mobile.yangkeduo.com/transac_return_compensation.html?_t_timestamp=transac_modify_invoice&order_sn={order.order_sn}");
ShowOrderBrowserDetail(); ShowOrderBrowserDetail();
//BrowserDetail.Load($"https://mobile.yangkeduo.com/transac_return_compensation.html?_t_timestamp=transac_modify_invoice&order_sn={order.order_sn}");
try
{
await BatchInvoiceAsync(new List<PddBrowserOrderInvoiceViewModel>
{
order
});
}
catch (Exception ex)
{
BaseMsgWindow.ShowError("开票异常:" + ex.Message);
}
} }
private void ShowInvoice(PddBrowserOrderInvoiceViewModel order) private void ShowInvoice(PddBrowserOrderInvoiceViewModel order)
+95 -50
View File
@@ -1,51 +1,96 @@
<Window <Window
x:Class="_29WxOrderWpf.Ctrls.Settings.SettingsView" x:Class="_29WxOrderWpf.Ctrls.Settings.SettingsView"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:local="clr-namespace:_29WxOrderWpf.Ctrls.Settings" xmlns:local="clr-namespace:_29WxOrderWpf.Ctrls.Settings"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:vm="[vm ]clr-namespace:_29WxOrderWpf.ViewModels" xmlns:vm="clr-namespace:_29WxOrderWpf.ViewModels"
xmlns:wpf="WPFCommon" xmlns:wpf="WPFCommon"
Title="设置" Title="设置"
Width="800" Width="800"
Height="450" Height="450"
d:DataContext="{d:DesignInstance Type=vm:SettingViewModel}" d:DataContext="{d:DesignInstance Type=vm:SettingViewModel}"
ResizeMode="NoResize" ResizeMode="NoResize"
ShowInTaskbar="False" ShowInTaskbar="False"
WindowStartupLocation="CenterScreen" WindowStartupLocation="CenterScreen"
WindowState="Normal" WindowState="Normal"
mc:Ignorable="d"> mc:Ignorable="d">
<Border BorderBrush="#e8eaed" BorderThickness="1"> <Border BorderBrush="#e8eaed" BorderThickness="1">
<TabControl <TabControl
ItemContainerStyle="{StaticResource SideTabItem}" ItemContainerStyle="{StaticResource SideTabItem}"
Style="{StaticResource SideTabControl}" Style="{StaticResource SideTabControl}"
TabStripPlacement="Left"> TabStripPlacement="Left">
<TabItem Header="发货"> <TabItem Header="拍单">
<StackPanel> <StackPanel>
<Border Style="{StaticResource SettingRow}"> <Border Style="{StaticResource SettingRow}">
<Grid> <Grid Visibility="{Binding ShowEnablePddTransitTraditionalAddress}">
<Grid.ColumnDefinitions> <Grid.ColumnDefinitions>
<ColumnDefinition Width="*" /> <ColumnDefinition Width="*" />
<ColumnDefinition Width="Auto" /> <ColumnDefinition Width="Auto" />
</Grid.ColumnDefinitions> </Grid.ColumnDefinitions>
<StackPanel> <StackPanel>
<TextBlock Style="{StaticResource SettingTitle}" Text="礼品单发送" /> <TextBlock Style="{StaticResource SettingTitle}" Text="云仓拍单" />
<TextBlock Style="{StaticResource SettingDesc}" Text="超出6元自动改为礼品二(实物)" /> <TextBlock Style="{StaticResource SettingDesc}" Text="多多云仓拍单随机繁体详细地址" />
</StackPanel> </StackPanel>
<CheckBox <CheckBox
Grid.Column="1" Grid.Column="1"
VerticalAlignment="Center" VerticalAlignment="Center"
IsChecked="{Binding AutoSwitchGiftType}" d:Visibility="Visible"
IsChecked="{Binding SwitchEnablePddTransitTraditionalAddress}"
Style="{StaticResource ToggleSwitch}" /> Style="{StaticResource ToggleSwitch}" />
</Grid> </Grid>
</Border> </Border>
</StackPanel> <Border Style="{StaticResource SettingRow}">
</TabItem> <Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="*" />
<ColumnDefinition Width="Auto" />
</Grid.ColumnDefinitions>
<StackPanel>
<TextBlock Style="{StaticResource SettingTitle}" Text="直发拍单" />
<TextBlock Style="{StaticResource SettingDesc}" Text="允许直发拍单" />
</StackPanel>
<CheckBox
Grid.Column="1"
VerticalAlignment="Center"
d:Visibility="Visible"
IsChecked="{Binding SwitchEnableDirectBuy}"
Style="{StaticResource ToggleSwitch}" />
</Grid>
</Border>
</StackPanel>
</TabItem>
<!-- ========== 外观 ========== --> <TabItem Header="发货">
<!-- <StackPanel>
<Border Style="{StaticResource SettingRow}">
<Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="*" />
<ColumnDefinition Width="Auto" />
</Grid.ColumnDefinitions>
<StackPanel>
<TextBlock Style="{StaticResource SettingTitle}" Text="礼品单发送" />
<TextBlock Style="{StaticResource SettingDesc}" Text="超出6元自动改为礼品二(实物)" />
</StackPanel>
<CheckBox
Grid.Column="1"
VerticalAlignment="Center"
d:Visibility="Visible"
IsChecked="{Binding AutoSwitchGiftType}"
IsEnabled="False"
Opacity="0.5"
Style="{StaticResource ToggleSwitch}"
Visibility="Collapsed" />
</Grid>
</Border>
</StackPanel>
</TabItem>
<!-- ========== 外观 ========== -->
<!--
<TabItem Header="外观" Tag="🎨"> <TabItem Header="外观" Tag="🎨">
<StackPanel <StackPanel
MaxWidth="720" MaxWidth="720"
@@ -110,8 +155,8 @@
</TabItem> </TabItem>
--> -->
<!-- ========== 账户 ========== --> <!-- ========== 账户 ========== -->
<!-- <!--
<TabItem Header="账户" Tag="👤"> <TabItem Header="账户" Tag="👤">
<StackPanel <StackPanel
MaxWidth="720" MaxWidth="720"
@@ -157,8 +202,8 @@
</TabItem> </TabItem>
--> -->
<!-- ========== 隐私 ========== --> <!-- ========== 隐私 ========== -->
<!-- <!--
<TabItem Header="隐私" Tag="🔒"> <TabItem Header="隐私" Tag="🔒">
<StackPanel <StackPanel
MaxWidth="720" MaxWidth="720"
@@ -208,8 +253,8 @@
</TabItem> </TabItem>
--> -->
<!-- ========== 关于 ========== --> <!-- ========== 关于 ========== -->
<!-- <!--
<TabItem Header="关于" Tag="{StaticResource txt-table_stack_above}"> <TabItem Header="关于" Tag="{StaticResource txt-table_stack_above}">
<StackPanel <StackPanel
MaxWidth="720" MaxWidth="720"
@@ -247,6 +292,6 @@
</StackPanel> </StackPanel>
</TabItem>--> </TabItem>-->
</TabControl> </TabControl>
</Border> </Border>
</Window> </Window>
@@ -1,5 +1,6 @@
using _29WxOrderWpf.ViewModels; using _29WxOrderWpf.ViewModels;
using AllBase; using AllBase;
using AllBase.Helper;
using AllBase.Model.Config; using AllBase.Model.Config;
using Newtonsoft.Json; using Newtonsoft.Json;
using System; using System;
@@ -44,6 +45,15 @@ public partial class SettingsView : Window
var setting = vm.ToConfig(); var setting = vm.ToConfig();
BaseClass.Setting = setting; BaseClass.Setting = setting;
NaiBa.Util.Helper.ConfigHelper.SaveConfig(SettingViewModel.SettingFileName, JsonConvert.SerializeObject(setting)); NaiBa.Util.Helper.ConfigHelper.SaveConfig(SettingViewModel.SettingFileName, JsonConvert.SerializeObject(setting));
foreach (var order in GlobalConfig.lstOrder)
{
foreach (var orderItem in order.OrderItems)
{
orderItem.UpdateOrderItemBuyButton();
orderItem.SetAbnormalAndDirectBtnVisibility();
}
}
} }
catch (Exception ex) catch (Exception ex)
{ {
+350 -321
View File
@@ -1,327 +1,356 @@
<UserControl <UserControl
x:Class="_29WxOrderWpf.Ctrls.ShopCtrls.ShopListCtrl" x:Class="_29WxOrderWpf.Ctrls.ShopCtrls.ShopListCtrl"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:local="clr-namespace:_29WxOrderWpf.Ctrls.ShopCtrls" xmlns:local="clr-namespace:_29WxOrderWpf.Ctrls.ShopCtrls"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
x:Name="shopListCtrl" x:Name="shopListCtrl"
d:DesignHeight="450" d:DesignHeight="450"
d:DesignWidth="800" d:DesignWidth="800"
Loaded="shopListCtrl_Loaded" Loaded="shopListCtrl_Loaded"
mc:Ignorable="d"> mc:Ignorable="d">
<Grid Background="{StaticResource ListCtrlBackColorBrush}"> <Grid Background="{StaticResource ListCtrlBackColorBrush}">
<Grid.RowDefinitions> <Grid.RowDefinitions>
<RowDefinition Height="40" /> <RowDefinition Height="40" />
<RowDefinition Height="40" /> <RowDefinition Height="40" />
<RowDefinition Height="*" /> <RowDefinition Height="*" />
<RowDefinition Height="40" /> <RowDefinition Height="40" />
</Grid.RowDefinitions> </Grid.RowDefinitions>
<Grid x:Name="gridSearch"> <Grid x:Name="gridSearch">
<Grid.ColumnDefinitions> <Grid.ColumnDefinitions>
<ColumnDefinition Width="Auto" /> <ColumnDefinition Width="Auto" />
<ColumnDefinition Width="*" /> <ColumnDefinition Width="*" />
<ColumnDefinition Width="Auto" /> <ColumnDefinition Width="Auto" />
<ColumnDefinition Width="*" /> <ColumnDefinition Width="*" />
<ColumnDefinition Width="Auto" /> <ColumnDefinition Width="Auto" />
<ColumnDefinition Width="*" /> <ColumnDefinition Width="*" />
<ColumnDefinition Width="Auto" /> <ColumnDefinition Width="Auto" />
<ColumnDefinition Width="Auto" /> <ColumnDefinition Width="Auto" />
</Grid.ColumnDefinitions> </Grid.ColumnDefinitions>
<TextBlock <TextBlock
Grid.Column="0" Grid.Column="0"
Margin="6,0,0,0" Margin="6,0,0,0"
HorizontalAlignment="Center" HorizontalAlignment="Center"
VerticalAlignment="Center" VerticalAlignment="Center"
Text="店名" /> Text="店名" />
<Border <Border
Grid.Column="1" Grid.Column="1"
Height="26" Height="26"
Margin="4" Margin="4"
BorderBrush="{StaticResource mainColorBrush}" BorderBrush="{StaticResource mainColorBrush}"
BorderThickness="1" BorderThickness="1"
CornerRadius="4"> CornerRadius="4">
<TextBox <TextBox
x:Name="txtShopName" x:Name="txtShopName"
Margin="3,0" Margin="3,0"
VerticalContentAlignment="Center" VerticalContentAlignment="Center"
Style="{StaticResource BaseTextBoxStyle}" /> Style="{StaticResource BaseTextBoxStyle}" />
</Border> </Border>
<TextBlock <TextBlock
Grid.Column="2" Grid.Column="2"
HorizontalAlignment="Center" HorizontalAlignment="Center"
VerticalAlignment="Center" VerticalAlignment="Center"
Text="分组" /> Text="分组" />
<Border <Border
Grid.Column="3" Grid.Column="3"
Height="26" Height="26"
Margin="4" Margin="4"
BorderBrush="{StaticResource mainColorBrush}" BorderBrush="{StaticResource mainColorBrush}"
BorderThickness="1" BorderThickness="1"
CornerRadius="4"> CornerRadius="4">
<ComboBox <ComboBox
x:Name="cmbGroup" x:Name="cmbGroup"
Margin="3,0" Margin="3,0"
VerticalContentAlignment="Center" VerticalContentAlignment="Center"
SelectionChanged="cmbGroup_SelectionChanged" SelectionChanged="cmbGroup_SelectionChanged"
Style="{StaticResource BaseComboBoxStyle}" /> Style="{StaticResource BaseComboBoxStyle}" />
</Border> </Border>
<TextBlock <TextBlock
Grid.Column="4" Grid.Column="4"
HorizontalAlignment="Center" HorizontalAlignment="Center"
VerticalAlignment="Center" VerticalAlignment="Center"
Text="备注" /> Text="备注" />
<Border <Border
Grid.Column="5" Grid.Column="5"
Height="26" Height="26"
Margin="4" Margin="4"
BorderBrush="{StaticResource mainColorBrush}" BorderBrush="{StaticResource mainColorBrush}"
BorderThickness="1" BorderThickness="1"
CornerRadius="4"> CornerRadius="4">
<ComboBox <ComboBox
x:Name="cmbNotes" x:Name="cmbNotes"
Margin="3,0" Margin="3,0"
VerticalContentAlignment="Center" VerticalContentAlignment="Center"
SelectionChanged="cmbNotes_SelectionChanged" SelectionChanged="cmbNotes_SelectionChanged"
Style="{StaticResource BaseComboBoxStyle}" /> Style="{StaticResource BaseComboBoxStyle}" />
</Border> </Border>
<Button <Button
x:Name="btnSearch" x:Name="btnSearch"
Grid.Row="4" Grid.Row="4"
Grid.Column="6" Grid.Column="6"
Height="26" Height="26"
Click="btnSearch_Click" Click="btnSearch_Click"
Content=" 搜索 " Content=" 搜索 "
Style="{StaticResource BasePageButtonStyle}" /> Style="{StaticResource BasePageButtonStyle}" />
<Button <Button
x:Name="btnRestore" x:Name="btnRestore"
Grid.Row="4" Grid.Row="4"
Grid.Column="7" Grid.Column="7"
Height="26" Height="26"
Margin="4,0,6,0" Margin="4,0,6,0"
Click="btnRestore_Click" Click="btnRestore_Click"
Content=" 还原 " Content=" 还原 "
Style="{StaticResource BasePageButtonLightStyle}" /> Style="{StaticResource BasePageButtonLightStyle}" />
</Grid> </Grid>
<Grid <Grid
x:Name="lstTitle" x:Name="lstTitle"
Grid.Row="1" Grid.Row="1"
Margin="4,0" Margin="4,0"
Background="{StaticResource ListHeadBackColorBrush}"> Background="{StaticResource ListHeadBackColorBrush}">
<Border BorderBrush="{StaticResource ListHeadBorderColorBrush}" BorderThickness="0,0,1,0"> <Border BorderBrush="{StaticResource ListHeadBorderColorBrush}" BorderThickness="0,0,1,0">
<DataGrid <DataGrid
x:Name="dgShopHeader" x:Name="dgShopHeader"
Grid.ColumnSpan="100" Grid.ColumnSpan="100"
Margin="0,0,18,0" Margin="0,0,18,0"
AutoGenerateColumns="False" AutoGenerateColumns="False"
BorderThickness="0" BorderThickness="0"
CanUserReorderColumns="False" CanUserReorderColumns="False"
ColumnDisplayIndexChanged="dgShopHeader_ColumnDisplayIndexChanged" ColumnDisplayIndexChanged="dgShopHeader_ColumnDisplayIndexChanged"
ColumnHeaderHeight="{Binding ElementName=lstTitle, Path=ActualHeight}" ColumnHeaderHeight="{Binding ElementName=lstTitle, Path=ActualHeight}"
LayoutUpdated="dgShopHeader_LayoutUpdated"> LayoutUpdated="dgShopHeader_LayoutUpdated">
<DataGrid.Columns> <DataGrid.Columns>
<DataGridTemplateColumn <DataGridTemplateColumn
x:Name="colSelectAll" x:Name="colSelectAll"
Width="50" Width="50"
Header="选择" Header="选择"
HeaderStyle="{StaticResource BaseDataGridColumnHeaderStyle}"> HeaderStyle="{StaticResource BaseDataGridColumnHeaderStyle}">
<DataGridTemplateColumn.HeaderTemplate> <DataGridTemplateColumn.HeaderTemplate>
<DataTemplate> <DataTemplate>
<Grid Width="14" Height="14"> <Grid Width="14" Height="14">
<!--<CheckBox x:Name="headerCheckBox" BorderThickness="0" IsChecked="{Binding DataContext.AreAllSelected, RelativeSource={RelativeSource AncestorType=DataGrid}, UpdateSourceTrigger=PropertyChanged}" Checked="HeaderCheckBox_Checked" Unchecked="HeaderCheckBox_Unchecked"/>--> <!--<CheckBox x:Name="headerCheckBox" BorderThickness="0" IsChecked="{Binding DataContext.AreAllSelected, RelativeSource={RelativeSource AncestorType=DataGrid}, UpdateSourceTrigger=PropertyChanged}" Checked="HeaderCheckBox_Checked" Unchecked="HeaderCheckBox_Unchecked"/>-->
<CheckBox <CheckBox
x:Name="chkSelectAll" x:Name="chkSelectAll"
BorderThickness="0" BorderThickness="0"
Checked="ChkSelectAll_Checked" Checked="ChkSelectAll_Checked"
IsChecked="False" IsChecked="False"
IsThreeState="True" IsThreeState="True"
Loaded="ChkSelectAll_Loaded" Loaded="ChkSelectAll_Loaded"
Unchecked="ChkSelectAll_Unchecked" /> Unchecked="ChkSelectAll_Unchecked" />
<Border <Border
Width="14" Width="14"
Height="14" Height="14"
HorizontalAlignment="Center" HorizontalAlignment="Center"
VerticalAlignment="Center" VerticalAlignment="Center"
Background="Transparent" Background="Transparent"
BorderBrush="{StaticResource mainColorBrush}" BorderBrush="{StaticResource mainColorBrush}"
BorderThickness="1" BorderThickness="1"
IsHitTestVisible="False" /> IsHitTestVisible="False" />
</Grid> </Grid>
</DataTemplate> </DataTemplate>
</DataGridTemplateColumn.HeaderTemplate> </DataGridTemplateColumn.HeaderTemplate>
<DataGridTemplateColumn.CellTemplate> <DataGridTemplateColumn.CellTemplate>
<DataTemplate> <DataTemplate>
<!--<CheckBox IsChecked="{Binding IsSelected, UpdateSourceTrigger=PropertyChanged}" HorizontalAlignment="Center" VerticalAlignment="Center"/>--> <!--<CheckBox IsChecked="{Binding IsSelected, UpdateSourceTrigger=PropertyChanged}" HorizontalAlignment="Center" VerticalAlignment="Center"/>-->
<CheckBox HorizontalAlignment="Center" VerticalAlignment="Center" /> <CheckBox HorizontalAlignment="Center" VerticalAlignment="Center" />
</DataTemplate> </DataTemplate>
</DataGridTemplateColumn.CellTemplate> </DataGridTemplateColumn.CellTemplate>
</DataGridTemplateColumn> </DataGridTemplateColumn>
<DataGridTextColumn <DataGridTextColumn
Width="100*" Width="50*"
Header="AppId" Header="序号"
HeaderStyle="{StaticResource BaseDataGridColumnHeaderStyle}" /> HeaderStyle="{StaticResource BaseDataGridColumnHeaderStyle}" />
<DataGridTextColumn <DataGridTextColumn
Width="100*" Width="100*"
Header="店铺名称" Header="AppId"
HeaderStyle="{StaticResource BaseDataGridColumnHeaderStyle}" /> HeaderStyle="{StaticResource BaseDataGridColumnHeaderStyle}" />
<DataGridTextColumn <DataGridTextColumn
Width="100*" Width="100*"
Header="分组" Header="店铺编号"
HeaderStyle="{StaticResource BaseDataGridColumnHeaderStyle}" /> HeaderStyle="{StaticResource BaseDataGridColumnHeaderStyle}" />
<DataGridTextColumn <DataGridTextColumn
Width="82*" Width="100*"
Header=" 备注" Header="店铺名称"
HeaderStyle="{StaticResource BaseDataGridColumnHeaderStyle}" /> HeaderStyle="{StaticResource BaseDataGridColumnHeaderStyle}" />
</DataGrid.Columns> <DataGridTextColumn
</DataGrid> Width="100*"
</Border> Header="分组"
</Grid> HeaderStyle="{StaticResource BaseDataGridColumnHeaderStyle}" />
<!--<ListBox Grid.Row="2" x:Name="lbxShop" ItemsSource="{Binding GlobalConfig.ShopLoginList}" BorderThickness="0" Margin="4,0,4,4">--> <DataGridTextColumn
<ListBox Width="82*"
x:Name="lbxShop" Header=" 备注"
Grid.Row="2" HeaderStyle="{StaticResource BaseDataGridColumnHeaderStyle}" />
Margin="4,0,4,4" </DataGrid.Columns>
BorderThickness="0" </DataGrid>
SelectionMode="Extended"> </Border>
<!-- 使用自定义属性模板去除ListBox高亮显示框 --> </Grid>
<ListBox.ItemContainerStyle> <!--<ListBox Grid.Row="2" x:Name="lbxShop" ItemsSource="{Binding GlobalConfig.ShopLoginList}" BorderThickness="0" Margin="4,0,4,4">-->
<Style TargetType="ListBoxItem"> <ListBox
<Setter Property="Template"> x:Name="lbxShop"
<Setter.Value> Grid.Row="2"
<ControlTemplate TargetType="ListBoxItem"> Margin="4,0,4,4"
<ContentPresenter BorderThickness="0"
Content="{TemplateBinding Content}" SelectionMode="Extended">
ContentStringFormat="{TemplateBinding ContentStringFormat}" <!-- 使用自定义属性模板去除ListBox高亮显示框 -->
ContentTemplate="{TemplateBinding ContentTemplate}" /> <ListBox.ItemContainerStyle>
</ControlTemplate> <Style TargetType="ListBoxItem">
</Setter.Value> <Setter Property="Template">
</Setter> <Setter.Value>
</Style> <ControlTemplate TargetType="ListBoxItem">
</ListBox.ItemContainerStyle> <ContentPresenter
<ListBox.ItemTemplate> Content="{TemplateBinding Content}"
<DataTemplate> ContentStringFormat="{TemplateBinding ContentStringFormat}"
<!--<local:ShopListRowCtrl></local:ShopListRowCtrl>--> ContentTemplate="{TemplateBinding ContentTemplate}" />
<Border </ControlTemplate>
MinHeight="50" </Setter.Value>
Margin="0,0,0,0" </Setter>
HorizontalAlignment="Stretch" </Style>
VerticalAlignment="Stretch" </ListBox.ItemContainerStyle>
BorderBrush="{StaticResource ListRowBorderColorBrush}" <ListBox.ItemTemplate>
BorderThickness="0,0,0,1" <DataTemplate>
CornerRadius="0"> <!--<local:ShopListRowCtrl></local:ShopListRowCtrl>-->
<Border.Style> <Border
<!-- 鼠标进入或悬停Border时切换颜色(悬停时Border的填充控件必须有填充Border,所在层级不限,仅填充透明Grid则触发器无效) --> MinHeight="50"
<Style TargetType="Border"> Margin="0,0,0,0"
<Style.Triggers> HorizontalAlignment="Stretch"
<Trigger Property="IsMouseOver" Value="True"> VerticalAlignment="Stretch"
<Setter Property="Background" Value="{StaticResource ListRowHoverBackColorBrush}" /> BorderBrush="{StaticResource ListRowBorderColorBrush}"
</Trigger> BorderThickness="0,0,0,1"
</Style.Triggers> CornerRadius="0">
</Style> <Border.Style>
</Border.Style> <!-- 鼠标进入或悬停Border时切换颜色(悬停时Border的填充控件必须有填充Border,所在层级不限,仅填充透明Grid则触发器无效) -->
<Style TargetType="Border">
<Style.Triggers>
<Trigger Property="IsMouseOver" Value="True">
<Setter Property="Background" Value="{StaticResource ListRowHoverBackColorBrush}" />
</Trigger>
</Style.Triggers>
</Style>
</Border.Style>
<Grid x:Name="gridListItem"> <Grid x:Name="gridListItem">
<Grid.ColumnDefinitions> <Grid.ColumnDefinitions>
<!--<ColumnDefinition Width="{Binding colShopIdWidth,RelativeSource={RelativeSource AncestorType={x:Type local:ShopListCtrl}}}" ></ColumnDefinition>--> <!--<ColumnDefinition Width="{Binding colShopIdWidth,RelativeSource={RelativeSource AncestorType={x:Type local:ShopListCtrl}}}" ></ColumnDefinition>-->
<ColumnDefinition x:Name="colCheck" Width="100*" /> <ColumnDefinition x:Name="colCheck" Width="50*" />
<ColumnDefinition x:Name="colShopId" Width="100*" /> <ColumnDefinition x:Name="colIndex" Width="50*" />
<ColumnDefinition x:Name="colShopName" Width="100*" /> <ColumnDefinition x:Name="colAppId" Width="100*" />
<ColumnDefinition x:Name="colGroupName" Width="100*" /> <ColumnDefinition x:Name="colShopId" Width="100*" />
<ColumnDefinition x:Name="colNotes" Width="100*" /> <ColumnDefinition x:Name="colShopName" Width="100*" />
</Grid.ColumnDefinitions> <ColumnDefinition x:Name="colGroupName" Width="100*" />
<CheckBox <ColumnDefinition x:Name="colNotes" Width="100*" />
Grid.Column="0" </Grid.ColumnDefinitions>
HorizontalAlignment="Center" <CheckBox
VerticalAlignment="Center" Grid.Column="0"
Background="Transparent" HorizontalAlignment="Center"
Click="CheckBox_Click" VerticalAlignment="Center"
IsChecked="{Binding IsSelect, Mode=TwoWay}" Background="Transparent"
Tag="{Binding ShopId}" /> Click="CheckBox_Click"
<TextBox IsChecked="{Binding IsSelect, Mode=TwoWay}"
Grid.Column="1" Tag="{Binding ShopId}" />
HorizontalContentAlignment="Center" <TextBox
VerticalContentAlignment="Center" Grid.Column="1"
Background="Transparent" HorizontalContentAlignment="Center"
BorderThickness="0" VerticalContentAlignment="Center"
IsReadOnly="True" Background="Transparent"
Tag="{Binding ShopId}" BorderThickness="0"
Text="{Binding ShopId}" IsReadOnly="True"
TextWrapping="Wrap" /> Text="{Binding Mode=OneWay, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type ListBoxItem}}, Converter={StaticResource listBoxIndexConverter}}"
<TextBox TextWrapping="Wrap" />
Grid.Column="2" <TextBox
HorizontalContentAlignment="Center" Grid.Column="2"
VerticalContentAlignment="Center" HorizontalContentAlignment="Center"
Background="Transparent" VerticalContentAlignment="Center"
BorderThickness="0" Background="Transparent"
IsReadOnly="True" BorderThickness="0"
Tag="{Binding ShopId}" IsReadOnly="True"
Text="{Binding ShopAccount}" Tag="{Binding ShopId}"
TextWrapping="Wrap" /> Text="{Binding ShopId}"
<TextBox TextWrapping="Wrap" />
Grid.Column="3" <TextBox
HorizontalContentAlignment="Center" Grid.Column="3"
VerticalContentAlignment="Center" HorizontalContentAlignment="Center"
Background="Transparent" VerticalContentAlignment="Center"
BorderThickness="0" Background="Transparent"
IsReadOnly="True" BorderThickness="0"
Tag="{Binding ShopId}" IsReadOnly="True"
Text="{Binding GroupName}" Tag="{Binding ErpShopId}"
TextWrapping="Wrap" /> Text="{Binding ErpShopId}"
<TextBox TextWrapping="Wrap" />
Grid.Column="4" <TextBox
HorizontalContentAlignment="Center" Grid.Column="4"
VerticalContentAlignment="Center" HorizontalContentAlignment="Center"
Background="Transparent" VerticalContentAlignment="Center"
BorderThickness="0" Background="Transparent"
IsReadOnly="True" BorderThickness="0"
Tag="{Binding ShopId}" IsReadOnly="True"
Text="{Binding Notes}" Tag="{Binding ShopId}"
TextWrapping="Wrap" /> Text="{Binding ShopAccount}"
</Grid> TextWrapping="Wrap" />
</Border> <TextBox
</DataTemplate> Grid.Column="5"
</ListBox.ItemTemplate> HorizontalContentAlignment="Center"
</ListBox> VerticalContentAlignment="Center"
Background="Transparent"
BorderThickness="0"
IsReadOnly="True"
Tag="{Binding ShopId}"
Text="{Binding GroupName}"
TextWrapping="Wrap" />
<TextBox
Grid.Column="6"
HorizontalContentAlignment="Center"
VerticalContentAlignment="Center"
Background="Transparent"
BorderThickness="0"
IsReadOnly="True"
Tag="{Binding ShopId}"
Text="{Binding Notes}"
TextWrapping="Wrap" />
</Grid>
</Border>
</DataTemplate>
</ListBox.ItemTemplate>
</ListBox>
<Grid x:Name="gridRefreshOrSelect" Grid.Row="3"> <Grid x:Name="gridRefreshOrSelect" Grid.Row="3">
<Grid.ColumnDefinitions> <Grid.ColumnDefinitions>
<ColumnDefinition Width="Auto" /> <ColumnDefinition Width="Auto" />
<ColumnDefinition Width="Auto" /> <ColumnDefinition Width="Auto" />
<ColumnDefinition Width="Auto" /> <ColumnDefinition Width="Auto" />
<ColumnDefinition Width="*" /> <ColumnDefinition Width="*" />
<ColumnDefinition Width="Auto" /> <ColumnDefinition Width="Auto" />
<ColumnDefinition Width="*" /> <ColumnDefinition Width="*" />
<ColumnDefinition Width="Auto" /> <ColumnDefinition Width="Auto" />
<ColumnDefinition Width="Auto" /> <ColumnDefinition Width="Auto" />
</Grid.ColumnDefinitions> </Grid.ColumnDefinitions>
<Button <Button
x:Name="btnRefreshShop" x:Name="btnRefreshShop"
Grid.Row="4" Grid.Row="4"
Grid.Column="0" Grid.Column="0"
Height="26" Height="26"
Margin="6,0,0,0" Margin="6,0,0,0"
Click="btnRefreshShop_Click" Click="btnRefreshShop_Click"
Content=" 刷新店铺 " Content=" 刷新店铺 "
Style="{StaticResource BasePageButtonStyle}" /> Style="{StaticResource BasePageButtonStyle}" />
<Button <Button
x:Name="btnApplySelectShop" x:Name="btnApplySelectShop"
Grid.Row="4" Grid.Row="4"
Grid.Column="6" Grid.Column="6"
Height="26" Height="26"
Click="btnApplySelectShop_Click" Click="btnApplySelectShop_Click"
Content=" 确定 " Content=" 确定 "
Style="{StaticResource BasePageButtonStyle}" /> Style="{StaticResource BasePageButtonStyle}" />
<Button <Button
x:Name="btnCancelSelectShop" x:Name="btnCancelSelectShop"
Grid.Row="4" Grid.Row="4"
Grid.Column="7" Grid.Column="7"
Height="26" Height="26"
Margin="4,0,6,0" Margin="4,0,6,0"
Click="btnCancelSelectShop_Click" Click="btnCancelSelectShop_Click"
Content=" 取消 " Content=" 取消 "
Style="{StaticResource BasePageButtonLightStyle}" /> Style="{StaticResource BasePageButtonLightStyle}" />
</Grid> </Grid>
</Grid> </Grid>
</UserControl> </UserControl>
@@ -23,6 +23,10 @@ namespace _29WxOrderWpf.Ctrls.Statistics.Models
/// 空/Null 表示全部店铺(服务层会取全部店铺的 ErpShopId)。 /// 空/Null 表示全部店铺(服务层会取全部店铺的 ErpShopId)。
/// </summary> /// </summary>
public List<string> ShopIds { get; set; } public List<string> ShopIds { get; set; }
/// <summary>
/// 是否统计快递费用
/// </summary>
public bool StatPackages { get; set; }
} }
/// <summary> /// <summary>
@@ -111,6 +115,10 @@ namespace _29WxOrderWpf.Ctrls.Statistics.Models
/// 被拒绝金额(分) /// 被拒绝金额(分)
/// </summary> /// </summary>
public long RejectedRefund { get; set; } public long RejectedRefund { get; set; }
/// <summary>
/// 包裹费用
/// </summary>
public long PackageAmount { get; set; }
} }
/// <summary> /// <summary>
@@ -199,6 +207,7 @@ namespace _29WxOrderWpf.Ctrls.Statistics.Models
/// </summary> /// </summary>
public int UnrefundedAmount { get; set; } public int UnrefundedAmount { get; set; }
public long PackageAmount { get; set; }
/// <summary> /// <summary>
/// 买手订单信息(一个订单号对应多个买手订单) /// 买手订单信息(一个订单号对应多个买手订单)
/// </summary> /// </summary>
@@ -288,6 +297,10 @@ namespace _29WxOrderWpf.Ctrls.Statistics.Models
public decimal BuyerRefundSuccessedAmount { get; set; } public decimal BuyerRefundSuccessedAmount { get; set; }
/// <summary>买手号剩余退款金额(尚未成功退款的金额,元)</summary> /// <summary>买手号剩余退款金额(尚未成功退款的金额,元)</summary>
public decimal BuyerRefundRemainingAmount => BuyerRefundAmount - BuyerRefundSuccessedAmount; public decimal BuyerRefundRemainingAmount => BuyerRefundAmount - BuyerRefundSuccessedAmount;
/// <summary>
/// 包裹费用
/// </summary>
public decimal PackageAmount { get; set; }
} }
/// <summary> /// <summary>
@@ -355,6 +368,10 @@ namespace _29WxOrderWpf.Ctrls.Statistics.Models
/// <summary>平均利润率(利润 / 采购金额,百分数,如 12.34 表示 12.34%)</summary> /// <summary>平均利润率(利润 / 采购金额,百分数,如 12.34 表示 12.34%)</summary>
public decimal AverageProfitRate { get; set; } public decimal AverageProfitRate { get; set; }
/// <summary>
/// 包裹费用
/// </summary>
public decimal PackageAmount { get; set; }
} }
/// <summary> /// <summary>
@@ -6,6 +6,7 @@
xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:vm="clr-namespace:_29WxOrderWpf.Ctrls.Statistics.ViewModels" xmlns:vm="clr-namespace:_29WxOrderWpf.Ctrls.Statistics.ViewModels"
xmlns:wpf="WPFCommon"
d:DataContext="{d:DesignInstance Type=vm:ShopRevenueStatisticsViewModel, d:DataContext="{d:DesignInstance Type=vm:ShopRevenueStatisticsViewModel,
IsDesignTimeCreatable=True}" IsDesignTimeCreatable=True}"
mc:Ignorable="d"> mc:Ignorable="d">
@@ -48,9 +49,9 @@
Width="110" Width="110"
Height="32" Height="32"
VerticalContentAlignment="Center" VerticalContentAlignment="Center"
BorderThickness="1"
DisplayMemberPath="Text" DisplayMemberPath="Text"
IsReadOnly="True" IsReadOnly="True"
BorderThickness="1"
ItemsSource="{Binding TimeRangeOptions}" ItemsSource="{Binding TimeRangeOptions}"
SelectedItem="{Binding SelectedTimeRange, Mode=TwoWay}" SelectedItem="{Binding SelectedTimeRange, Mode=TwoWay}"
Style="{StaticResource RoundedComboBox}" /> Style="{StaticResource RoundedComboBox}" />
@@ -60,9 +61,10 @@
FontSize="14" FontSize="14"
Foreground="#666666" Foreground="#666666"
Text="日期" /> Text="日期" />
<DatePicker BorderBrush="{StaticResource pageColorBrush}" <DatePicker
Height="32" Height="32"
VerticalContentAlignment="Center" VerticalContentAlignment="Center"
BorderBrush="{StaticResource pageColorBrush}"
SelectedDate="{Binding StartDate, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" /> SelectedDate="{Binding StartDate, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />
<TextBlock <TextBlock
Margin="6,0" Margin="6,0"
@@ -70,9 +72,10 @@
FontSize="14" FontSize="14"
Foreground="#666666" Foreground="#666666"
Text="~" /> Text="~" />
<DatePicker BorderBrush="{StaticResource pageColorBrush}" <DatePicker
Height="32" Height="32"
VerticalContentAlignment="Center" VerticalContentAlignment="Center"
BorderBrush="{StaticResource pageColorBrush}"
SelectedDate="{Binding EndDate, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" /> SelectedDate="{Binding EndDate, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />
<TextBlock <TextBlock
Margin="14,0,6,0" Margin="14,0,6,0"
@@ -95,6 +98,14 @@
ItemsSource="{Binding ShopOptions}" ItemsSource="{Binding ShopOptions}"
SelectedItem="{Binding SelectedShop, Mode=TwoWay}" SelectedItem="{Binding SelectedShop, Mode=TwoWay}"
Style="{StaticResource BaseComboBoxStyle}" />--> Style="{StaticResource BaseComboBoxStyle}" />-->
<wpf:TitleContent
Title="去除快递费"
Margin="10,0,0,0"
VerticalContentAlignment="Center"
Placement="Left"
TitleVerticalAlignment="Center">
<CheckBox IsChecked="{Binding StatPackages}" Style="{StaticResource ToggleSwitch}" />
</wpf:TitleContent>
<Button <Button
Height="32" Height="32"
Margin="18,0,0,0" Margin="18,0,0,0"
@@ -108,7 +108,7 @@ namespace _29WxOrderWpf.Ctrls.Statistics.Services
decimal buyerPaymentAmount = ToYuan(list.Sum(a => a.TotalPurchase)); decimal buyerPaymentAmount = ToYuan(list.Sum(a => a.TotalPurchase));
decimal buyerRefundAmount = ToYuan(list.Sum(a => a.TotalRefund)); decimal buyerRefundAmount = ToYuan(list.Sum(a => a.TotalRefund));
decimal buyerRefundSuccessedAmount = ToYuan(list.Sum(a => a.DoneRefund)); decimal buyerRefundSuccessedAmount = ToYuan(list.Sum(a => a.DoneRefund));
decimal packageAmount = ToYuan(list.Sum(a => a.PackageAmount));
int validOrderCount = list.Sum(a => a.OrderCount); // 新接口 OrderCount 不含退款订单 int validOrderCount = list.Sum(a => a.OrderCount); // 新接口 OrderCount 不含退款订单
int refundOrderCount = list.Sum(a => a.RefundOrderCount); int refundOrderCount = list.Sum(a => a.RefundOrderCount);
int totalOrderCount = validOrderCount + refundOrderCount; int totalOrderCount = validOrderCount + refundOrderCount;
@@ -128,6 +128,7 @@ namespace _29WxOrderWpf.Ctrls.Statistics.Services
BuyerPaymentAmount = buyerPaymentAmount, BuyerPaymentAmount = buyerPaymentAmount,
BuyerRefundAmount = buyerRefundAmount, BuyerRefundAmount = buyerRefundAmount,
BuyerRefundSuccessedAmount = buyerRefundSuccessedAmount, BuyerRefundSuccessedAmount = buyerRefundSuccessedAmount,
PackageAmount = packageAmount
}; };
} }
@@ -248,7 +249,7 @@ namespace _29WxOrderWpf.Ctrls.Statistics.Services
decimal profit = ToYuan(list.Sum(a => a.ProfitAmount)); decimal profit = ToYuan(list.Sum(a => a.ProfitAmount));
decimal buyerPaymentAmount = ToYuan(list.Sum(a => a.TotalPurchase)); decimal buyerPaymentAmount = ToYuan(list.Sum(a => a.TotalPurchase));
int orderCount = list.Sum(a => a.OrderCount); int orderCount = list.Sum(a => a.OrderCount);
decimal packageAmount = ToYuan(list.Sum(a => a.PackageAmount));
return new ShopStatisticsItem return new ShopStatisticsItem
{ {
ShopName = ResolveShopName(shopId), ShopName = ResolveShopName(shopId),
@@ -260,7 +261,8 @@ namespace _29WxOrderWpf.Ctrls.Statistics.Services
PlatformFeeTotal = ToYuan(list.Sum(a => a.PlatformFee)), PlatformFeeTotal = ToYuan(list.Sum(a => a.PlatformFee)),
Commission = 0m, // 新接口无“达人佣金”字段,保留占位 Commission = 0m, // 新接口无“达人佣金”字段,保留占位
AvgOrderAmount = orderCount == 0 ? 0m : salesAmount / orderCount, AvgOrderAmount = orderCount == 0 ? 0m : salesAmount / orderCount,
AverageProfitRate = buyerPaymentAmount == 0m ? 0m : profit / buyerPaymentAmount * 100m AverageProfitRate = buyerPaymentAmount == 0m ? 0m : profit / buyerPaymentAmount * 100m,
PackageAmount = packageAmount
}; };
} }
@@ -385,7 +387,13 @@ namespace _29WxOrderWpf.Ctrls.Statistics.Services
// 顺序请求:签名中的 time/code 由当前时间生成,并发请求有被判重复签名的风险。 // 顺序请求:签名中的 time/code 由当前时间生成,并发请求有被判重复签名的风险。
var summaryStats = await RequestStatsAsync(query, ShopStatsGroupType.Summary); var summaryStats = await RequestStatsAsync(query, ShopStatsGroupType.Summary);
var trend = await RequestTrendAsync(query); var trend = await RequestTrendAsync(query);
if (query.StatPackages)
{
foreach (var item in summaryStats)
{
item.ProfitAmount -= item.PackageAmount;
}
}
return new ShopRevenueStatisticsResult return new ShopRevenueStatisticsResult
{ {
Summary = ShopStatsAggregator.GetSummary(summaryStats), Summary = ShopStatsAggregator.GetSummary(summaryStats),
@@ -399,7 +407,13 @@ namespace _29WxOrderWpf.Ctrls.Statistics.Services
{ {
// 按天/周/月粒度取数;接口不返回整段汇总,卡片由返回的周期记录在客户端合计 // 按天/周/月粒度取数;接口不返回整段汇总,卡片由返回的周期记录在客户端合计
var stats = await RequestStatsAsync(query, ToGroupType(periodType)); var stats = await RequestStatsAsync(query, ToGroupType(periodType));
if (query.StatPackages)
{
foreach (var item in stats)
{
item.ProfitAmount -= item.PackageAmount;
}
}
return new ShopPeriodStatisticsResult return new ShopPeriodStatisticsResult
{ {
Summary = ShopStatsAggregator.GetSummary(stats), Summary = ShopStatsAggregator.GetSummary(stats),
@@ -274,30 +274,32 @@
</TabItem> </TabItem>
</TabControl> </TabControl>
<!-- helper --> <!-- helper -->
<Border
Margin="0,20,30,0"
Padding="10"
HorizontalAlignment="Right"
VerticalAlignment="Top"
Background="{StaticResource pageColorBrush}"
BorderThickness="1"
Cursor="Hand"
MouseLeftButtonDown="help_mouseLeftButtonDown">
<WrapPanel>
<TextBlock
Margin="0,0,10,0"
Foreground="White"
Style="{StaticResource TextBlockIcon}"
Text="{StaticResource txt-chat_help}" />
<TextBlock
HorizontalAlignment="Center"
VerticalAlignment="Center"
FontWeight="Black"
Foreground="White"
Text="利润计算逻辑" />
</WrapPanel>
</Border>
<WrapPanel
Margin="0,20,30,0"
HorizontalAlignment="Right"
VerticalAlignment="Top">
<Border
Padding="10"
Background="{StaticResource pageColorBrush}"
BorderThickness="1"
Cursor="Hand"
MouseLeftButtonDown="help_mouseLeftButtonDown">
<WrapPanel>
<TextBlock
Margin="0,0,10,0"
Foreground="White"
Style="{StaticResource TextBlockIcon}"
Text="{StaticResource txt-chat_help}" />
<TextBlock
HorizontalAlignment="Center"
VerticalAlignment="Center"
FontWeight="Black"
Foreground="White"
Text="利润计算逻辑" />
</WrapPanel>
</Border>
</WrapPanel>
<!-- Popup 弹出层 --> <!-- Popup 弹出层 -->
<Popup <Popup
x:Name="InfoPopup" x:Name="InfoPopup"
@@ -157,7 +157,11 @@
Binding="{Binding ProfitAmount, Converter={StaticResource FenToYuanConverter}, StringFormat={}¥{0:N2}}" Binding="{Binding ProfitAmount, Converter={StaticResource FenToYuanConverter}, StringFormat={}¥{0:N2}}"
ElementStyle="{StaticResource CenterCellTextStyle}" ElementStyle="{StaticResource CenterCellTextStyle}"
Header="利润" /> Header="利润" />
<DataGridTextColumn
Width="*"
Binding="{Binding PackageAmount, Converter={StaticResource FenToYuanConverter}, StringFormat={}¥{0:N2}}"
ElementStyle="{StaticResource CenterCellTextStyle}"
Header="快递费" />
<!-- 买手订单:一笔买手订单占一行,不合并 --> <!-- 买手订单:一笔买手订单占一行,不合并 -->
<DataGridTextColumn <DataGridTextColumn
Width="1.6*" Width="1.6*"
@@ -166,7 +166,10 @@ class ShopOrderDetailRow : BindableBaseEx
/// 利润 /// 利润
/// </summary> /// </summary>
public long ProfitAmount { get; set; } public long ProfitAmount { get; set; }
/// <summary>
/// 包裹费用
/// </summary>
public long PackageAmount { get; set; }
/// <summary> /// <summary>
/// 平台佣金 /// 平台佣金
/// </summary> /// </summary>
@@ -246,6 +249,7 @@ class ShopOrderDetailRow : BindableBaseEx
OrderPrice = item.OrderPrice, OrderPrice = item.OrderPrice,
OrderRefundAmount = item.OrderRefundAmount, OrderRefundAmount = item.OrderRefundAmount,
ProfitAmount = item.ProfitAmount, ProfitAmount = item.ProfitAmount,
PackageAmount = item.PackageAmount,
PlatformFee = item.PlatformFee, PlatformFee = item.PlatformFee,
OutAmount = item.OutAmount, OutAmount = item.OutAmount,
UnrefundedAmount = item.UnrefundedAmount, UnrefundedAmount = item.UnrefundedAmount,
@@ -411,7 +415,7 @@ class ShowOrderDialogViewModel : BindableBaseEx
bool includeRemark = _detailType == ShopOrderDetailType.BuyerUnrefunded; bool includeRemark = _detailType == ShopOrderDetailType.BuyerUnrefunded;
// 表头 // 表头
List<string> headers = ["店名", "订单", "创建时间", "金额", "退款金额", "平台费用", "利润", "买手单号", "外采金额", "买手退款", "退款状态"]; List<string> headers = ["店名", "订单", "创建时间", "金额", "退款金额", "平台费用", "利润","快递费", "买手单号", "外采金额", "买手退款", "退款状态"];
if (includeRemark) if (includeRemark)
headers.Add("备注"); headers.Add("备注");
sb.AppendLine(string.Join("\t", headers)); sb.AppendLine(string.Join("\t", headers));
@@ -428,6 +432,7 @@ class ShowOrderDialogViewModel : BindableBaseEx
(item.OrderRefundAmount / 100m).ToString("0.00"), (item.OrderRefundAmount / 100m).ToString("0.00"),
(item.PlatformFee / 100m).ToString("0.00"), (item.PlatformFee / 100m).ToString("0.00"),
(item.ProfitAmount / 100m).ToString("0.00"), (item.ProfitAmount / 100m).ToString("0.00"),
(item.PackageAmount / 100m).ToString("0.00"),
CsvEscape(item.OutOrderSn), CsvEscape(item.OutOrderSn),
(item.BuyerOutAmount / 100m).ToString("0.00"), (item.BuyerOutAmount / 100m).ToString("0.00"),
(item.BuyerRefundAmount / 100m).ToString("0.00"), (item.BuyerRefundAmount / 100m).ToString("0.00"),
@@ -177,7 +177,11 @@ namespace _29WxOrderWpf.Ctrls.Statistics.ViewModels
#endregion #endregion
#region 查询条件 #region 查询条件
public bool StatPackages
{
get { return this.GetValue(x => x.StatPackages); }
set { this.SetValue(x => x.StatPackages, value); }
}
/// <summary>时间范围选项</summary> /// <summary>时间范围选项</summary>
public ObservableCollection<TimeRangeOption> TimeRangeOptions { get; } public ObservableCollection<TimeRangeOption> TimeRangeOptions { get; }
@@ -455,20 +459,20 @@ namespace _29WxOrderWpf.Ctrls.Statistics.ViewModels
EndDate = now; EndDate = now;
break; break;
case "week": case "week":
{ {
int diff = today.DayOfWeek == DayOfWeek.Sunday ? 6 : (int)today.DayOfWeek - 1; int diff = today.DayOfWeek == DayOfWeek.Sunday ? 6 : (int)today.DayOfWeek - 1;
StartDate = today.AddDays(-diff); StartDate = today.AddDays(-diff);
EndDate = now; EndDate = now;
} }
break; break;
case "lastweek": case "lastweek":
{ {
int diff = today.DayOfWeek == DayOfWeek.Sunday ? 6 : (int)today.DayOfWeek - 1; int diff = today.DayOfWeek == DayOfWeek.Sunday ? 6 : (int)today.DayOfWeek - 1;
var thisWeekStart = today.AddDays(-diff); var thisWeekStart = today.AddDays(-diff);
StartDate = thisWeekStart.AddDays(-7); StartDate = thisWeekStart.AddDays(-7);
EndDate = thisWeekStart.AddDays(-1).AddHours(23).AddMinutes(59).AddSeconds(59); EndDate = thisWeekStart.AddDays(-1).AddHours(23).AddMinutes(59).AddSeconds(59);
} }
break; break;
case "last2weeks": case "last2weeks":
StartDate = today.AddDays(-13); StartDate = today.AddDays(-13);
EndDate = now; EndDate = now;
@@ -482,12 +486,12 @@ namespace _29WxOrderWpf.Ctrls.Statistics.ViewModels
EndDate = now; EndDate = now;
break; break;
case "lastmonth": case "lastmonth":
{ {
var firstOfThisMonth = new DateTime(today.Year, today.Month, 1); var firstOfThisMonth = new DateTime(today.Year, today.Month, 1);
StartDate = firstOfThisMonth.AddMonths(-1); StartDate = firstOfThisMonth.AddMonths(-1);
EndDate = firstOfThisMonth.AddDays(-1).AddHours(23).AddMinutes(59).AddSeconds(59); EndDate = firstOfThisMonth.AddDays(-1).AddHours(23).AddMinutes(59).AddSeconds(59);
} }
break; break;
case "last3months": case "last3months":
StartDate = new DateTime(today.Year, today.Month, 1).AddMonths(-2); StartDate = new DateTime(today.Year, today.Month, 1).AddMonths(-2);
EndDate = now; EndDate = now;
@@ -541,6 +545,7 @@ namespace _29WxOrderWpf.Ctrls.Statistics.ViewModels
StartDate = StartDate, StartDate = StartDate,
EndDate = EndDate, EndDate = EndDate,
ShopIds = BuildSelectedShopIds(), ShopIds = BuildSelectedShopIds(),
StatPackages = StatPackages
}; };
} }
@@ -61,6 +61,11 @@ namespace _29WxOrderWpf.Ctrls.Statistics.ViewModels
InitializeAsync(); InitializeAsync();
} }
public bool StatPackages
{
get { return this.GetValue(x => x.StatPackages); }
set { this.SetValue(x => x.StatPackages, value); }
}
#region 查询条件 #region 查询条件
@@ -288,6 +293,7 @@ namespace _29WxOrderWpf.Ctrls.Statistics.ViewModels
StartDate = StartDate, StartDate = StartDate,
EndDate = EndDate, EndDate = EndDate,
ShopIds = BuildSelectedShopIds(), ShopIds = BuildSelectedShopIds(),
StatPackages = StatPackages,
}; };
} }
+265 -264
View File
@@ -1,273 +1,274 @@
<basewindows:BaseWindow <basewindows:BaseWindow
x:Class="_29WxOrderWpf.MainWindow" x:Class="_29WxOrderWpf.MainWindow"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:basewindows="clr-namespace:_29WxOrderWpf.BaseWindows" xmlns:basewindows="clr-namespace:_29WxOrderWpf.BaseWindows"
xmlns:buyerctrls="clr-namespace:_29WxOrderWpf.Ctrls.BuyerCtrls" xmlns:buyerctrls="clr-namespace:_29WxOrderWpf.Ctrls.BuyerCtrls"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:local="clr-namespace:_29WxOrderWpf" xmlns:local="clr-namespace:_29WxOrderWpf"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:orderctrls="clr-namespace:_29WxOrderWpf.Ctrls.OrderCtrls" xmlns:orderctrls="clr-namespace:_29WxOrderWpf.Ctrls.OrderCtrls"
xmlns:shopctrls="clr-namespace:_29WxOrderWpf.Ctrls.ShopCtrls" xmlns:shopctrls="clr-namespace:_29WxOrderWpf.Ctrls.ShopCtrls"
xmlns:userctrls="clr-namespace:_29WxOrderWpf.UserControls" xmlns:userctrls="clr-namespace:_29WxOrderWpf.UserControls"
x:Name="mainWindow" x:Name="mainWindow"
Title="MainWindow" Title="MainWindow"
Width="1600" Width="1600"
Height="900" Height="900"
Closing="BaseWindow_Closing" Closing="BaseWindow_Closing"
Loaded="Window_Loaded" Loaded="Window_Loaded"
Style="{StaticResource BaseNoneBorderWindowStyle}" Style="{StaticResource BaseNoneBorderWindowStyle}"
mc:Ignorable="d"> mc:Ignorable="d">
<Grid <Grid
x:Name="mainGrid" x:Name="mainGrid"
Margin="{Binding ElementName=mainWindow, Path=Padding}" Margin="{Binding ElementName=mainWindow, Path=Padding}"
Background="Transparent"> Background="Transparent">
<Grid.RowDefinitions> <Grid.RowDefinitions>
<RowDefinition Height="60" /> <RowDefinition Height="60" />
<RowDefinition Height="*" /> <RowDefinition Height="*" />
</Grid.RowDefinitions> </Grid.RowDefinitions>
<Grid <Grid
x:Name="gridTitle" x:Name="gridTitle"
Background="Transparent" Background="Transparent"
MouseLeftButtonDown="gridTitle_MouseLeftButtonDown"> MouseLeftButtonDown="gridTitle_MouseLeftButtonDown">
<Grid.ColumnDefinitions> <Grid.ColumnDefinitions>
<ColumnDefinition Width="auto" /> <ColumnDefinition Width="auto" />
<ColumnDefinition Width="auto" /> <ColumnDefinition Width="auto" />
<ColumnDefinition Width="*" /> <ColumnDefinition Width="*" />
<ColumnDefinition Width="auto" /> <ColumnDefinition Width="auto" />
<ColumnDefinition Width="auto" /> <ColumnDefinition Width="auto" />
</Grid.ColumnDefinitions> </Grid.ColumnDefinitions>
<Image <Image
Width="50" Width="50"
Height="50" Height="50"
Margin="4" Margin="4"
HorizontalAlignment="Left" HorizontalAlignment="Left"
VerticalAlignment="Center" VerticalAlignment="Center"
Source="{StaticResource main29WeixinIcon}" /> Source="{StaticResource main29WeixinIcon}" />
<Label <Label
x:Name="lblAppName" x:Name="lblAppName"
Grid.Column="1" Grid.Column="1"
Margin="0,0,0,0" Margin="0,0,0,0"
HorizontalAlignment="Center" HorizontalAlignment="Center"
VerticalAlignment="Center" VerticalAlignment="Center"
VerticalContentAlignment="Center" VerticalContentAlignment="Center"
Content="拍单软件" Content="拍单软件"
FontSize="20" FontSize="20"
Foreground="{StaticResource mainColorLightBrush}" /> Foreground="{StaticResource mainColorLightBrush}" />
<WrapPanel <WrapPanel
Grid.Column="2" Grid.Column="2"
HorizontalAlignment="Right" HorizontalAlignment="Right"
VerticalAlignment="Center"> VerticalAlignment="Center">
<Button <Button
x:Name="btOrderSupport" x:Name="btOrderSupport"
Click="bt_showOrderSupport" Click="bt_showOrderSupport"
Style="{StaticResource IconButtonStyle}" IsEnabled="False"
ToolTip="客户工单"> Style="{StaticResource IconButtonStyle}"
<Grid Width="30" Height="30"> ToolTip="客户工单">
<TextBlock <Grid Width="30" Height="30">
HorizontalAlignment="Center" <TextBlock
VerticalAlignment="Center" HorizontalAlignment="Center"
FontSize="22" VerticalAlignment="Center"
Foreground="{StaticResource mainColorLightBrush}" FontSize="22"
Style="{StaticResource TextBlockIcon}" Foreground="{StaticResource mainColorLightBrush}"
Text="{StaticResource txt-alert}" /> Style="{StaticResource TextBlockIcon}"
<Border Text="{StaticResource txt-alert}" />
x:Name="borderOrderSupportUnread" <Border
Height="16" x:Name="borderOrderSupportUnread"
MinWidth="16" Height="16"
Padding="4,0" MinWidth="16"
HorizontalAlignment="Right" Padding="4,0"
VerticalAlignment="Top" HorizontalAlignment="Right"
d:Visibility="Visible" VerticalAlignment="Top"
Background="#E53935" d:Visibility="Visible"
CornerRadius="8" Background="#E53935"
Visibility="Collapsed"> CornerRadius="8"
<TextBlock Visibility="Collapsed">
x:Name="tbOrderSupportUnread" <TextBlock
HorizontalAlignment="Center" x:Name="tbOrderSupportUnread"
VerticalAlignment="Center" HorizontalAlignment="Center"
FontSize="10" VerticalAlignment="Center"
FontWeight="Bold" FontSize="10"
Foreground="White" FontWeight="Bold"
Text="0" /> Foreground="White"
</Border> Text="0" />
</Grid> </Border>
</Button> </Grid>
<Border </Button>
Width="1" <Border
Height="20" Width="1"
Margin="10,0" Height="20"
Background="#b893b2" /> Margin="10,0"
<Button Click="bt_setting" Style="{StaticResource IconButtonStyle}"> Background="#b893b2" />
<TextBlock <Button Click="bt_setting" Style="{StaticResource IconButtonStyle}">
FontSize="22" <TextBlock
Foreground="{StaticResource mainColorLightBrush}" FontSize="22"
Style="{StaticResource TextBlockIcon}" Foreground="{StaticResource mainColorLightBrush}"
Text="{StaticResource txt-settings}" /> Style="{StaticResource TextBlockIcon}"
</Button> Text="{StaticResource txt-settings}" />
<Border </Button>
Width="1" <Border
Height="20" Width="1"
Margin="10,0" Height="20"
Background="#b893b2" /> Margin="10,0"
</WrapPanel> Background="#b893b2" />
<WrapPanel </WrapPanel>
Grid.Column="3" <WrapPanel
HorizontalAlignment="Right" Grid.Column="3"
VerticalAlignment="Top"> HorizontalAlignment="Right"
VerticalAlignment="Top">
<UniformGrid Rows="2"> <UniformGrid Rows="2">
<WrapPanel> <WrapPanel>
<Label <Label
x:Name="lblDebug" x:Name="lblDebug"
Margin="2,4,0,0" Margin="2,4,0,0"
Content="[release]" Content="[release]"
FontSize="12" FontSize="12"
Foreground="{StaticResource mainColorLightBrush}" Foreground="{StaticResource mainColorLightBrush}"
Opacity="0.7" /> Opacity="0.7" />
<Label <Label
x:Name="lblVersion" x:Name="lblVersion"
Margin="2,4,0,0" Margin="2,4,0,0"
Content="版本信息" Content="版本信息"
FontSize="12" FontSize="12"
Foreground="{StaticResource mainColorLightBrush}" Foreground="{StaticResource mainColorLightBrush}"
Opacity="0.7" /> Opacity="0.7" />
</WrapPanel> </WrapPanel>
<Label <Label
x:Name="lblBalance" x:Name="lblBalance"
Grid.Column="4" Grid.Column="4"
HorizontalAlignment="Right" HorizontalAlignment="Right"
VerticalAlignment="Top" VerticalAlignment="Top"
VerticalContentAlignment="Center" VerticalContentAlignment="Center"
d:Content="快递余额:999.99" d:Content="快递余额:999.99"
Content="{Binding Balance}" Content="{Binding Balance}"
Cursor="Hand" Cursor="Hand"
FontSize="12" FontSize="12"
Foreground="#60ff66" Foreground="#60ff66"
MouseLeftButtonUp="lblBalance_MouseLeftButtonUp" MouseLeftButtonUp="lblBalance_MouseLeftButtonUp"
Opacity="0.7" /> Opacity="0.7" />
</UniformGrid> </UniformGrid>
</WrapPanel> </WrapPanel>
<userctrls:UcWindowBoxes <userctrls:UcWindowBoxes
x:Name="ucWindowBox" x:Name="ucWindowBox"
Grid.Column="4" Grid.Column="4"
Margin="4" Margin="4"
HorizontalAlignment="Right" HorizontalAlignment="Right"
VerticalAlignment="Top" VerticalAlignment="Top"
MaxBoxVisibility="Visible" /> MaxBoxVisibility="Visible" />
</Grid> </Grid>
<Grid <Grid
x:Name="gridContainer" x:Name="gridContainer"
Grid.Row="1" Grid.Row="1"
Margin="2,0,2,2" Margin="2,0,2,2"
Background="White"> Background="White">
<Grid.ColumnDefinitions> <Grid.ColumnDefinitions>
<ColumnDefinition Width="auto" /> <ColumnDefinition Width="auto" />
<ColumnDefinition Width="*" /> <ColumnDefinition Width="*" />
</Grid.ColumnDefinitions> </Grid.ColumnDefinitions>
<orderctrls:OrderListCtrl <orderctrls:OrderListCtrl
x:Name="orderListCtrl" x:Name="orderListCtrl"
Grid.Column="1" Grid.Column="1"
d:Visibility="Visible" d:Visibility="Visible"
Visibility="Collapsed" /> Visibility="Collapsed" />
<Grid <Grid
x:Name="gridTbBuyerOrderReadCtrl" x:Name="gridTbBuyerOrderReadCtrl"
Grid.ColumnSpan="2" Grid.ColumnSpan="2"
d:Visibility="Visible" d:Visibility="Visible"
Background="#7F000000" Background="#7F000000"
MouseLeftButtonUp="gridPddBuyerOrderReadCtrl_MouseLeftButtonUp" MouseLeftButtonUp="gridPddBuyerOrderReadCtrl_MouseLeftButtonUp"
Visibility="Hidden"> Visibility="Hidden">
<Border <Border
Height="auto" Height="auto"
Margin="0,50,0,0" Margin="0,50,0,0"
HorizontalAlignment="Right" HorizontalAlignment="Right"
Background="White" Background="White"
CornerRadius="10"> CornerRadius="10">
<Grid> <Grid>
<buyerctrls:PDDBuyerOrderReadCtrl <buyerctrls:PDDBuyerOrderReadCtrl
x:Name="pddBuyerOrderReadCtrl" x:Name="pddBuyerOrderReadCtrl"
Grid.Column="1" Grid.Column="1"
Width="1200" Width="1200"
HorizontalAlignment="Right" HorizontalAlignment="Right"
Panel.ZIndex="-1" Panel.ZIndex="-1"
d:Visibility="Visible" d:Visibility="Visible"
Visibility="Collapsed" /> Visibility="Collapsed" />
<buyerctrls:TbBuyerOrderReadCtrl <buyerctrls:TbBuyerOrderReadCtrl
x:Name="tbBuyerOrderReadCtrl" x:Name="tbBuyerOrderReadCtrl"
Grid.Column="1" Grid.Column="1"
Width="1200" Width="1200"
HorizontalAlignment="Right" HorizontalAlignment="Right"
Panel.ZIndex="-1" Panel.ZIndex="-1"
d:Visibility="Collapsed" d:Visibility="Collapsed"
Visibility="Collapsed" /> Visibility="Collapsed" />
</Grid> </Grid>
</Border> </Border>
</Grid> </Grid>
<buyerctrls:PDDBuyerSelectCtrl <buyerctrls:PDDBuyerSelectCtrl
x:Name="pddBuyerSelectCtrl" x:Name="pddBuyerSelectCtrl"
Grid.Column="1" Grid.Column="1"
Margin="8" Margin="8"
HorizontalAlignment="Right" HorizontalAlignment="Right"
VerticalAlignment="Top" VerticalAlignment="Top"
d:Visibility="Visible" d:Visibility="Visible"
Visibility="Collapsed" /> Visibility="Collapsed" />
<Grid <Grid
x:Name="gridUser" x:Name="gridUser"
Grid.ColumnSpan="2" Grid.ColumnSpan="2"
Background="#7F000000" Background="#7F000000"
Visibility="Hidden"> Visibility="Hidden">
<Border <Border
Width="500" Width="850"
Height="600" Height="650"
Background="White" Background="White"
CornerRadius="4"> CornerRadius="4">
<shopctrls:ShopListCtrl <shopctrls:ShopListCtrl
x:Name="shopListCtrl" x:Name="shopListCtrl"
Grid.ColumnSpan="2" Grid.ColumnSpan="2"
Margin="2" Margin="2"
Visibility="{Binding ElementName=gridUser, Mode=TwoWay, Path=Visibility}" /> Visibility="{Binding ElementName=gridUser, Mode=TwoWay, Path=Visibility}" />
</Border> </Border>
</Grid> </Grid>
</Grid> </Grid>
<Border <Border
x:Name="borderMessage" x:Name="borderMessage"
Grid.Row="1" Grid.Row="1"
Width="auto" Width="auto"
Height="auto" Height="auto"
MinWidth="120" MinWidth="120"
MinHeight="2" MinHeight="2"
MaxWidth="1200" MaxWidth="1200"
Margin="10,50" Margin="10,50"
HorizontalAlignment="Center" HorizontalAlignment="Center"
VerticalAlignment="Top" VerticalAlignment="Top"
Panel.ZIndex="1000000" Panel.ZIndex="1000000"
Background="White" Background="White"
BorderBrush="{StaticResource pageColorBrush}" BorderBrush="{StaticResource pageColorBrush}"
BorderThickness="1" BorderThickness="1"
CornerRadius="6" CornerRadius="6"
IsHitTestVisible="False" IsHitTestVisible="False"
Opacity="0"> Opacity="0">
<Border.Effect> <Border.Effect>
<DropShadowEffect <DropShadowEffect
BlurRadius="40" BlurRadius="40"
Opacity="0.2" Opacity="0.2"
ShadowDepth="5" ShadowDepth="5"
Color="#FF98638f" /> Color="#FF98638f" />
</Border.Effect> </Border.Effect>
<TextBlock <TextBlock
x:Name="tbMessage" x:Name="tbMessage"
Margin="10" Margin="10"
HorizontalAlignment="Center" HorizontalAlignment="Center"
VerticalAlignment="Center" VerticalAlignment="Center"
Text="这里是默认提示信息" Text="这里是默认提示信息"
TextWrapping="Wrap" /> TextWrapping="Wrap" />
</Border> </Border>
<!--<Image x:Name="imageBig" HorizontalAlignment="Left" Height="800" Width="800" VerticalAlignment="Center" Grid.Row="1" Margin="200,0,0,0"/>--> <!--<Image x:Name="imageBig" HorizontalAlignment="Left" Height="800" Width="800" VerticalAlignment="Center" Grid.Row="1" Margin="200,0,0,0"/>-->
</Grid> </Grid>
</basewindows:BaseWindow> </basewindows:BaseWindow>
+44 -25
View File
@@ -1,4 +1,4 @@
using _29WxOrderWpf.BaseWindows; using _29WxOrderWpf.BaseWindows;
using _29WxOrderWpf.Ctrls.BuyerCtrls; using _29WxOrderWpf.Ctrls.BuyerCtrls;
using _29WxOrderWpf.Ctrls.OrderCtrls; using _29WxOrderWpf.Ctrls.OrderCtrls;
using _29WxOrderWpf.Ctrls.Settings; using _29WxOrderWpf.Ctrls.Settings;
@@ -46,6 +46,7 @@ using Work._29Tools.BLL;
using Work._29Tools.Forms.UserForms; using Work._29Tools.Forms.UserForms;
using WxOrder.Framework.Commons; using WxOrder.Framework.Commons;
using WxOrder.Framework.Commons.Dialogs; using WxOrder.Framework.Commons.Dialogs;
using WxOrder.Framework.Helpers;
using static System.Windows.Forms.VisualStyles.VisualStyleElement; using static System.Windows.Forms.VisualStyles.VisualStyleElement;
using static System.Windows.Forms.VisualStyles.VisualStyleElement.StartPanel; using static System.Windows.Forms.VisualStyles.VisualStyleElement.StartPanel;
@@ -57,6 +58,7 @@ namespace _29WxOrderWpf
public partial class MainWindow : BaseWindow, INotifyPropertyChanged public partial class MainWindow : BaseWindow, INotifyPropertyChanged
{ {
public static MainWindow Instance { get; private set; } public static MainWindow Instance { get; private set; }
public static readonly object _orderLock = new object();
private readonly TicketRealtimeMonitor _ticketMonitor = TicketRealtimeMonitor.Current; private readonly TicketRealtimeMonitor _ticketMonitor = TicketRealtimeMonitor.Current;
private readonly WorkOrderUnreadService _workOrderUnreadService = new WorkOrderUnreadService(); private readonly WorkOrderUnreadService _workOrderUnreadService = new WorkOrderUnreadService();
@@ -104,10 +106,10 @@ namespace _29WxOrderWpf
pddBuyerOrderReadCtrl.Visibility = Visibility.Visible; pddBuyerOrderReadCtrl.Visibility = Visibility.Visible;
tbBuyerOrderReadCtrl.Visibility = Visibility.Visible; tbBuyerOrderReadCtrl.Visibility = Visibility.Visible;
pddBuyerSelectCtrl.Visibility = Visibility.Visible; pddBuyerSelectCtrl.Visibility = Visibility.Visible;
Task.Run(() => Task.Run(async () =>
{ {
GetServerShop(); GetServerShop();
StartTicketRealtimeMonitor();//启动工单监控 await StartTicketRealtimeMonitor();//启动工单监控
GetShopSupplier(GlobalConfig.ShopLoginList.ToList()); GetShopSupplier(GlobalConfig.ShopLoginList.ToList());
}); });
Task.Run(() => Task.Run(() =>
@@ -238,7 +240,10 @@ namespace _29WxOrderWpf
private void BaseWindow_Closing(object sender, System.ComponentModel.CancelEventArgs e) private void BaseWindow_Closing(object sender, System.ComponentModel.CancelEventArgs e)
{ {
if (BaseMsgWindow.ShowConfirm("是否关闭软件?", "退出微信小店订单管理").DialogResult == true) if (BaseMsgWindow.ShowConfirm("是否关闭软件?", "退出微信小店订单管理").DialogResult == true)
{
_ticketMonitor.Dispose();
Process.GetCurrentProcess().Kill(); Process.GetCurrentProcess().Kill();
}
else else
e.Cancel = true; e.Cancel = true;
} }
@@ -253,16 +258,19 @@ namespace _29WxOrderWpf
var tList = new ConcurrentList<Task>(); var tList = new ConcurrentList<Task>();
List<ShopLoginInfo> list = new List<ShopLoginInfo>(); List<ShopLoginInfo> list = new List<ShopLoginInfo>();
Dispatcher.Invoke(new Action(() => List<ShopLoginInfo> listTmp = new List<ShopLoginInfo>();
{ //Dispatcher.Invoke(new Action(() =>
})); //{
//}));
isReadShop = true; isReadShop = true;
int page = 0; int page = 0;
while (true) while (true)
{ {
Thread.Sleep(1);
page++; page++;
var url = BaseClass.Build29WxObjString("shop/get_shop_list"); var url = BaseClass.Build29WxObjString("shop/get_shop_list");
var data = UserLogin.GetSignaturex() + "&page=" + page; var data = UserLogin.GetSignaturex() + "&page=" + page + "&page_size=100";
data += "&is_get_erp_shop_id=true"; data += "&is_get_erp_shop_id=true";
var html = GetHtml.PostUtf8(url, data); var html = GetHtml.PostUtf8(url, data);
if (string.IsNullOrEmpty(html) || !html.Contains("\"code\":200")) if (string.IsNullOrEmpty(html) || !html.Contains("\"code\":200"))
@@ -294,12 +302,9 @@ namespace _29WxOrderWpf
} }
list.Add(shop); list.Add(shop);
if (!GlobalConfig.ShopLoginList.Any(s => s.ShopId == shop.ShopId && !shop.is_point_shop_expire)) if (!listTmp.Any(s => s.ShopId == shop.ShopId && !shop.is_point_shop_expire))
{ {
Dispatcher.Invoke(new Action(() => listTmp.Add(shop);
{
GlobalConfig.ShopLoginList.Add(shop);
}));
Task.Run(() => Task.Run(() =>
{ {
@@ -334,11 +339,17 @@ namespace _29WxOrderWpf
break; break;
} }
foreach (var order in GlobalConfig.lstFilterOrder.Where(o => o.shop_id.ParseToString() == shop.ErpShopId).ToList()) List<oms_wei_order_info> orders;
lock (_orderLock)
{
orders = GlobalConfig.lstFilterOrder.Where(o => o.shop_id.ParseToString() == shop.ErpShopId).ToList();
}
foreach (var order in orders)
{ {
// 更新代发管理情况 // 更新代发管理情况
foreach (var orderItem in order.orderItems) foreach (var orderItem in order.OrderItems)
Dispatcher.Invoke(new Action(() => { orderItem.UpdateOrderItemBuyButton(); })); orderItem.UpdateOrderItemBuyButton();
//Dispatcher.Invoke(new Action(() => { orderItem.UpdateOrderItemBuyButton(); }));
} }
} }
} }
@@ -350,8 +361,12 @@ namespace _29WxOrderWpf
} }
} }
} }
Dispatcher.Invoke(new Action(() => Dispatcher.Invoke(new Action(() =>
{ {
GlobalConfig.ShopLoginList = new AllBase.Util.ObservableCollectionThreadSafe<ShopLoginInfo>(list);
shopListCtrl.lbxShop.ItemsSource = GlobalConfig.ShopLoginList;
foreach (var shop in GlobalConfig.ShopLoginList.Where(s => !list.Any(ss => ss.ShopId == s.ShopId)).ToList()) foreach (var shop in GlobalConfig.ShopLoginList.Where(s => !list.Any(ss => ss.ShopId == s.ShopId)).ToList())
{ {
GlobalConfig.ShopLoginList.Remove(shop); GlobalConfig.ShopLoginList.Remove(shop);
@@ -364,10 +379,13 @@ namespace _29WxOrderWpf
isReadShop = false; isReadShop = false;
hasReadShop = true; hasReadShop = true;
while (tList.Where(ta => !ta.IsFaulted && !ta.IsCompleted).Count() >= 1) Task.Run(() =>
{ {
tList.RemoveAll(ta => ta.IsFaulted || ta.IsCompleted || ta.IsCanceled); Thread.Sleep(100); while (tList.Where(ta => !ta.IsFaulted && !ta.IsCompleted).Count() >= 1)
} {
tList.RemoveAll(ta => ta.IsFaulted || ta.IsCompleted || ta.IsCanceled); Thread.Sleep(100);
}
});
} }
public void GetShopSupplier(List<ShopLoginInfo> shops) public void GetShopSupplier(List<ShopLoginInfo> shops)
@@ -594,18 +612,22 @@ namespace _29WxOrderWpf
_ticketMonitor.MarkAllRead(); _ticketMonitor.MarkAllRead();
} }
private void StartTicketRealtimeMonitor() private async Task StartTicketRealtimeMonitor()
{ {
try try
{ {
var options = GetTicketOptions().Clone(); var options = GetTicketOptions().Clone();
_ticketMonitor.Start(options); await _ticketMonitor.Start(options);
UpdateOrderSupportBadge(); UpdateOrderSupportBadge();
_ = LoadHistoricalTicketUnreadAsync(options); _ = LoadHistoricalTicketUnreadAsync(options);
this.Dispatcher.Invoke(() =>
{
btOrderSupport.IsEnabled = true;
});
} }
catch (Exception ex) catch (Exception ex)
{ {
LogSave.Add("TicketRealtimeStartError:" + ex); NLogger.Instance.Error("TicketRealtimeStartError:" + ex);
} }
} }
@@ -622,7 +644,7 @@ namespace _29WxOrderWpf
} }
catch (Exception ex) catch (Exception ex)
{ {
LogSave.Add("TicketUnreadLoadError:" + ex); NLogger.Instance.Error("TicketUnreadLoadError:" + ex);
} }
} }
@@ -637,9 +659,6 @@ namespace _29WxOrderWpf
AppIds = GlobalConfig.ShopLoginList.Select(a => a.ShopId).ToList(), AppIds = GlobalConfig.ShopLoginList.Select(a => a.ShopId).ToList(),
Orders = [] Orders = []
}; };
//OrderSupportTicketView //OrderSupportTicketView
// .CreateDefaultOptions(BaseClass.UserName) // .CreateDefaultOptions(BaseClass.UserName)
// .Clone(); // .Clone();
+2 -2
View File
@@ -7,11 +7,11 @@ using System.Windows;
// 有关程序集的一般信息由以下 // 有关程序集的一般信息由以下
// 控制。更改这些特性值可修改 // 控制。更改这些特性值可修改
// 与程序集关联的信息。 // 与程序集关联的信息。
[assembly: AssemblyTitle("29供应连-微信小店订单管理")] [assembly: AssemblyTitle("29供应链-微信小店订单管理")]
[assembly: AssemblyDescription("")] [assembly: AssemblyDescription("")]
[assembly: AssemblyConfiguration("")] [assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("")] [assembly: AssemblyCompany("")]
[assembly: AssemblyProduct("29供应连-微信小店订单管理")] [assembly: AssemblyProduct("29供应链-微信小店订单管理")]
[assembly: AssemblyCopyright("Copyright © 2026")] [assembly: AssemblyCopyright("Copyright © 2026")]
[assembly: AssemblyTrademark("")] [assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")] [assembly: AssemblyCulture("")]
+4 -3
View File
@@ -43,11 +43,12 @@ public class ShipGiftService : SingleInstance<ShipGiftService>
giftAmount = 1.55m; giftAmount = 1.55m;
} }
if (BaseClass.Setting.AutoSwitchGiftType && (item.product_price ?? 0) > 6 * 1000) if (BaseClass.Setting.AutoSwitchGiftType && (item.product_price ?? 0) > 6 * 100)
{ {
giftType = GiftType._160;
giftAmount = 1.6m; giftAmount = 1.6m;
} }
decimal amount = giftAmount + BaseClass.OemGiftAmount; decimal amount = giftAmount + BaseClass.OemGiftAmount + BaseClass.ParentOemGiftAmount;
string province = item.province_name; string province = item.province_name;
@@ -80,7 +81,7 @@ public class ShipGiftService : SingleInstance<ShipGiftService>
// amount = (int)(amount * 100), // amount = (int)(amount * 100),
// oemAmount = (int)(BaseClass.OemGiftAmount * 100) // oemAmount = (int)(BaseClass.OemGiftAmount * 100)
//}); //});
var ret = await _api.SendShipGift([orderId], (int)giftType, amount, BaseClass.OemGiftAmount); var ret = await _api.SendShipGift([orderId], (int)giftType, amount, BaseClass.OemGiftAmount, BaseClass.ParentOemGiftAmount, BaseClass.OemId, BaseClass.ParentOemId);
return ret; return ret;
+76 -2
View File
@@ -5,6 +5,7 @@ using AllBase.Helper;
using AllBase.Model.Config; using AllBase.Model.Config;
using AllBase.Model.DBModel; using AllBase.Model.DBModel;
using NaiBa.Util; using NaiBa.Util;
using NaiBa.Util.Extension;
using NaiBa.Util.Helper; using NaiBa.Util.Helper;
using Newtonsoft.Json.Linq; using Newtonsoft.Json.Linq;
using System; using System;
@@ -23,6 +24,7 @@ namespace _29WxOrderWpf
GlobalConfig.BuyConfig = ConfigHelper.LoadConfig<BuyConfig>("buy_config_260708"); GlobalConfig.BuyConfig = ConfigHelper.LoadConfig<BuyConfig>("buy_config_260708");
if (GlobalConfig.BuyConfig == null) if (GlobalConfig.BuyConfig == null)
GlobalConfig.BuyConfig = new BuyConfig(); GlobalConfig.BuyConfig = new BuyConfig();
GlobalConfig.BuyConfig.IsSyncDirectBuyOrderWaybill = false;
GlobalConfig.lstWXShopTokenInfo = ConfigHelper.LoadConfig<ConcurrentList<WXShopTokenInfo>>("wx_shop_token_list"); GlobalConfig.lstWXShopTokenInfo = ConfigHelper.LoadConfig<ConcurrentList<WXShopTokenInfo>>("wx_shop_token_list");
if (GlobalConfig.lstWXShopTokenInfo == null) if (GlobalConfig.lstWXShopTokenInfo == null)
@@ -37,7 +39,8 @@ namespace _29WxOrderWpf
BaseClass.Setting = NaiBa.Util.Helper.ConfigHelper.LoadConfig<SettingConfig>(SettingViewModel.SettingFileName); BaseClass.Setting = NaiBa.Util.Helper.ConfigHelper.LoadConfig<SettingConfig>(SettingViewModel.SettingFileName);
if (BaseClass.Setting==null) BaseClass.Setting = new SettingConfig(); if (BaseClass.Setting == null) BaseClass.Setting = new SettingConfig();
BaseClass.Setting.AutoSwitchGiftType = true;
new WxOrder.Framework.Startup(); new WxOrder.Framework.Startup();
} }
@@ -59,7 +62,78 @@ namespace _29WxOrderWpf
{ {
BaseClass.Balance = BaseRegex.GetDecimalJson(ref html, "balance"); BaseClass.Balance = BaseRegex.GetDecimalJson(ref html, "balance");
MainWindow.Instance.Balance = BaseClass.Balance.ToString("0.00"); MainWindow.Instance.Balance = BaseClass.Balance.ToString("0.00");
}
// 更新下每单扣费金额
BaseClass.PostagePerOrder = Math.Max(2.2m, BaseRegex.GetDecimalJson(ref html, "postage_per_order"));
BaseClass.RefundPostagePerOrder = Math.Max(2.5m, BaseRegex.GetDecimalJson(ref html, "refund_postage_per_order"));
BaseClass.OemGiftAmount = BaseRegex.GetDecimalJson(ref html, "gift_oem_amount_per_order");
BaseClass.OemId = BaseRegex.GetStringJson(ref html, "oem_id");
BaseClass.OemName = BaseRegex.GetStringJson(ref html, "oem_name");
BaseClass.IsOemOwner = BaseRegex.GetBoolJson(ref html, "is_oem_owner");
}
} }
public static async Task GetOemAmount(int type)
{
var url3 = BaseClass.Build29WxObjString("user/GetUserMarkups");
var data3 = UserLogin.GetSignaturex();
data3 += "&PaymentType=" + type;
var html = await GetHtml.PostUtf8Async(url3, data3);
if (string.IsNullOrEmpty(html) || !html.Contains("\"code\":200"))
html = await GetHtml.PostUtf8Async(url3, data3);
if (html.Contains("\"code\":200"))
{
try
{
var jArr = AllBase.JsonHelper.JObjectParse(html)["data"] as JArray;
foreach (var r in jArr)
{
if (type == 16)
{
if (jArr["level"].ParseToInt() == 1)
{
BaseClass.ParentOemId = jArr["oemId"].ParseToString();
BaseClass.ParentOemGiftAmount = jArr["markup"].ParseToInt() * 0.01m;
}
else if (jArr["level"].ParseToInt() == 2)
{
BaseClass.OemId = jArr["oemId"].ParseToString();
BaseClass.OemGiftAmount = jArr["markup"].ParseToInt() * 0.01m;
}
}
else if (type == 20)
{
if (jArr["level"].ParseToInt() == 1)
{
BaseClass.ParentOemId = jArr["oemId"].ParseToString();
BaseClass.ParentPostageOemAmount = jArr["markup"].ParseToInt() * 0.01m;
}
else if (jArr["level"].ParseToInt() == 2)
{
BaseClass.OemId = jArr["oemId"].ParseToString();
BaseClass.PostageOemAmount = jArr["markup"].ParseToInt() * 0.01m;
}
}
else if (type == 26)
{
if (jArr["level"].ParseToInt() == 1)
{
BaseClass.ParentOemId = jArr["oemId"].ParseToString();
BaseClass.ParentRefundPostageOemAmount = jArr["markup"].ParseToInt() * 0.01m;
}
else if (jArr["level"].ParseToInt() == 2)
{
BaseClass.OemId = jArr["oemId"].ParseToString();
BaseClass.RefundPostageOemAmount = jArr["markup"].ParseToInt() * 0.01m;
}
}
}
}
catch (Exception ex)
{
throw new Exception(ex.Message);
}
}
}
} }
} }
@@ -236,7 +236,7 @@ public class BuyMapSkuViewModel : PropertyNotifyObject
{ {
if (order.IsWaitBuy) if (order.IsWaitBuy)
{ {
foreach (var item in order.orderItems) foreach (var item in order.OrderItems)
{ {
if ((item.out_product_id == map.spu_code && item.out_sku_id == map.sku_code) || if ((item.out_product_id == map.spu_code && item.out_sku_id == map.sku_code) ||
(item.out_product_id == map.spu_code && item.SkuAttrStr == map.sku_code) || (item.out_product_id == map.spu_code && item.SkuAttrStr == map.sku_code) ||
@@ -81,7 +81,7 @@ namespace _29WxOrderWpf.ViewModels
{ {
IsChangeingPickNo = false; IsChangeingPickNo = false;
string orderId = OrderItem.order_id; string orderId = OrderItem.order_id;
ShopLoginInfo shop = OrderItem.Shop; ShopLoginInfo shop = OrderItem.ItemOrder.Shop;
if (string.IsNullOrEmpty(PickNo)) if (string.IsNullOrEmpty(PickNo))
{ {
BaseMsgWindow.ShowInfo("取件码不能为空"); BaseMsgWindow.ShowInfo("取件码不能为空");
+22 -1
View File
@@ -4,6 +4,7 @@ using System.Collections.Generic;
using System.Linq; using System.Linq;
using System.Text; using System.Text;
using System.Threading.Tasks; using System.Threading.Tasks;
using System.Windows;
using WPFCommon.Models; using WPFCommon.Models;
namespace _29WxOrderWpf.ViewModels; namespace _29WxOrderWpf.ViewModels;
@@ -26,15 +27,35 @@ public class SettingViewModel : BindableBaseEx
get => GetValue<bool>(); get => GetValue<bool>();
set => SetValue(value); set => SetValue(value);
} }
public bool SwitchEnableDirectBuy
{
get => GetValue<bool>();
set => SetValue(value);
}
public bool SwitchEnablePddTransitTraditionalAddress
{
get => GetValue<bool>();
set => SetValue(value);
}
public Visibility ShowEnablePddTransitTraditionalAddress
{
get => GetValue<Visibility>();
set => SetValue(value);
}
public void Assign(SettingConfig config) public void Assign(SettingConfig config)
{ {
AutoSwitchGiftType = config.AutoSwitchGiftType; AutoSwitchGiftType = config.AutoSwitchGiftType;
SwitchEnableDirectBuy = config.SwitchEnableDirectBuy;
SwitchEnablePddTransitTraditionalAddress = config.SwitchEnablePddTransitTraditionalAddress;
ShowEnablePddTransitTraditionalAddress = config.ShowEnablePddTransitTraditionalAddress ? Visibility.Visible : Visibility.Collapsed;
} }
public SettingConfig ToConfig() public SettingConfig ToConfig()
{ {
return new SettingConfig return new SettingConfig
{ {
AutoSwitchGiftType = AutoSwitchGiftType AutoSwitchGiftType = AutoSwitchGiftType,
SwitchEnableDirectBuy = SwitchEnableDirectBuy,
SwitchEnablePddTransitTraditionalAddress = SwitchEnablePddTransitTraditionalAddress,
}; };
} }
} }
+15 -12
View File
@@ -345,18 +345,20 @@ namespace _29WxOrderWpf.ViewModels
// cef138必须init后方可设置或删除cookie // cef138必须init后方可设置或删除cookie
while (!CefWebBrowser.IsBrowserInitialized || !CefWebBrowser.GetBrowser().MainFrame.IsValid) while (_isWindowLoaded && (!CefWebBrowser.IsBrowserInitialized || !CefWebBrowser.GetBrowser().MainFrame.IsValid))
await Task.Delay(20); await Task.Delay(20);
//await WPFCEFBrowser.DeleteCookieAsync(CefWebBrowser.GetCookieManager(null)); //await WPFCEFBrowser.DeleteCookieAsync(CefWebBrowser.GetCookieManager(null));
//cef 138 如果没有设置RequestContext 可能为空,直接getCookieManager //cef 138 如果没有设置RequestContext 可能为空,直接getCookieManager
//await WPFCEFBrowser.SetCookieAsync(JsonHelper.SerializeObject(cookieLst), CefWebBrowser.GetCookieManager(null)); //await WPFCEFBrowser.SetCookieAsync(JsonHelper.SerializeObject(cookieLst), CefWebBrowser.GetCookieManager(null));
if (OpenType != EnumOpenType.login) if (OpenType != EnumOpenType.login)
{
foreach (var cook in cookieLst) foreach (var cook in cookieLst)
{ {
await WPFCEFBrowser.SetCookieAsync(cook.Domain.Trim('.'), cook.Name + "=" + cook.Value + ";", CefWebBrowser.GetCookieManager(null)); if (_isWindowLoaded)
//t.Wait(5000); await WPFCEFBrowser.SetCookieAsync(cook.Domain.Trim('.'), cook.Name + "=" + cook.Value + ";", CefWebBrowser.GetCookieManager(null));
} }
}
//根据登录的具体店铺设置local storage //根据登录的具体店铺设置local storage
if (!string.IsNullOrEmpty(buyer?.buyer_id)) if (!string.IsNullOrEmpty(buyer?.buyer_id))
@@ -369,9 +371,9 @@ namespace _29WxOrderWpf.ViewModels
} }
if (!string.IsNullOrEmpty(InitUrl)) if (!string.IsNullOrEmpty(InitUrl))
CefWebBrowser.Load(InitUrl); CefWebBrowser?.Load(InitUrl);
else else
CefWebBrowser.Load(buyerMainUrl); CefWebBrowser?.Load(buyerMainUrl);
//不是登录的话就此返回 //不是登录的话就此返回
if (OpenType != EnumOpenType.login) if (OpenType != EnumOpenType.login)
@@ -381,14 +383,14 @@ namespace _29WxOrderWpf.ViewModels
for (int i = 0; i < 50; i++) for (int i = 0; i < 50; i++)
{ {
if (CefWebBrowser.IsLoading) if (CefWebBrowser?.IsLoading == true)
await Task.Delay(100); await Task.Delay(100);
} }
await Task.Delay(Randomx.GetId(1500, 2000)); await Task.Delay(Randomx.GetId(1500, 2000));
if (!_isWindowLoaded) if (!_isWindowLoaded)
return; return;
while (!CefWebBrowser.Address?.StartsWith(buyerLoginUrl) ?? false) while (!CefWebBrowser?.Address?.StartsWith(buyerLoginUrl) ?? false)
{ {
await Task.Delay(1000); await Task.Delay(1000);
if (!_isWindowLoaded) if (!_isWindowLoaded)
@@ -396,8 +398,7 @@ namespace _29WxOrderWpf.ViewModels
} }
} }
} });
);
} }
@@ -426,7 +427,7 @@ namespace _29WxOrderWpf.ViewModels
sb.Append("(function(){"); sb.Append("(function(){");
sb.Append("CefSharp.BindObjectAsync('shopObj');"); sb.Append("CefSharp.BindObjectAsync('shopObj');");
sb.Append("})();"); sb.Append("})();");
CefWebBrowser.GetBrowser().MainFrame.EvaluateScriptAsync(sb.ToString()); CefWebBrowser?.GetBrowser().MainFrame.EvaluateScriptAsync(sb.ToString());
} }
private bool RequestHandler_BeforeResourceLoad(object sender, string url, string postData, IRequest request) private bool RequestHandler_BeforeResourceLoad(object sender, string url, string postData, IRequest request)
@@ -489,6 +490,8 @@ namespace _29WxOrderWpf.ViewModels
{ {
Thread.Sleep(2000); Thread.Sleep(2000);
if (!_isWindowLoaded)
return;
//List<Cookie> cookieList = WPFCEFBrowser.GetCookieList(shopCookieHead, CefWebBrowser.GetCookieManager(null)); //List<Cookie> cookieList = WPFCEFBrowser.GetCookieList(shopCookieHead, CefWebBrowser.GetCookieManager(null));
List<Cookie> cookieList = WPFCEFBrowser.GetCookieList("", CefWebBrowser.GetCookieManager(null)); List<Cookie> cookieList = WPFCEFBrowser.GetCookieList("", CefWebBrowser.GetCookieManager(null));
@@ -555,9 +558,9 @@ namespace _29WxOrderWpf.ViewModels
if (CefWebBrowser != null) if (CefWebBrowser != null)
{ {
if (Address != "about:blank") if (Address != "about:blank")
CefWebBrowser.Load(Address); CefWebBrowser?.Load(Address);
else else
CefWebBrowser.Load(buyerMainUrl); CefWebBrowser?.Load(buyerMainUrl);
} }
} }
@@ -40,6 +40,11 @@ namespace _29WxOrderWpf.ViewModels
get { return this.GetValue(x => x.OrderItem); } get { return this.GetValue(x => x.OrderItem); }
set { this.SetValue(x => x.OrderItem, value); } set { this.SetValue(x => x.OrderItem, value); }
} }
public oms_wei_external_procurement_log_info TransitOrder
{
get { return this.GetValue(x => x.TransitOrder); }
set { this.SetValue(x => x.TransitOrder, value); }
}
public string purchaserNote public string purchaserNote
{ {
get { return this.GetValue(x => x.purchaserNote); } get { return this.GetValue(x => x.purchaserNote); }
@@ -98,7 +103,12 @@ namespace _29WxOrderWpf.ViewModels
public void AddExtraPackages() public void AddExtraPackages()
{ {
var transitOrder = OrderItem.ItemTransitOrder ?? OrderItem.ItemTransitOrderWithVoid; if (TransitOrder == null)
{
//TransitOrder = OrderItem.ItemTransitOrder ?? OrderItem.ItemTransitOrderWithVoid;
BaseMsgWindow.ShowError("未找到云仓发货包裹,请确认包裹存在");
return;
}
var transitExtraOrder = OrderItem.ItemTransitExtraOrders.FirstOrDefault(t => t.order_void_status != 1); var transitExtraOrder = OrderItem.ItemTransitExtraOrders.FirstOrDefault(t => t.order_void_status != 1);
if (transitExtraOrder != null) if (transitExtraOrder != null)
{ {
@@ -109,24 +119,27 @@ namespace _29WxOrderWpf.ViewModels
string basePostageKey = WarehousePostageInfo.DicWarehousePostage.Keys.FirstOrDefault(pk => (OrderItem.ItemOrder?.province_name).ParseToString().Contains(pk)); string basePostageKey = WarehousePostageInfo.DicWarehousePostage.Keys.FirstOrDefault(pk => (OrderItem.ItemOrder?.province_name).ParseToString().Contains(pk));
decimal basePostage = basePostageKey.IsNullOrEmpty() ? WarehousePostageInfo.DicWarehousePostage.Values.Min() : WarehousePostageInfo.DicWarehousePostage[basePostageKey]; decimal basePostage = basePostageKey.IsNullOrEmpty() ? WarehousePostageInfo.DicWarehousePostage.Values.Min() : WarehousePostageInfo.DicWarehousePostage[basePostageKey];
JObject body = new JObject(); JObject body = new JObject();
body["oemAmount"] = (BaseClass.PostagePerOrderDiff * 100).ParseToInt().ParseToString(); body["parentOemId"] = BaseClass.ParentOemId;
body["postage"] = ((basePostage + BaseClass.PostagePerOrderDiff) * 100).ParseToInt().ParseToString(); body["parentOemAmount"] = (BaseClass.ParentPostageOemAmount * 100).ParseToInt().ParseToString();
body["oemId"] = BaseClass.OemId;
body["oemAmount"] = (BaseClass.PostageOemAmount * 100).ParseToInt().ParseToString();
body["postage"] = ((basePostage + BaseClass.ParentPostageOemAmount + BaseClass.PostageOemAmount) * 100).ParseToInt().ParseToString();
body["packType"] = "2"; body["packType"] = "2";
body["batchId"] = transitOrder.order_code + "-" + ((OrderItem.ItemTransitExtraOrders?.Count).ParseToInt() + 1); body["batchId"] = TransitOrder.order_code + "-" + ((OrderItem.ItemTransitExtraOrders?.Count).ParseToInt() + 1);
body["orderNo"] = OrderItem.order_id; body["orderNo"] = OrderItem.order_id;
body["orderCode"] = transitOrder.order_code; body["orderCode"] = TransitOrder.order_code;
// 未出库填上游物流,已出库填下游物流 // 未出库填上游物流,已出库填下游物流
if (transitOrder.warehouse_status != 2) if (TransitOrder.warehouse_status != 2)
{ {
body["logisticsCode"] = transitOrder.express_1_company; body["logisticsCode"] = TransitOrder.express_1_company;
body["logisticsExpressCode"] = transitOrder.express_1_waybill; body["logisticsExpressCode"] = TransitOrder.express_1_waybill;
} }
else else
{ {
body["logisticsCode"] = transitOrder.express_2_company; body["logisticsCode"] = TransitOrder.express_2_company;
body["logisticsExpressCode"] = transitOrder.express_2_waybill; body["logisticsExpressCode"] = TransitOrder.express_2_waybill;
} }
body["accountUser"] = BaseClass.UserName; body["accountUser"] = BaseClass.UserName;
@@ -142,7 +155,7 @@ namespace _29WxOrderWpf.ViewModels
// <AjaxResult><msg>创建额外包裹异常: 用户账户余额不足,需至少 2.20 元用于中转仓取号, userId:17333276316, balance:0.85</msg><code>2</code></AjaxResult> // <AjaxResult><msg>创建额外包裹异常: 用户账户余额不足,需至少 2.20 元用于中转仓取号, userId:17333276316, balance:0.85</msg><code>2</code></AjaxResult>
if (BaseRegex.GetStringXml(ref rst, "code") != "0" && BaseRegex.GetStringXml(ref rst, "code") != "200") if (BaseRegex.GetStringXml(ref rst, "code") != "0" && BaseRegex.GetStringXml(ref rst, "code") != "200")
{ {
BaseMsgWindow.ShowError(BaseRegex.GetStringXml(ref rst, "msg")); BaseMsgWindow.ShowError("服务端返回:" + BaseRegex.GetStringXml(ref rst, "msg"));
return; return;
} }
@@ -156,7 +169,7 @@ namespace _29WxOrderWpf.ViewModels
// <AjaxResult><msg>额外信息已保存</msg><code>200</code></AjaxResult> // <AjaxResult><msg>额外信息已保存</msg><code>200</code></AjaxResult>
if (BaseRegex.GetStringXml(ref rst, "code") != "0" && BaseRegex.GetStringXml(ref rst, "code") != "200") if (BaseRegex.GetStringXml(ref rst, "code") != "0" && BaseRegex.GetStringXml(ref rst, "code") != "200")
{ {
BaseMsgWindow.ShowError(BaseRegex.GetStringXml(ref rst, "msg")); BaseMsgWindow.ShowError("服务端返回:" + BaseRegex.GetStringXml(ref rst, "msg"));
return; return;
} }
+6 -1
View File
@@ -39,10 +39,15 @@ public partial class ChangeWaybillView : UserControl
private void ChangeWaybillView_Loaded(object sender, RoutedEventArgs e) private void ChangeWaybillView_Loaded(object sender, RoutedEventArgs e)
{ {
Window parentWindow = Window.GetWindow(this);
if (parentWindow != null)
{
parentWindow.Closed += ChangeWaybillView_Closed;
}
ViewModel.Start(); ViewModel.Start();
} }
private void ChangeWaybillView_Closed(object sender, RoutedEventArgs e) private void ChangeWaybillView_Closed(object sender, EventArgs e)
{ {
ViewModel.Stop(); ViewModel.Stop();
} }
@@ -28,11 +28,11 @@ public partial class TransitExtraPackagesView : UserControl
/// </summary> /// </summary>
public TransitExtraPackagesViewModel ViewModel { get; } public TransitExtraPackagesViewModel ViewModel { get; }
public TransitExtraPackagesView(oms_wei_order_info _order, oms_wei_order_item_info _orderItem) public TransitExtraPackagesView(oms_wei_order_info _order, oms_wei_order_item_info _orderItem, oms_wei_external_procurement_log_info transitOrder = null)
{ {
InitializeComponent(); InitializeComponent();
ViewModel = new TransitExtraPackagesViewModel(_order, _orderItem); ViewModel = new TransitExtraPackagesViewModel(_order, _orderItem) { TransitOrder = transitOrder };
ViewModel.RequestClose += ViewModel_RequestClose; ViewModel.RequestClose += ViewModel_RequestClose;
DataContext = ViewModel; DataContext = ViewModel;
} }
@@ -44,7 +44,7 @@ namespace _29WxOrderWpf.Windows.LoginWindows
if (!string.IsNullOrEmpty(BaseClass.ProgramName)) if (!string.IsNullOrEmpty(BaseClass.ProgramName))
{ {
lblAppName.Content = BaseClass.ProgramName; lblAppName.Content = BaseClass.ProgramName;
MainWindow.Instance.lblAppName.Content = lblAppName.Content; MainWindow.Instance.lblAppName.Content = BaseClass.ProgramName.Contains("-微信小店订单管理") ? BaseClass.ProgramName : BaseClass.ProgramName + "-微信小店订单管理";
} }
this.Title = "用户登录"; this.Title = "用户登录";
@@ -288,15 +288,15 @@
Visibility="Collapsed" /> Visibility="Collapsed" />
<Button <Button
x:Name="btnAdd" x:Name="btnAdd"
Grid.Row="9" Grid.Row="8"
Grid.Column="1" Grid.Column="1"
MinWidth="48" MinWidth="48"
Padding="4" Padding="4"
HorizontalAlignment="Left" HorizontalAlignment="Left"
Click="btnAdd_Click" Click="btnAddReturnPackage_Click"
Content="添 加" Content="添 加"
IsEnabled="False" IsEnabled="False"
Style="{StaticResource BasePageButtonStyle}" /> Style="{StaticResource BasePageButtonStyle}" Height="28" Margin="0,53,0,0" Grid.RowSpan="2" VerticalAlignment="Top" />
<Image <Image
x:Name="imgLoading" x:Name="imgLoading"
Grid.Row="9" Grid.Row="9"
@@ -29,108 +29,180 @@ namespace _29WxOrderWpf.Windows.OrderWindows
/// </summary> /// </summary>
public partial class TransitAfterSaleWindow : BaseWindow public partial class TransitAfterSaleWindow : BaseWindow
{ {
public int PackType { get; set; }
public oms_wei_order_item_info OrderItem { get; set; } public oms_wei_order_item_info OrderItem { get; set; }
public oms_wei_order_item_transit_detail_info TransitInfo { get; set; }
public oms_wei_external_procurement_log_info TransitOrder { get; set; } = null;
public oms_wei_transfer_extra_package ExtraPackage { get; set; } = null;
public TransitAfterSaleWindow(oms_wei_order_item_info orderItem) public TransitAfterSaleWindow(oms_wei_order_item_info orderItem, oms_wei_order_item_transit_detail_info _transitInfo)
{ {
InitializeComponent(); InitializeComponent();
if (orderItem != null) if (orderItem != null)
OrderItem = orderItem; OrderItem = orderItem;
} if (_transitInfo != null)
TransitInfo = _transitInfo;
if (_transitInfo?.oms_wei_external_procurement_log_info != null)
TransitOrder = _transitInfo?.oms_wei_external_procurement_log_info;
else if (_transitInfo?.oms_wei_transfer_extra_package != null)
ExtraPackage = _transitInfo?.oms_wei_transfer_extra_package;
PackType = _transitInfo?.TransitTypeStr == "额外包裹" ? 2 : 1;
}
private void mainGrid_Loaded(object sender, RoutedEventArgs e) private void mainGrid_Loaded(object sender, RoutedEventArgs e)
{ {
} }
private async void TransitAfterSaleWindow_Loaded(object sender, RoutedEventArgs e) private async void TransitAfterSaleWindow_Loaded(object sender, RoutedEventArgs e)
{ {
btnAdd.IsEnabled = true; btnAdd.IsEnabled = true;
foreach (var warehouse in TransitWarehouseData.TransitWarehouseList) foreach (var warehouse in TransitWarehouseData.TransitWarehouseList)
{ {
this.cmbWareHouse.Items.Add(warehouse.TransName); this.cmbWareHouse.Items.Add(warehouse.TransName);
} }
if (OrderItem != null) if (OrderItem != null && TransitInfo != null)
{ {
this.cmbWareHouse.Text = TransitWarehouseData.TransitWarehouseList.FirstOrDefault(t => t.TransId == OrderItem.ItemTransitOrderWithVoid?.platform)?.TransName;
this.txtExpressName.Text = OrderItem.ItemTransitOrder?.express_2_company ?? OrderItem.ItemTransitOrderWithVoid?.express_2_company;
this.txtWarehouseWaybill.Text = OrderItem.ItemTransitOrder?.express_2_waybill ?? OrderItem.ItemTransitOrderWithVoid?.express_2_waybill;
if (OrderItem.ItemTransitOrderAfterSale != null) if (ExtraPackage != null)
{ {
btnAdd.IsEnabled = false; // 获取额外包裹对应的发货包裹或者发货包裹本身
var _transitOrder = OrderItem.ItemTransitOrders.FirstOrDefault(t => t.order_code == ExtraPackage?.order_code);
this.txtUser.Text = OrderItem.ItemTransitOrderAfterSale.recipient_name; this.cmbWareHouse.Text = TransitWarehouseData.TransitWarehouseList.FirstOrDefault(t => t.TransId == _transitOrder?.platform)?.TransName;
this.txtMobile.Text = OrderItem.ItemTransitOrderAfterSale.recipient_phone; this.txtExpressName.Text = string.IsNullOrWhiteSpace(ExtraPackage.real_logistics_code) ? ExtraPackage.logistics_code : ExtraPackage?.real_logistics_code;
this.txtDetailAddress.Text = OrderItem.ItemTransitOrderAfterSale.refund_detail_address; this.txtWarehouseWaybill.Text = string.IsNullOrWhiteSpace(ExtraPackage?.real_logistics_express_code) ? ExtraPackage?.logistics_express_code : ExtraPackage?.real_logistics_express_code;
//this.txtAddress.Text = OrderItem.ItemTransitOrderAfterSale.refund_province + "/" + OrderItem.ItemTransitOrderAfterSale.refund_city + "/" + OrderItem.ItemTransitOrderAfterSale.refund_county;
this.txtProvince.Text = OrderItem.ItemTransitOrderAfterSale.refund_province; var transitAfterSale = OrderItem.ItemTransitOrderAfterSales?.OrderByDescending(t => t.id)?.FirstOrDefault(t => t.order_code == ExtraPackage.order_code && t.order_void_status != 1 && t.pack_type == PackType);
this.txtCity.Text = OrderItem.ItemTransitOrderAfterSale.refund_city; if (transitAfterSale != null)
this.txtCounty.Text = OrderItem.ItemTransitOrderAfterSale.refund_county;
}
else
{
// 需要手动申请售后的,先去申请售后再提交拦截退回总店
if (!string.IsNullOrEmpty(OrderItem.ItemTransitOrderWithVoid?.out_order_no) && OrderItem.PddBuyerAfterSaleAddressStr.IsNullOrEmpty() &&
OrderItem.TransitRefundStatusStr.Contains("需手动申请售后") || OrderItem.TransitRefundStatusStr.Contains("待用户发货"))
{ {
btnAdd.IsEnabled = false; btnAdd.IsEnabled = false;
imgLoading.Visibility = Visibility.Visible;
await MainWindow.Instance.orderListCtrl.DoBuyerRefend(new List<oms_wei_order_item_info>() { OrderItem });
var order = GlobalConfig.lstOrder.FirstOrDefault(o => o.order_id == OrderItem.order_id);
if (order != null)
{
var orderItemTmp = order.orderItems.FirstOrDefault(oi => oi.sku_id == OrderItem.sku_id);
if (orderItemTmp != null)
OrderItem = orderItemTmp;
}
btnAdd.IsEnabled = true;
}
if (OrderItem.PddBuyerAfterSale?.orderSn == OrderItem.ItemTransitOrder?.out_order_no && !string.IsNullOrEmpty(OrderItem.PddBuyerAfterSale?.afterSaleAddress)) this.txtUser.Text = transitAfterSale.recipient_name;
this.txtMobile.Text = transitAfterSale.recipient_phone;
this.txtDetailAddress.Text = transitAfterSale.refund_detail_address;
//this.txtAddress.Text = transitAfterSale.refund_province + "/" + transitAfterSale.refund_city + "/" + transitAfterSale.refund_county;
this.txtProvince.Text = transitAfterSale.refund_province;
this.txtCity.Text = transitAfterSale.refund_city;
this.txtCounty.Text = transitAfterSale.refund_county;
}
else
{ {
txtAddressAnalysis.Text = OrderItem.PddBuyerAfterSale?.afterSaleAddress; var pddBuyerAfterSale = OrderItem.PddBuyerAfterSales.FirstOrDefault(af => af.orderSn == _transitOrder?.out_order_no);
btnAddressAnalysis_Click(null, null);
// 需要手动申请售后的,先去申请售后再提交拦截退回总店
if (!string.IsNullOrEmpty(_transitOrder?.out_order_no) && !string.IsNullOrEmpty(pddBuyerAfterSale?.afterSaleAddress) &&
(_transitOrder.refund_status.ParseToString().Contains("需手动申请售后") || _transitOrder.refund_status.ParseToString().Contains("待用户发货")))
{
btnAdd.IsEnabled = false;
imgLoading.Visibility = Visibility.Visible;
await MainWindow.Instance.orderListCtrl.DoBuyerRefend(new List<oms_wei_order_item_info>() { OrderItem });
var order = GlobalConfig.lstOrder.FirstOrDefault(o => o.order_id == OrderItem.order_id);
if (order != null)
{
var orderItemTmp = order.OrderItems.FirstOrDefault(oi => oi.sku_id == OrderItem.sku_id);
if (orderItemTmp != null)
OrderItem = orderItemTmp;
}
btnAdd.IsEnabled = true;
}
pddBuyerAfterSale = OrderItem.PddBuyerAfterSales.FirstOrDefault(af => af.orderSn == _transitOrder?.out_order_no);
if (!string.IsNullOrEmpty(pddBuyerAfterSale?.afterSaleAddress))
{
txtAddressAnalysis.Text = pddBuyerAfterSale?.afterSaleAddress;
btnAddressAnalysis_Click(null, null);
}
} }
} }
imgLoading.Visibility = Visibility.Collapsed; else if(TransitOrder != null)
// 如果提交过工单,则显示已提交工单及提交时间。
var workOrderInfo = await GetWorkOrder();
var issueType = BaseRegex.GetStringJson(ref workOrderInfo, "issueType");
var createTime = BaseRegex.GetStringJson(ref workOrderInfo, "createdAt").ParseToString().ParseToDateTime();
if (!string.IsNullOrEmpty(issueType))
{ {
lblWorkOrderMsg.Content = "已提交工单(" + createTime.ParseToString() + ")"; this.cmbWareHouse.Text = TransitWarehouseData.TransitWarehouseList.FirstOrDefault(t => t.TransId == TransitOrder?.platform)?.TransName;
this.txtExpressName.Text = string.IsNullOrWhiteSpace(TransitOrder?.express_2_waybill) ? TransitOrder?.express_1_company : TransitOrder?.express_2_company;
this.txtWarehouseWaybill.Text = string.IsNullOrWhiteSpace(TransitOrder?.express_2_waybill) ? TransitOrder?.express_1_waybill : TransitOrder?.express_2_waybill;
if (this.txtExpressName.Text.IsNullOrEmpty() || this.txtWarehouseWaybill.Text.IsNullOrEmpty())
{
this.txtExpressName.Text = OrderItem.PddBuyerOrders.FirstOrDefault(p => p.order_sn == TransitOrder?.out_order_no)?.outExpressCompanyCode;
this.txtWarehouseWaybill.Text = OrderItem.PddBuyerOrders.FirstOrDefault(p => p.order_sn == TransitOrder?.out_order_no)?.tracking_number;
if (!string.IsNullOrWhiteSpace(this.txtExpressName.Text) && !string.IsNullOrWhiteSpace(this.txtWarehouseWaybill.Text))
{
// 没物流信息的仓库单手动更新买手物流信息
JObject data = new JObject();
data["orderNo"] = OrderItem.order_id;
data["orderCode"] = TransitOrder?.order_code;
data["logisticsExpressCode"] = this.txtWarehouseWaybill.Text;
data["logisticsExpressCompany"] = this.txtExpressName.Text;
var updateTransitExpressUrl = "https://po.e57.cn/prod-api/api/oms-api/external_procurement/orders/updateLogisticsExpressCode";
var updateTransitExpressStr = JsonHelper.SerializeObject(data);
var updateTransitExpressRst = HttpResponseWXBLL.e57PostResponse(updateTransitExpressUrl, updateTransitExpressStr, "");
}
}
var transitAfterSale = OrderItem.ItemTransitOrderAfterSales?.OrderByDescending(t => t.id)?.FirstOrDefault(t => t.order_code == TransitOrder.order_code && t.order_void_status != 1 && t.pack_type == PackType);
if (transitAfterSale != null)
{
btnAdd.IsEnabled = false;
this.txtUser.Text = transitAfterSale.recipient_name;
this.txtMobile.Text = transitAfterSale.recipient_phone;
this.txtDetailAddress.Text = transitAfterSale.refund_detail_address;
//this.txtAddress.Text = transitAfterSale.refund_province + "/" + transitAfterSale.refund_city + "/" + transitAfterSale.refund_county;
this.txtProvince.Text = transitAfterSale.refund_province;
this.txtCity.Text = transitAfterSale.refund_city;
this.txtCounty.Text = transitAfterSale.refund_county;
}
else
{
// 需要手动申请售后的,先去申请售后再提交拦截退回总店
if (!string.IsNullOrEmpty(TransitOrder?.out_order_no) && OrderItem.PddBuyerAfterSaleAddressStr.IsNullOrEmpty() &&
(TransitOrder.refund_status.ParseToString().Contains("需手动申请售后") || TransitOrder.refund_status.ParseToString().Contains("待用户发货")))
{
btnAdd.IsEnabled = false;
imgLoading.Visibility = Visibility.Visible;
await MainWindow.Instance.orderListCtrl.DoBuyerRefend(new List<oms_wei_order_item_info>() { OrderItem });
var order = GlobalConfig.lstOrder.FirstOrDefault(o => o.order_id == OrderItem.order_id);
if (order != null)
{
var orderItemTmp = order.OrderItems.FirstOrDefault(oi => oi.sku_id == OrderItem.sku_id);
if (orderItemTmp != null)
OrderItem = orderItemTmp;
}
btnAdd.IsEnabled = true;
}
if (OrderItem.PddBuyerAfterSale?.orderSn == TransitOrder?.out_order_no && !string.IsNullOrEmpty(OrderItem.PddBuyerAfterSale?.afterSaleAddress))
{
txtAddressAnalysis.Text = OrderItem.PddBuyerAfterSale?.afterSaleAddress;
btnAddressAnalysis_Click(null, null);
}
}
} }
} }
//if (OrderItem?.ItemTransitOrder?.warehouse_status != 0 && OrderItem?.ItemTransitOrder?.warehouse_status != 1) // 如果提交过工单,则显示已提交工单及提交时间。
////if (OrderItem?.ItemTransitOrderWithVoid?.warehouse_status != 0 && OrderItem?.ItemTransitOrderWithVoid?.warehouse_status != 1) var workOrderInfo = await GetWorkOrder();
//{ var issueType = BaseRegex.GetStringJson(ref workOrderInfo, "issueType");
// btnAdd.IsEnabled = false; var createTime = BaseRegex.GetStringJson(ref workOrderInfo, "createdAt").ParseToString().ParseToDateTime();
// //BaseMsgWindow.ShowError("当前订单仓库状态不支持售后,请联系买家直接退回总店!"); if (!string.IsNullOrEmpty(issueType))
// lblMsg.Content = "当前订单仓库状态不支持售后,请联系买家直接退回总店!"; {
// return; lblWorkOrderMsg.Content = "已提交工单(" + createTime.ParseToString() + ")";
//} }
imgLoading.Visibility = Visibility.Collapsed;
}
if ((OrderItem?.ItemTransitOrder?.warehouse_status).ParseToInt() < 1) private async void btnAddReturnPackage_Click(object sender, RoutedEventArgs e)
{
//btnAdd.IsEnabled = false;
//lblMsg.Content = "当前订单仓库状态不支持拦截退回总店,建议联系买家直接退回总店!";
}
}
private void btnAdd_Click(object sender, RoutedEventArgs e)
{ {
if (string.IsNullOrEmpty(lblWorkOrderMsg.Content.ParseToString())) if (string.IsNullOrEmpty(lblWorkOrderMsg.Content.ParseToString()))
{ {
var workOrder = AddWorkOrder(); // 后续为独立创建工单
// 创建拦截退货包裹工单
var workOrder = await AddWorkOrderAsync();
if (!workOrder.Contains("\"success\":true")) if (!workOrder.Contains("\"success\":true"))
{ {
BaseMsgWindow.ShowError("中转拦截包裹添加失败," + BaseRegex.GetStringJson(ref workOrder, "message"), "", this); BaseMsgWindow.ShowError("拦截工单添加失败," + BaseRegex.GetStringJson(ref workOrder, "message"), "", this);
return; return;
} }
} }
@@ -151,7 +223,7 @@ namespace _29WxOrderWpf.Windows.OrderWindows
JObject data = new JObject(); JObject data = new JObject();
data["orderNo"] = OrderItem.order_id; data["orderNo"] = OrderItem.order_id;
data["orderCode"] = OrderItem.ItemTransitOrderWithVoid?.order_code; data["orderCode"] = TransitOrder?.order_code ?? ExtraPackage?.batchId; /* 发货单填写发货单code,额外包裹填写额外包裹新单号 */
data["refundProvince"] = txtProvince.Text.Trim(); data["refundProvince"] = txtProvince.Text.Trim();
data["refundCity"] = txtCity.Text.Trim(); data["refundCity"] = txtCity.Text.Trim();
data["refundCounty"] = txtCounty.Text.Trim(); data["refundCounty"] = txtCounty.Text.Trim();
@@ -160,6 +232,7 @@ namespace _29WxOrderWpf.Windows.OrderWindows
data["recipientPhone"] = txtMobile.Text.Trim(); data["recipientPhone"] = txtMobile.Text.Trim();
data["account_user"] = BaseClass.UserName; data["account_user"] = BaseClass.UserName;
data["accountUser"] = BaseClass.UserName; data["accountUser"] = BaseClass.UserName;
data["packType"] = PackType; /* 1正常发货拦截退回,2额外包裹拦截退回, */
//data["platform"] = "WEISHOP"; //data["platform"] = "WEISHOP";
if (GlobalConfig.BuyConfig.IsUseAppBalance) if (GlobalConfig.BuyConfig.IsUseAppBalance)
@@ -168,26 +241,28 @@ namespace _29WxOrderWpf.Windows.OrderWindows
decimal basePostage = basePostageKey.IsNullOrEmpty() ? WarehousePostageInfo.DicWarehousePostage.Values.Min() : WarehousePostageInfo.DicWarehousePostage[basePostageKey]; decimal basePostage = basePostageKey.IsNullOrEmpty() ? WarehousePostageInfo.DicWarehousePostage.Values.Min() : WarehousePostageInfo.DicWarehousePostage[basePostageKey];
basePostage += 0.3m; // 送货2.2 退货2.5(+3毛) basePostage += 0.3m; // 送货2.2 退货2.5(+3毛)
data["oemAmount"] = (BaseClass.RefundPostagePerOrderDiff * 100).ParseToInt().ParseToString(); data["parentOemId"] = BaseClass.ParentOemId;
data["postage"] = ((basePostage + BaseClass.RefundPostagePerOrderDiff) * 100).ParseToInt().ParseToString(); data["parentOemAmount"] = (BaseClass.ParentRefundPostageOemAmount * 100).ParseToInt().ParseToString();
data["oemId"] = BaseClass.OemId;
data["oemAmount"] = (BaseClass.RefundPostageOemAmount * 100).ParseToInt().ParseToString();
data["postage"] = ((basePostage + BaseClass.ParentRefundPostageOemAmount + BaseClass.RefundPostageOemAmount) * 100).ParseToInt().ParseToString();
} }
var getTransitAfterSaleUrl = "https://po.e57.cn/prod-api/api/oms-api/external_procurement/createReturnPackage"; var getTransitAfterSaleUrl = "https://po.e57.cn/prod-api/api/oms-api/external_procurement/createReturnPackage";
var getTransitAfterSaleStr = JsonHelper.SerializeObject(data); var getTransitAfterSaleStr = JsonHelper.SerializeObject(data);
var getTransitAfterSaleRst = HttpResponseWXBLL.e57PostResponse(getTransitAfterSaleUrl, getTransitAfterSaleStr, ""); var getTransitAfterSaleRst = await HttpResponseWXBLL.e57PostResponseAsync(getTransitAfterSaleUrl, getTransitAfterSaleStr);
if (!getTransitAfterSaleRst.ParseToString().Contains("<code>200</code>") && !getTransitAfterSaleRst.ParseToString().Contains("<code>0</code>")) if (!getTransitAfterSaleRst.ParseToString().Contains("\"code\":0") && !getTransitAfterSaleRst.ParseToString().Contains("\"code\":200"))
{ {
string msg = BaseRegex.GetStringXml(ref getTransitAfterSaleRst, "msg"); string msg = BaseRegex.GetStringJsonByRegs(ref getTransitAfterSaleRst, getTransitAfterSaleRst, "msg");
if (msg.IsNullOrEmpty()) BaseMsgWindow.ShowError("拦截退货包裹添加失败,服务端返回 " + msg, "", this);
msg = getTransitAfterSaleRst;
BaseMsgWindow.ShowError("中转售后添加失败,服务端返回 " + msg, "", this);
} }
else else
{ {
//<AjaxResult><msg>创建退货包裹成功</msg><code>0</code></AjaxResult> //<AjaxResult><msg>创建退货包裹成功</msg><code>0</code></AjaxResult>
MainWindow.Instance.orderListCtrl.GetOrder(OrderItem.order_id); await MainWindow.Instance.orderListCtrl.GetOrder(OrderItem.order_id);
Task.Run(() => { MainWindow.Instance.orderListCtrl.FilterOrders(); }); //MainWindow.Instance.orderListCtrl.FilterOrders();
BaseMsgWindow.ShowInfo("添加退货包裹成功", "", this); StartUp.UpdateBalance();
BaseMsgWindow.ShowInfo("添加拦截退货包裹成功", "", this);
this.Close(); this.Close();
} }
} }
@@ -247,30 +322,28 @@ namespace _29WxOrderWpf.Windows.OrderWindows
{ {
} }
public string AddWorkOrder() public async Task<string> AddWorkOrderAsync()
{ {
if (OrderItem.ItemTransitOrder?.warehouse_status == 3) if (TransitOrder?.warehouse_status == 3)
return "\"success\":true,\"message\":\"已到仓,无需拦截工单\"";
if (OrderItem.ItemTransitOrderWithVoid?.warehouse_status == 3)
return "\"success\":true,\"message\":\"已到仓,无需拦截工单\""; return "\"success\":true,\"message\":\"已到仓,无需拦截工单\"";
string url = HttpResponseTransitWorkOrderBLL.WorkOrderUrl + "/api/open/v1/customer-work-orders/intercept-return-cloud-warehouse-after-outbound"; string url = HttpResponseTransitWorkOrderBLL.WorkOrderUrl + "/api/open/v1/customer-work-orders/intercept-return-cloud-warehouse-after-outbound";
JObject obj = new JObject(); JObject obj = new JObject();
obj["appId"] = this.OrderItem.Shop?.ShopId; obj["appId"] = this.OrderItem.ItemOrder?.Shop?.ShopId;
obj["wechatOrderNo"] = this.OrderItem.order_id; obj["wechatOrderNo"] = this.OrderItem.order_id;
//obj["purchaseOrderNo"] = this.OrderItem.PddBuyerAfterSale?.orderSn; //obj["purchaseOrderNo"] = this.OrderItem.PddBuyerAfterSale?.orderSn;
obj["purchaseOrderNo"] = OrderItem.ItemTransitOrderWithVoid?.order_code; obj["purchaseOrderNo"] = TransitOrder?.order_code;
obj["creator"] = BaseClass.UserName; obj["creator"] = BaseClass.UserName;
obj["remark"] = "客户要求拦截并退回云仓"; obj["remark"] = "客户要求拦截并退回云仓";
var rst = HttpResponseTransitWorkOrderBLL.PostResponse(this.OrderItem.Shop, url, JsonHelper.SerializeObject(obj), ""); var rst = await HttpResponseTransitWorkOrderBLL.PostResponseAsync(this.OrderItem.ItemOrder?.Shop, url, JsonHelper.SerializeObject(obj), "");
return rst; return rst;
} }
public async Task<string> GetWorkOrder() public async Task<string> GetWorkOrder()
{ {
string url = HttpResponseTransitWorkOrderBLL.WorkOrderUrl + "/api/open/v1/customer-work-orders?wechatOrderNo=" + this.OrderItem.order_id; string url = HttpResponseTransitWorkOrderBLL.WorkOrderUrl + "/api/open/v1/customer-work-orders?wechatOrderNo=" + this.OrderItem.order_id;
var rst = await HttpResponseTransitWorkOrderBLL.GetResponseAsync(this.OrderItem.Shop, url, ""); var rst = await HttpResponseTransitWorkOrderBLL.GetResponseAsync(this.OrderItem.ItemOrder?.Shop, url, "");
return rst; return rst;
} }
} }
@@ -130,7 +130,7 @@ namespace _29WxOrderWpf.Windows.OrderWindows
} }
} }
private void btnAdd_Click(object sender, RoutedEventArgs e) private async void btnAdd_Click(object sender, RoutedEventArgs e)
{ {
if (OrderItem?.ItemOrder?.OrderBuyType == "云仓" && (OrderItem?.ItemTransitOrder?.warehouse_status).ParseToInt() < 1) if (OrderItem?.ItemOrder?.OrderBuyType == "云仓" && (OrderItem?.ItemTransitOrder?.warehouse_status).ParseToInt() < 1)
{ {
@@ -184,8 +184,11 @@ namespace _29WxOrderWpf.Windows.OrderWindows
decimal basePostage = basePostageKey.IsNullOrEmpty() ? WarehousePostageInfo.DicWarehousePostage.Values.Min() : WarehousePostageInfo.DicWarehousePostage[basePostageKey]; decimal basePostage = basePostageKey.IsNullOrEmpty() ? WarehousePostageInfo.DicWarehousePostage.Values.Min() : WarehousePostageInfo.DicWarehousePostage[basePostageKey];
basePostage += 0.3m; // 送货2.2 退货2.5(+3毛) basePostage += 0.3m; // 送货2.2 退货2.5(+3毛)
jObj["oemAmount"] = (BaseClass.RefundPostagePerOrderDiff * 100).ParseToInt().ParseToString(); jObj["parentOemId"] = BaseClass.ParentOemId;
jObj["firstWeightFee"] = ((basePostage + BaseClass.RefundPostagePerOrderDiff) * 100).ParseToInt().ParseToString(); jObj["parentOemAmount"] = (BaseClass.ParentRefundPostageOemAmount * 100).ParseToInt().ParseToString();
jObj["oemId"] = BaseClass.OemId;
jObj["oemAmount"] = (BaseClass.RefundPostageOemAmount * 100).ParseToInt().ParseToString();
jObj["firstWeightFee"] = ((basePostage + BaseClass.ParentRefundPostageOemAmount + BaseClass.RefundPostageOemAmount) * 100).ParseToInt().ParseToString();
JObject jItemObj = new JObject(); JObject jItemObj = new JObject();
jItemObj["spuCode"] = OrderItem.product_id.ParseToString(); jItemObj["spuCode"] = OrderItem.product_id.ParseToString();
@@ -199,7 +202,7 @@ namespace _29WxOrderWpf.Windows.OrderWindows
(jObj["orderDetailsList"] as JArray).Add(jItemObj); (jObj["orderDetailsList"] as JArray).Add(jItemObj);
var returnOrders = OrderListCtrl.GetTransitReturnOrderList(OrderItem.order_id); var returnOrders = await OrderGetOrderListHelper.GetTransitReturnOrderList(OrderItem.order_id);
OrderItem.DistribReturnOrderInfos = returnOrders; OrderItem.DistribReturnOrderInfos = returnOrders;
if (btnAdd.Content.ToString() == "添 加" && OrderItem.DistribReturnOrderInfo == null) if (btnAdd.Content.ToString() == "添 加" && OrderItem.DistribReturnOrderInfo == null)
{ {
@@ -211,18 +214,18 @@ namespace _29WxOrderWpf.Windows.OrderWindows
string msg = BaseRegex.GetStringXml(ref getTransitAfterSaleRst, "msg"); string msg = BaseRegex.GetStringXml(ref getTransitAfterSaleRst, "msg");
if (msg.IsNullOrEmpty()) if (msg.IsNullOrEmpty())
msg = getTransitAfterSaleRst; msg = getTransitAfterSaleRst;
BaseMsgWindow.ShowError("中转仓退货订单添加失败,服务端返回 " + msg); BaseMsgWindow.ShowError("订单 " + OrderItem.order_id + " 中转仓退货订单添加失败,服务端返回 " + msg);
return; return;
} }
} }
returnOrders = OrderListCtrl.GetTransitReturnOrderList(OrderItem.order_id); returnOrders = await OrderGetOrderListHelper.GetTransitReturnOrderList(OrderItem.order_id);
OrderItem.DistribReturnOrderInfos = returnOrders; OrderItem.DistribReturnOrderInfos = returnOrders;
var orderCode = OrderItem.DistribReturnOrderInfo.order_code; var orderCode = OrderItem.DistribReturnOrderInfo.order_code;
if (string.IsNullOrEmpty(orderCode)) if (string.IsNullOrEmpty(orderCode))
{ {
BaseMsgWindow.ShowError("中转仓退货订单创建失败,售后单获取失败"); BaseMsgWindow.ShowError("订单 " + OrderItem.order_id + " 中转仓退货订单创建失败,售后单获取失败");
MainWindow.Instance.orderListCtrl.GetOrder(OrderItem.order_id); await MainWindow.Instance.orderListCtrl.GetOrder(OrderItem.order_id);
return; return;
} }
var createReturnOrderUrl = "https://po.e57.cn/prod-api/api/oms-api/api/distribution/returns/createReturnOrder"; var createReturnOrderUrl = "https://po.e57.cn/prod-api/api/oms-api/api/distribution/returns/createReturnOrder";
@@ -239,17 +242,17 @@ namespace _29WxOrderWpf.Windows.OrderWindows
if (msg.IsNullOrEmpty()) if (msg.IsNullOrEmpty())
msg = createReturnOrderRst; msg = createReturnOrderRst;
BaseMsgWindow.ShowError("中转仓退货订单创建失败,服务端返回 " + msg); BaseMsgWindow.ShowError("中转仓退货订单创建失败,服务端返回 " + msg);
MainWindow.Instance.orderListCtrl.GetOrder(OrderItem.order_id); await MainWindow.Instance.orderListCtrl.GetOrder(OrderItem.order_id);
return; return;
} }
MainWindow.Instance.orderListCtrl.GetOrder(OrderItem.order_id); await MainWindow.Instance.orderListCtrl.GetOrder(OrderItem.order_id);
StartUp.UpdateBalance(); StartUp.UpdateBalance();
BaseMsgWindow.ShowInfo("中转仓退货订单创建成功", "", this); BaseMsgWindow.ShowInfo("中转仓退货订单创建成功", "", this);
this.Close(); this.Close();
} }
public static void AddReturnOrder(oms_wei_order_item_info OrderItem) public static async Task AddReturnOrder(oms_wei_order_item_info OrderItem)
{ {
// 订单不存在或已作废的,直接返回 // 订单不存在或已作废的,直接返回
if (OrderItem == null || OrderItem.ItemRefund == null) if (OrderItem == null || OrderItem.ItemRefund == null)
@@ -310,8 +313,11 @@ namespace _29WxOrderWpf.Windows.OrderWindows
decimal basePostage = basePostageKey.IsNullOrEmpty() ? WarehousePostageInfo.DicWarehousePostage.Values.Min() : WarehousePostageInfo.DicWarehousePostage[basePostageKey]; decimal basePostage = basePostageKey.IsNullOrEmpty() ? WarehousePostageInfo.DicWarehousePostage.Values.Min() : WarehousePostageInfo.DicWarehousePostage[basePostageKey];
basePostage += 0.3m; // 送货2.2 退货2.5(+3毛) basePostage += 0.3m; // 送货2.2 退货2.5(+3毛)
jObj["oemAmount"] = (BaseClass.RefundPostagePerOrderDiff * 100).ParseToInt().ParseToString(); jObj["parentOemId"] = BaseClass.ParentOemId;
jObj["firstWeightFee"] = ((basePostage + BaseClass.RefundPostagePerOrderDiff) * 100).ParseToInt().ParseToString(); jObj["parentOemAmount"] = (BaseClass.ParentRefundPostageOemAmount * 100).ParseToInt().ParseToString();
jObj["oemId"] = BaseClass.OemId;
jObj["oemAmount"] = (BaseClass.RefundPostageOemAmount * 100).ParseToInt().ParseToString();
jObj["firstWeightFee"] = ((basePostage + BaseClass.ParentRefundPostageOemAmount + BaseClass.RefundPostageOemAmount) * 100).ParseToInt().ParseToString();
JObject jItemObj = new JObject(); JObject jItemObj = new JObject();
jItemObj["spuCode"] = OrderItem.product_id.ParseToString(); jItemObj["spuCode"] = OrderItem.product_id.ParseToString();
@@ -325,7 +331,7 @@ namespace _29WxOrderWpf.Windows.OrderWindows
(jObj["orderDetailsList"] as JArray).Add(jItemObj); (jObj["orderDetailsList"] as JArray).Add(jItemObj);
var returnOrders = OrderListCtrl.GetTransitReturnOrderList(OrderItem.order_id); var returnOrders = await OrderGetOrderListHelper.GetTransitReturnOrderList(OrderItem.order_id);
OrderItem.DistribReturnOrderInfos = returnOrders; OrderItem.DistribReturnOrderInfos = returnOrders;
if (OrderItem.DistribReturnOrderInfo == null) if (OrderItem.DistribReturnOrderInfo == null)
{ {
@@ -337,18 +343,18 @@ namespace _29WxOrderWpf.Windows.OrderWindows
string msg = BaseRegex.GetStringXml(ref getTransitAfterSaleRst, "msg"); string msg = BaseRegex.GetStringXml(ref getTransitAfterSaleRst, "msg");
if (msg.IsNullOrEmpty()) if (msg.IsNullOrEmpty())
msg = getTransitAfterSaleRst; msg = getTransitAfterSaleRst;
BaseMsgWindow.ShowAnimateMessage("中转仓退货订单添加失败,服务端返回 " + msg, "Error", 5); BaseMsgWindow.ShowAnimateMessage("订单 " + OrderItem.order_id + " 中转仓退货订单添加失败,服务端返回 " + msg, "Error", 5);
return; return;
} }
} }
returnOrders = OrderListCtrl.GetTransitReturnOrderList(OrderItem.order_id); returnOrders = await OrderGetOrderListHelper.GetTransitReturnOrderList(OrderItem.order_id);
OrderItem.DistribReturnOrderInfos = returnOrders; OrderItem.DistribReturnOrderInfos = returnOrders;
var orderCode = OrderItem.DistribReturnOrderInfo.order_code; var orderCode = OrderItem.DistribReturnOrderInfo.order_code;
if (string.IsNullOrEmpty(orderCode)) if (string.IsNullOrEmpty(orderCode))
{ {
BaseMsgWindow.ShowAnimateMessage("中转仓退货订单创建失败,售后单获取失败", "Error", 5); BaseMsgWindow.ShowAnimateMessage("订单 " + OrderItem.order_id + " 中转仓退货订单创建失败,售后单获取失败", "Error", 5);
MainWindow.Instance.orderListCtrl.GetOrder(OrderItem.order_id); await MainWindow.Instance.orderListCtrl.GetOrder(OrderItem.order_id);
return; return;
} }
var createReturnOrderUrl = "https://po.e57.cn/prod-api/api/oms-api/api/distribution/returns/createReturnOrder"; var createReturnOrderUrl = "https://po.e57.cn/prod-api/api/oms-api/api/distribution/returns/createReturnOrder";
@@ -363,16 +369,16 @@ namespace _29WxOrderWpf.Windows.OrderWindows
string msg = BaseRegex.GetStringXml(ref createReturnOrderRst, "msg"); string msg = BaseRegex.GetStringXml(ref createReturnOrderRst, "msg");
if (msg.IsNullOrEmpty()) if (msg.IsNullOrEmpty())
msg = createReturnOrderRst; msg = createReturnOrderRst;
BaseMsgWindow.ShowAnimateMessage("中转仓退货订单创建失败,服务端返回 " + msg, "Error", 5); BaseMsgWindow.ShowAnimateMessage("订单 " + OrderItem.order_id + " 中转仓退货订单创建失败,服务端返回 " + msg, "Error", 5);
MainWindow.Instance.orderListCtrl.GetOrder(OrderItem.order_id); await MainWindow.Instance.orderListCtrl.GetOrder(OrderItem.order_id);
return; return;
} }
//MainWindow.Instance.orderListCtrl.GetOrder(OrderItem.order_id); //MainWindow.Instance.orderListCtrl.GetOrder(OrderItem.order_id);
returnOrders = OrderListCtrl.GetTransitReturnOrderList(OrderItem.order_id); returnOrders = await OrderGetOrderListHelper.GetTransitReturnOrderList(OrderItem.order_id);
OrderItem.DistribReturnOrderInfos = returnOrders; OrderItem.DistribReturnOrderInfos = returnOrders;
StartUp.UpdateBalance(); StartUp.UpdateBalance();
BaseMsgWindow.ShowAnimateMessage("中转仓退货订单创建成功", "Msg", 2); BaseMsgWindow.ShowAnimateMessage("订单 " + OrderItem.order_id + " 中转仓退货订单创建成功", "Msg", 2);
} }
private void btnAddressAnalysis_Click(object sender, RoutedEventArgs e) private void btnAddressAnalysis_Click(object sender, RoutedEventArgs e)
+31 -4
View File
@@ -22,6 +22,8 @@ namespace AllBase
#region oem贴牌参数 #region oem贴牌参数
public static string OemId { get; set; } = ""; public static string OemId { get; set; } = "";
public static string OemName { get; set; } = ""; public static string OemName { get; set; } = "";
public static string ParentOemId { get; set; } = "";
public static string ParentOemName { get; set; } = "";
public static bool IsOemOwner { get; set; } = false; public static bool IsOemOwner { get; set; } = false;
public static string AgentName { get; set; } = ""; public static string AgentName { get; set; } = "";
public static string AgentCode { get; set; } = ""; public static string AgentCode { get; set; } = "";
@@ -31,15 +33,29 @@ namespace AllBase
/// 礼品单oem额外价格 /// 礼品单oem额外价格
/// </summary> /// </summary>
public static decimal OemGiftAmount { get; set; } = 0; public static decimal OemGiftAmount { get; set; } = 0;
/// <summary>
/// 礼品单一级代理oem额外价格
/// </summary>
public static decimal ParentOemGiftAmount { get; set; } = 0;
#endregion #endregion
/// <summary> /// <summary>
/// 版本ID /// 版本ID
/// </summary> /// </summary>
public static int VersionCount = 335; public static int VersionCount = 393;
public static string ServerUrl { get; set; } = "http://1.13.195.131:9000"; //public static string ServerUrl { get; set; } = "http://1.13.195.131:9000";
public static string ServerUrl
{
get
{
var url = "http://1.13.195.131:9000";
//if (Randomx.GetId(3) < 2)
// url = "http://119.45.29.75:9000";
return url;
}
}
public static string DebugUrl { get; set; } = "http://localhost:9000"; public static string DebugUrl { get; set; } = "http://localhost:9000";
@@ -203,10 +219,20 @@ namespace AllBase
public static int ShopPointsPerMonth { get; set; } = 30; public static int ShopPointsPerMonth { get; set; } = 30;
public static decimal RechargeAmountTotal { get; set; } = 0; public static decimal RechargeAmountTotal { get; set; } = 0;
public static decimal Balance { get; set; } = 0; public static decimal Balance { get; set; } = 0;
/// <summary>
/// 发货每笔费用
/// </summary>
public static decimal PostagePerOrder { get; set; } = 2.2m; public static decimal PostagePerOrder { get; set; } = 2.2m;
public static decimal PostagePerOrderDiff { get { return Math.Max(0, PostagePerOrder - 2.2m); } } static decimal? postageOemAmount = null;
public static decimal PostageOemAmount { set { postageOemAmount = value; } get { return postageOemAmount ?? Math.Max(0, PostagePerOrder - 2.2m); } }
public static decimal ParentPostageOemAmount { get; set; } = 0m;
/// <summary>
/// 退货每笔费用
/// </summary>
public static decimal RefundPostagePerOrder { get; set; } = 2.5m; public static decimal RefundPostagePerOrder { get; set; } = 2.5m;
public static decimal RefundPostagePerOrderDiff { get { return Math.Max(0, RefundPostagePerOrder - 2.5m); } } static decimal? refundPostageOemAmount = null;
public static decimal RefundPostageOemAmount { set { refundPostageOemAmount = value; } get { return refundPostageOemAmount ?? Math.Max(0, RefundPostagePerOrder - 2.5m); } }
public static decimal ParentRefundPostageOemAmount { get; set; } = 0m;
public static int AlimamaPageCount = 0; public static int AlimamaPageCount = 0;
public static bool CloudTitle = false; public static bool CloudTitle = false;
public static bool CloudBrand = false; public static bool CloudBrand = false;
@@ -594,6 +620,7 @@ namespace AllBase
public static string PassWordBak { get; set; } public static string PassWordBak { get; set; }
public static string Mobile { get; set; } public static string Mobile { get; set; }
public static bool AllowTraditionalBuyAddress { get; set; }
public static string ParentAuthority { get; set; } public static string ParentAuthority { get; set; }
public static string ForbiddenPage { get; set; } public static string ForbiddenPage { get; set; }
public static string UserAuthority { get; set; } public static string UserAuthority { get; set; }
+4 -4
View File
@@ -20,10 +20,10 @@ namespace AllBase.Helper
{ {
public class GlobalConfig public class GlobalConfig
{ {
/// <summary> /// <summary>
/// 颜色等图形元素需要在主线程操作 /// 颜色等图形元素需要在主线程操作
/// </summary> /// </summary>
public static Dispatcher Dispatcher { get; set; } public static Dispatcher Dispatcher { get; set; }
/// <summary> /// <summary>
/// 店铺列表 /// 店铺列表
/// </summary> /// </summary>
+1 -1
View File
@@ -415,7 +415,7 @@ namespace AllBase
bitmap.Freeze(); // 防止后续更改,提高性能 bitmap.Freeze(); // 防止后续更改,提高性能
} }
} }
} }
catch (Exception ex) catch (Exception ex)
{ {
// 处理异常,例如打印错误信息或设置一个默认图片等 // 处理异常,例如打印错误信息或设置一个默认图片等
+15
View File
@@ -15,4 +15,19 @@ public class SettingConfig
/// </summary> /// </summary>
public bool AutoSwitchGiftType { get; set; } = true; public bool AutoSwitchGiftType { get; set; } = true;
#endregion #endregion
#region 拍单
/// <summary>
/// 允许直发拍单
/// </summary>
public bool SwitchEnableDirectBuy { get; set; } = false;
/// <summary>
/// 拼多多仓库订单使用随机繁体字
/// </summary>
public bool SwitchEnablePddTransitTraditionalAddress { get; set; } = false;
/// <summary>
/// 是否显示使用随机繁体字配置(不显示则不可使用繁体字)
/// </summary>
public bool ShowEnablePddTransitTraditionalAddress { get; set; } = false;
#endregion
} }
+73 -7
View File
@@ -39,18 +39,81 @@ namespace AllBase.Model.DBModel
public int district_id { get; set; } public int district_id { get; set; }
public string province_name { get;set; } public string province_name { get;set; }
public string city_name { get; set; } public string city_name { get; set; }
} public string district_name { get; set; }
}
public class TransitWarehouseData public class TransitWarehouseData
{ {
public static string TransitWarehouseDataStr = @" public static Dictionary<string, string> dicWarehouseIdName = new Dictionary<string, string>()
{
{ "XDYBJC", "北京仓" },
{ "XDYGZC", "广州仓" },
{ "XDYWHC", "武汉2仓" },
{ "XDYSHANDC", "山东2仓" },
{ "XDYSHC", "上海新仓" },
{ "XDYSZC", "深圳仓" },
{ "XDYYWC", "义乌仓" },
{ "XDYJJC", "晋江仓" },
{ "XDYCDC", "成都仓" },
{ "XDYCHONGQC", "重庆2仓" },
{ "XDYHEBC", "哈尔滨仓" },
{ "XDYXA", "西安仓" },
{ "XDYGYC", "贵阳仓" },
{ "XDYKMC", "昆明仓" },
{ "XDYSSC", "河北仓" },
{ "XDYZZC", "郑州仓" },
{ "XDYFJSSC", "福建仓" },
};
public static string TransitWarehouseDataStr = @"
XDYBJC ;北京仓 ;胡萍 ;18565773752 ;北京市顺义区光明街道滨河小区七区1号楼 ;2 ;52 ;511 ;北京市 ;北京市 ;顺义区 ;光明街道 ;滨河小区七区1号楼108室 XDYBJC ;北京仓 ;胡萍 ;18565773752 ;北京市顺义区光明街道滨河小区七区1号楼 ;2 ;52 ;511 ;北京市 ;北京市 ;顺义区 ;光明街道 ;滨河小区七区1号楼108室
XDYGZC ;广州仓 ;何外华 ;13826339849 ;广州市增城区朱村街道育山一路68号国际物流园 ;6 ;76 ;702 ;广东省 ;广州市 ;增城区 ;朱村街道 ;育山一路68号国际物流园 XDYGZC ;广州仓 ;何外华 ;13826339849 ;广州市增城区朱村街道育山一路68号国际物流园 ;6 ;76 ;702 ;广东省 ;广州市 ;增城区 ;朱村街道 ;育山一路68号国际物流园
XDYWHC ;武汉2仓 ;杨先生 ;13044121071 ;湖北省武汉市江汉区民族街道沿江大道轮渡龙王庙码头 ;13 ;180 ;1546 ;湖北省 ;武汉市 ;江汉区 ;民族街道 ;沿江大道轮渡龙王庙码头 XDYWHC ;武汉2仓 ;杨先生 ;13044121071 ;湖北省武汉市江汉区民族街道沿江大道轮渡龙王庙码头 ;13 ;180 ;1546 ;湖北省 ;武汉市 ;江汉区 ;民族街道 ;沿江大道轮渡龙王庙码头
XDYSHANDC ;山东2仓 ;鸿鹄小申 ;13044121239 ;山东省临沂市费县南外环东转盘往东200米顺通快递有限公司(仓库二楼) ;22 ;292 ;2415 ;山东省 ;临沂市 ;费县 ;费城街道 ;南外环东转盘往东200米顺通快递有限公司(仓库二楼) XDYSHANDC ;山东2仓 ;鸿鹄小申 ;13044121239 ;山东省临沂市费县南外环东转盘往东200米顺通快递有限公司(仓库二楼) ;22 ;292 ;2415 ;山东省 ;临沂市 ;费县 ;费城街道 ;南外环东转盘往东200米顺通快递有限公司(仓库二楼)
XDYSHC ;上海新仓 ;纪先生 ;13044121150 ;上海市上海市普陀区真如镇街道真北路2653弄T区 ;25 ;321 ;2709 ;上海市 ;上海市 ;普陀区 ;真如镇街道 ;真北路2653弄T区 XDYSHC ;上海新仓 ;纪先生 ;13044121150 ;上海市徐汇区徐家汇街道虹桥路616号A座T区 ;25 ;321 ;2706 ;上海市 ;上海市 ;徐汇区 ;徐家汇街道 ;虹桥路616号A座
XDYSZC ;深圳仓 ;峰峰 ;15343351331 ;广东省东莞市凤岗镇浸校塘东良巷逸乐轩E栋5号楼 ;6 ;79 ;732 ;广东省 ;东莞市 ;凤岗镇 ;凤岗街道 ;浸校塘东良巷逸乐轩E栋5号楼"; XDYSZC ;深圳仓 ;峰峰 ;15343351331 ;广东省东莞市凤岗镇浸校塘东良巷逸乐轩E栋5号楼 ;6 ;79 ;732 ;广东省 ;东莞市 ;凤岗镇 ;凤岗街道 ;浸校塘东良巷逸乐轩E栋5号楼
//XDYYWC ;义乌仓 ;小田 ;19058117371 ;浙江省义乌市后宅街道金城高尔夫二期别墅区401栋 ;31 ;386 ;3409 ;浙江省 ;金华市 ;义乌市 ;后宅街道 ;金城高尔夫二期别墅区401栋 XDYYWC ;义乌仓 ;小田 ;19058117371 ;浙江省金华市义乌市后宅街道金城高尔夫二期别墅区401栋 ;31 ;386 ;3409 ;浙江省 ;金华市 ;义乌市 ;后宅街道 ;金城高尔夫二期别墅区401栋
XDYFJSSC ;福建仓 ;小张 ;13799125513 ;福建省泉州市晋江市青阳街道中堡电商园一栋 ;4 ;58 ;568 ;福建省 ;泉州市 ;晋江市 ;青阳街道 ;中堡电商园一栋";
public static Dictionary<char, List<char>> dicChineseNumberChar = new Dictionary<char, List<char>>()
{
{ '1', new List<char> { '一', '壹' } },
{ '2', new List<char> { '二', '贰' } },
{ '3', new List<char> { '三', '叁' } },
{ '4', new List<char> { '四', '肆' } },
{ '5', new List<char> { '五', '伍' } },
{ '6', new List<char> { '六', '陆' } },
{ '7', new List<char> { '七', '柒' } },
{ '8', new List<char> { '八', '捌' } },
{ '9', new List<char> { '九', '玖' } },
{ '0', new List<char> { '零', '〇' } },
{ '一', new List<char> { '壹' } },
{ '二', new List<char> { '贰' } },
{ '三', new List<char> { '叁' } },
{ '四', new List<char> { '肆' } },
{ '五', new List<char> { '伍' } },
{ '六', new List<char> { '陆' } },
{ '七', new List<char> { '柒' } },
{ '八', new List<char> { '捌' } },
{ '九', new List<char> { '玖' } },
{ '零', new List<char> { '〇' } },
};
// public static string TransitWarehouseDataStrTraditional = @"
//XDYBJC ;北京仓 ;胡萍 ;18565773752 ;北京市順義區光明街道濱河小區七區一號樓 ;2 ;52 ;511 ;北京市 ;北京市 ;顺义区 ;光明街道 ;濱河小區七區一號樓一零八室
//XDYGZC ;广州仓 ;何外华 ;13826339849 ;廣州市增城區朱村街道育山一路六八號國際物流園 ;6 ;76 ;702 ;广东省 ;广州市 ;增城区 ;朱村街道 ;育山一路六八號國際物流園
//XDYWHC ;武汉2仓 ;杨先生 ;13044121071 ;湖北省武漢市江漢區民族街道沿江大道輪渡龍王廟碼頭 ;13 ;180 ;1546 ;湖北省 ;武汉市 ;江汉区 ;民族街道 ;沿江大道輪渡龍王廟碼頭
//XDYSHANDC ;山东2仓 ;鸿鹄小申 ;13044121239 ;山東省臨沂市費縣南外環東轉盤往東二零零米順通快遞有限公司(倉庫二樓) ;22 ;292 ;2415 ;山东省 ;临沂市 ;费县 ;費城街道 ;南外環東轉盤往東二零零米順通快遞有限公司(倉庫二樓)
//XDYSHC ;上海新仓 ;纪先生 ;13044121150 ;上海市徐匯區徐家匯街道虹橋路六一六號A座 ;25 ;321 ;2706 ;上海市 ;上海市 ;徐汇区 ;徐家匯街道 ;虹橋路六一六號A座
//XDYSZC ;深圳仓 ;峰峰 ;15343351331 ;廣東省東莞市鳳崗鎮浸校塘東良巷逸樂軒E棟五號樓 ;6 ;79 ;732 ;广东省 ;东莞市 ;凤岗镇 ;鳳崗街道 ;浸校塘東良巷逸樂軒E棟五號樓
//XDYYWC ;义乌仓 ;小田 ;19058117371 ;浙江省金华市义乌市後宅街道金城高爾夫二期別墅區四零一棟 ;31 ;386 ;3409 ;浙江省 ;金华市 ;义乌市 ;後宅街道 ;金城高爾夫二期別墅區四零一棟
//XDYFJSSC ;福建仓 ;小张 ;13799125513 ;福建省泉州市晋江市青陽街道中堡電商園一棟 ;4 ;58 ;568 ;福建省 ;泉州市 ;晋江市 ;青陽街道 ;中堡電商園一棟";
//XDYSHC ;上海新仓 ;纪先生 ;13044121150 ;上海市上海市徐汇区徐家汇街道虹桥路616号A座 ;25 ;321 ;2706 ;上海市 ;上海市 ;徐汇区 ;徐家汇街道 ;虹桥路616号A座
//XDYSHC ;上海新仓 ;纪先生 ;13044121150 ;上海市上海市普陀区真如镇街道真北路2653弄T区 ;25 ;321 ;2709 ;上海市 ;上海市 ;普陀区 ;真如镇街道 ;真北路2653弄T区
//XDYFJSSC 石狮仓 福建省/泉州市/晋江市青阳街道中堡电商园一栋
//XDYYWC ;义乌仓 ;小田 ;19058117371 ;浙江省金华市义乌市北苑街道西站大道妈妈商贸18号库39号楼誉达 ;31 ;386 ;3409 ;浙江省 ;金华市 ;义乌市 ;北苑街道 ;西站大道妈妈商贸18号库39号楼誉达 //XDYYWC ;义乌仓 ;小田 ;19058117371 ;浙江省金华市义乌市北苑街道西站大道妈妈商贸18号库39号楼誉达 ;31 ;386 ;3409 ;浙江省 ;金华市 ;义乌市 ;北苑街道 ;西站大道妈妈商贸18号库39号楼誉达
//XDYJJC ;晋江仓 ;安群 ;19905951984 ;福建省泉州市南安市霞美镇温山村431号鸿鹄大厦 ;4 ;58 ;569 ;福建省 ;泉州市 //XDYJJC ;晋江仓 ;安群 ;19905951984 ;福建省泉州市南安市霞美镇温山村431号鸿鹄大厦 ;4 ;58 ;569 ;福建省 ;泉州市
//XDYCDC ;成都仓 ;谢春虹 ;15828201479 ;四川省资阳市乐至县仙鹤大道桑都街15-19号仓库(不要放驿站,送到仓库) ;26 ;340 ;2898 ;四川省 ;资阳市 //XDYCDC ;成都仓 ;谢春虹 ;15828201479 ;四川省资阳市乐至县仙鹤大道桑都街15-19号仓库(不要放驿站,送到仓库) ;26 ;340 ;2898 ;四川省 ;资阳市
@@ -74,7 +137,7 @@ XDYSZC ;深圳仓 ;峰峰 ;15343351331 ;广东省东莞市凤岗镇浸
static List<TransitWarehouseParam> transitWarehouseList = null; static List<TransitWarehouseParam> transitWarehouseList = null;
public static List<TransitWarehouseParam> TransitWarehouseList public static List<TransitWarehouseParam> TransitWarehouseList
{ {
get get
{ {
@@ -100,6 +163,7 @@ XDYSZC ;深圳仓 ;峰峰 ;15343351331 ;广东省东莞市凤岗镇浸
district_id = arr[7].Trim().ParseToInt(), district_id = arr[7].Trim().ParseToInt(),
province_name = arr[8].Trim(), province_name = arr[8].Trim(),
city_name = arr[9].Trim(), city_name = arr[9].Trim(),
district_name = arr[10].Trim(),
}; };
transitWarehouseList.Add(tw); transitWarehouseList.Add(tw);
} }
@@ -111,5 +175,7 @@ XDYSZC ;深圳仓 ;峰峰 ;15343351331 ;广东省东莞市凤岗镇浸
{ {
} }
} }
}
static List<TransitWarehouseParam> transitWarehouseTList = null;
}
} }
@@ -97,5 +97,26 @@ namespace AllBase.Model.DBModel
/// 下游快递公司编码 /// 下游快递公司编码
/// </summary> /// </summary>
public string downstream_express_code { get; set; } public string downstream_express_code { get; set; }
} /// <summary>
/// 订单初始费用(分)
/// </summary>
public int? postage { get; set; }
public DateTime? pickup_time { get; set; }
/// <summary>
/// 货架号
/// </summary>
public string location_code { get; set; }
/// <summary>
/// 货架写入时间
/// </summary>
public DateTime? location_write_time { get; set; }
/// <summary>
/// 1商品退货包裹2额外退货包裹
/// </summary>
public int? pack_type { get; set; }
/// <summary>
/// 作废状态 1作废成功 2作废失败
/// </summary>
public int? order_void_status { get; set; }
}
} }
@@ -21,16 +21,31 @@ namespace AllBase.Model.DBModel
return this.GetValue(x => x.OutOrderNumStr); return this.GetValue(x => x.OutOrderNumStr);
} }
set { this.SetValue(x => x.OutOrderNumStr, value); } set { this.SetValue(x => x.OutOrderNumStr, value); }
} }
public string OutOrderBuyerStr public string OutOrderBuyerStr
{ {
get { return this.GetValue(x => x.OutOrderBuyerStr); } get { return this.GetValue(x => x.OutOrderBuyerStr); }
set { this.SetValue(x => x.OutOrderBuyerStr, value); } set { this.SetValue(x => x.OutOrderBuyerStr, value); }
} }
public string OutOrderBuyerIdStr
{
get { return this.GetValue(x => x.OutOrderBuyerIdStr); }
set { this.SetValue(x => x.OutOrderBuyerIdStr, value); }
}
public void SetOutOrderBuyerStr() public void SetOutOrderBuyerStr()
{ {
OutOrderBuyerStr = GlobalConfig.PDDBuyerLoginList.FirstOrDefault(b => b.buyer_id == buyer_account)?.buyer_name ?? if (!out_order_no.ParseToString().StartsWith("tb_"))
GlobalConfig.TaobaoBuyerLoginList.FirstOrDefault(b => b.buyer_id == buyer_account)?.buyer_name ?? buyer_account; {
var buyer = GlobalConfig.PDDBuyerLoginList.FirstOrDefault(b => b.buyer_id == buyer_account);
OutOrderBuyerStr = buyer?.buyer_name ?? buyer_account;
OutOrderBuyerIdStr = buyer?.buyer_id ?? buyer_account;
}
else
{
var buyer = GlobalConfig.TaobaoBuyerLoginList.FirstOrDefault(b => b.buyer_id == buyer_account);
OutOrderBuyerStr = buyer?.buyer_name ?? buyer_account;
OutOrderBuyerIdStr = buyer?.buyer_id ?? buyer_account;
}
} }
@@ -143,5 +158,29 @@ namespace AllBase.Model.DBModel
/// 拦截退回操作信息/回调信息 /// 拦截退回操作信息/回调信息
/// </summary> /// </summary>
public string intercept_return_info { get; set; } public string intercept_return_info { get; set; }
/// <summary>
/// 是否手动发货:0自动发货,1手动发货
/// </summary>
public int is_manual_shipment { get; set; }
/// <summary>
/// 手动发货处理状态:0未处理,1成功,2失败
/// </summary>
public int? manual_shipment_status { get; set; }
/// <summary>
/// 货架号
/// </summary>
public string location_code { get; set; }
/// <summary>
/// 货架写入时间
/// </summary>
public DateTime? location_write_time { get; set; }
/// <summary>
/// 虚拟快递单号
/// </summary>
public string virtual_waybill_no { get; set; }
/// <summary>
/// 虚拟快递公司
/// </summary>
public string virtual_express_company { get; set; }
} }
} }
+69 -61
View File
@@ -13,6 +13,7 @@ using System.Text;
using System.Text.RegularExpressions; using System.Text.RegularExpressions;
using System.Threading.Tasks; using System.Threading.Tasks;
using System.Windows; using System.Windows;
using System.Windows.Controls;
using System.Windows.Media; using System.Windows.Media;
using static System.Windows.Forms.VisualStyles.VisualStyleElement; using static System.Windows.Forms.VisualStyles.VisualStyleElement;
using static System.Windows.Forms.VisualStyles.VisualStyleElement.StartPanel; using static System.Windows.Forms.VisualStyles.VisualStyleElement.StartPanel;
@@ -28,7 +29,11 @@ namespace AllBase.Model.DBModel
public ShopLoginInfo Shop public ShopLoginInfo Shop
{ {
get { return this.GetValue(x => x.Shop); } get { return this.GetValue(x => x.Shop); }
set { this.SetValue(x => x.Shop, value); } set { this.SetValue(x => x.Shop, value); if (!(Shop?.ShopAccount).IsNullOrEmpty()) shop_name = Shop?.ShopAccount; }
}
public int Index
{
get { return GlobalConfig.lstFilterOrder.IndexOf(this) + 1; }
} }
public string OrderDiffItemCountStr public string OrderDiffItemCountStr
{ {
@@ -52,36 +57,36 @@ namespace AllBase.Model.DBModel
set { this.SetValue(x => x.OrderBuyTypeColor, value); } set { this.SetValue(x => x.OrderBuyTypeColor, value); }
} }
public ObservableCollection<oms_wei_order_item_info> orderItems { get; set; } = new ObservableCollection<oms_wei_order_item_info>(); public ObservableCollection<oms_wei_order_item_info> OrderItems { get; set; } = new ObservableCollection<oms_wei_order_item_info>();
public oms_wei_order_item_info orderItem public oms_wei_order_item_info OrderItem
{ {
get { return this.GetValue(x => x.orderItem); } get { return this.GetValue(x => x.OrderItem); }
set { this.SetValue(x => x.orderItem, value); } set { this.SetValue(x => x.OrderItem, value); }
} }
public oms_wei_order_item_info orderItem2 public oms_wei_order_item_info OrderItem2
{ {
get { return this.GetValue(x => x.orderItem2); } get { return this.GetValue(x => x.OrderItem2); }
set { this.SetValue(x => x.orderItem2, value); } set { this.SetValue(x => x.OrderItem2, value); }
} }
public oms_wei_order_item_info orderItem3 public oms_wei_order_item_info OrderItem3
{ {
get { return this.GetValue(x => x.orderItem3); } get { return this.GetValue(x => x.OrderItem3); }
set { this.SetValue(x => x.orderItem3, value); } set { this.SetValue(x => x.OrderItem3, value); }
} }
public oms_wei_order_item_info orderItem4 public oms_wei_order_item_info OrderItem4
{ {
get { return this.GetValue(x => x.orderItem4); } get { return this.GetValue(x => x.OrderItem4); }
set { this.SetValue(x => x.orderItem4, value); } set { this.SetValue(x => x.OrderItem4, value); }
} }
public oms_wei_order_item_info orderItem5 public oms_wei_order_item_info OrderItem5
{ {
get { return this.GetValue(x => x.orderItem5); } get { return this.GetValue(x => x.OrderItem5); }
set { this.SetValue(x => x.orderItem5, value); } set { this.SetValue(x => x.OrderItem5, value); }
} }
public ObservableCollection<oms_wei_refund_info> refundItems { get; set; } = new ObservableCollection<oms_wei_refund_info>(); public ObservableCollection<oms_wei_refund_info> RefundItems { get; set; } = new ObservableCollection<oms_wei_refund_info>();
public ConcurrentList<oms_wei_ewaybill_path> latestEWaybills { get; set; } = new ConcurrentList<oms_wei_ewaybill_path>(); public ConcurrentList<oms_wei_ewaybill_path> LatestEWaybills { get; set; } = new ConcurrentList<oms_wei_ewaybill_path>();
/// <summary> /// <summary>
/// 待采购 /// 待采购
@@ -250,14 +255,14 @@ namespace AllBase.Model.DBModel
} }
void SetDeliveryDeadlineStatusStr() void SetDeliveryDeadlineStatusStr()
{ {
if (this.refundItems.Any(r => "商家受理中,待买家退货,待商家收货,平台退款中,待用户确认,待用户处理商家协商,待用户处理商家代发起的售后申请,物流拦截中".Contains(r.RefundStatusStr))) if (this.RefundItems.Any(r => "商家受理中,待买家退货,待商家收货,平台退款中,待用户确认,待用户处理商家协商,待用户处理商家代发起的售后申请,物流拦截中".Contains(r.RefundStatusStr)))
DeliveryDeadlineStatusStr = "退款中"; DeliveryDeadlineStatusStr = "退款中";
else if (this.refundItems.Any(r => r.RefundStatusStr == "退款完成" || r.RefundStatusStr == "退货退款完成")) else if (this.RefundItems.Any(r => r.RefundStatusStr == "退款完成" || r.RefundStatusStr == "退货退款完成"))
DeliveryDeadlineStatusStr = "退款完成"; DeliveryDeadlineStatusStr = "退款完成";
// 用户取消申请 // 用户取消申请
else if ((GlobalConfig.OrderTabHeaderStr.StartsWith("售后完成单") || GlobalConfig.OrderTabHeaderStr.StartsWith("需处理售后单") || GlobalConfig.OrderTabHeaderStr.StartsWith("退货仓自动售后单")) && else if ((GlobalConfig.OrderTabHeaderStr.StartsWith("售后完成单") || GlobalConfig.OrderTabHeaderStr.StartsWith("需处理售后单") || GlobalConfig.OrderTabHeaderStr.StartsWith("退货仓自动售后单")) &&
this.refundItems.Any(r => !r.RefundStatusStr.IsNullOrEmpty())) this.RefundItems.Any(r => !r.RefundStatusStr.IsNullOrEmpty()))
DeliveryDeadlineStatusStr = this.refundItems.FirstOrDefault(r => !r.RefundStatusStr.IsNullOrEmpty()).RefundStatusStr; DeliveryDeadlineStatusStr = this.RefundItems.FirstOrDefault(r => !r.RefundStatusStr.IsNullOrEmpty()).RefundStatusStr;
else if (this.status == 20 || this.status == 21) else if (this.status == 20 || this.status == 21)
{ {
DeliveryDeadlineStatusStr = "剩余"; DeliveryDeadlineStatusStr = "剩余";
@@ -421,10 +426,17 @@ namespace AllBase.Model.DBModel
} }
//public bool is_visible { get; set; } = true; //public bool is_visible { get; set; } = true;
public long id { get; set; } public long id { get; set; }
public long shop_id { get; set; } public long shop_id
public string shop_name { get; set; } {
get { return this.GetValue(x => x.shop_id); }
set { this.SetValue(x => x.shop_id, value); }
}
public string shop_name
{
get { return this.GetValue(x => x.shop_name); }
set { this.SetValue(x => x.shop_name, value); }
}
/// <summary> /// <summary>
/// 商户ID /// 商户ID
/// </summary> /// </summary>
@@ -743,17 +755,17 @@ namespace AllBase.Model.DBModel
{ {
Shop = GlobalConfig.ShopLoginList.FirstOrDefault(s => s.ErpShopId == shop_id.ParseToString()); Shop = GlobalConfig.ShopLoginList.FirstOrDefault(s => s.ErpShopId == shop_id.ParseToString());
if (this.orderItems.Any(oi => oi.OrderItemExt?.buy_type == "直发") && this.orderItems.Any(oi => oi.ItemTransitOrderWithVoid != null)) if (this.OrderItems.Any(oi => oi.OrderItemExt?.buy_type == "直发") && this.OrderItems.Any(oi => oi.ItemTransitOrderWithVoid != null))
{ {
OrderBuyType = "云改直"; OrderBuyType = "云改直";
OrderBuyTypeColor = GlobalConfig.PurpleBrush190; OrderBuyTypeColor = GlobalConfig.PurpleBrush190;
} }
else if (this.orderItems.Any(oi => oi.OrderItemExt?.buy_type == "直发")) else if (this.OrderItems.Any(oi => oi.OrderItemExt?.buy_type == "直发"))
{ {
OrderBuyType = "直发"; OrderBuyType = "直发";
OrderBuyTypeColor = GlobalConfig.RedTextBrush205; OrderBuyTypeColor = GlobalConfig.RedTextBrush205;
} }
else if (this.orderItems.Any(oi => oi.ItemTransitOrderWithVoid != null)) else if (this.OrderItems.Any(oi => oi.ItemTransitOrderWithVoid != null))
{ {
OrderBuyType = "云仓"; OrderBuyType = "云仓";
OrderBuyTypeColor = GlobalConfig.GreenTextBrush; OrderBuyTypeColor = GlobalConfig.GreenTextBrush;
@@ -761,11 +773,11 @@ namespace AllBase.Model.DBModel
else else
OrderBuyType = ""; OrderBuyType = "";
if (this.orderItems.Any(oi => oi.ItemRefund?.type == "REFUND")) if (this.OrderItems.Any(oi => oi.ItemRefund?.type == "REFUND"))
this.RefundTypeStr = "仅退款"; this.RefundTypeStr = "仅退款";
else if (this.orderItems.Any(oi => oi.ItemRefund?.type == "RETURN")) else if (this.OrderItems.Any(oi => oi.ItemRefund?.type == "RETURN"))
this.RefundTypeStr = "退货退款"; this.RefundTypeStr = "退货退款";
else if (this.orderItems.Any(oi => oi.ItemRefund?.type == "REFUND") && this.orderItems.Any(oi => oi.ItemRefund?.type == "RETURN")) else if (this.OrderItems.Any(oi => oi.ItemRefund?.type == "REFUND") && this.OrderItems.Any(oi => oi.ItemRefund?.type == "RETURN"))
this.RefundTypeStr = "仅退款/退货退款"; this.RefundTypeStr = "仅退款/退货退款";
IsWaitBuy = GetIsWaitBuy(); IsWaitBuy = GetIsWaitBuy();
@@ -783,7 +795,7 @@ namespace AllBase.Model.DBModel
else else
IsShowChangeWaybillBtn = true; IsShowChangeWaybillBtn = true;
if (IsWaitBuy || this.orderItems.All(oi => oi.ItemTransitOrderWithVoid == null)) if (IsWaitBuy || this.OrderItems.All(oi => oi.ItemTransitOrderWithVoid == null))
IsShowTransitExtraPackagesBtn = false; IsShowTransitExtraPackagesBtn = false;
else else
IsShowTransitExtraPackagesBtn = true; IsShowTransitExtraPackagesBtn = true;
@@ -795,12 +807,12 @@ namespace AllBase.Model.DBModel
SetShipDoneTimeStr(); SetShipDoneTimeStr();
SetColorBrush(); SetColorBrush();
orderItem = orderItems.FirstOrDefault() != null ? orderItems.FirstOrDefault() : new oms_wei_order_item_info() { OrderItemVisibility = Visibility.Collapsed }; OrderItem = OrderItems.FirstOrDefault() != null ? OrderItems.FirstOrDefault() : new oms_wei_order_item_info() { OrderItemVisibility = Visibility.Collapsed };
orderItem2 = orderItems.Count > 1 ? orderItems[1] : new oms_wei_order_item_info() { OrderItemVisibility = Visibility.Collapsed }; OrderItem2 = OrderItems.Count > 1 ? OrderItems[1] : new oms_wei_order_item_info() { OrderItemVisibility = Visibility.Collapsed };
orderItem3 = orderItems.Count > 2 ? orderItems[2] : new oms_wei_order_item_info() { OrderItemVisibility = Visibility.Collapsed }; OrderItem3 = OrderItems.Count > 2 ? OrderItems[2] : new oms_wei_order_item_info() { OrderItemVisibility = Visibility.Collapsed };
orderItem4 = orderItems.Count > 3 ? orderItems[3] : new oms_wei_order_item_info() { OrderItemVisibility = Visibility.Collapsed }; OrderItem4 = OrderItems.Count > 3 ? OrderItems[3] : new oms_wei_order_item_info() { OrderItemVisibility = Visibility.Collapsed };
orderItem5 = orderItems.Count > 4 ? orderItems[4] : new oms_wei_order_item_info() { OrderItemVisibility = Visibility.Collapsed }; OrderItem5 = OrderItems.Count > 4 ? OrderItems[4] : new oms_wei_order_item_info() { OrderItemVisibility = Visibility.Collapsed };
OrderDiffItemCountStr = orderItems.Count > 1 ? "该订单共有 " + orderItems.Count + " 个不同的商品规格" : ""; OrderDiffItemCountStr = OrderItems.Count > 1 ? "该订单共有 " + OrderItems.Count + " 个不同的商品规格" : "";
} }
public void SetColorBrush() public void SetColorBrush()
@@ -821,19 +833,15 @@ namespace AllBase.Model.DBModel
public bool GetIsWaitBuy() public bool GetIsWaitBuy()
{ {
if (order_id == "3738686976228742912")
{
}
if (status != 20 && status != 21) if (status != 20 && status != 21)
return false; return false;
if (refundItems?.Any(r => r.IsRefund) == true) if (RefundItems?.Any(r => r.IsRefund) == true)
return false; return false;
// 子表有售后信息(可能更新不及时) // 子表有售后信息(可能更新不及时)
if (orderItems?.Any(oi => oi.refund_status > 1) == true) if (OrderItems?.Any(oi => oi.refund_status > 1) == true)
return false; return false;
// 中转仓有拍单信息 // 中转仓有拍单信息
if (orderItems.All(oi => oi.ItemTransitOrder != null)) if (OrderItems.All(oi => oi.ItemTransitOrder != null))
return false; return false;
// 采购状态为已采购 // 采购状态为已采购
if (purchase_status != 0) if (purchase_status != 0)
@@ -857,16 +865,16 @@ namespace AllBase.Model.DBModel
if (status != 20 && status != 21) if (status != 20 && status != 21)
return false; return false;
if (refundItems?.Any(r => r.IsRefund) == true) if (RefundItems?.Any(r => r.IsRefund) == true)
return false; return false;
if (orderItems?.Any(oi => oi.refund_status > 1) == true) if (OrderItems?.Any(oi => oi.refund_status > 1) == true)
return false; return false;
// 礼物单已发货 // 礼物单已发货
if (gift_order_status == 1 || gift_order_status == 2) if (gift_order_status == 1 || gift_order_status == 2)
return false; return false;
// 店铺未发货,外采已采购 // 店铺未发货,外采已采购
// out_after_sale_status 新拍订单也不会变,内存里直接根据退款单修改掉 // out_after_sale_status 新拍订单也不会变,内存里直接根据退款单修改掉
if (!orderItems.All(oi => oi.ItemTransitOrder != null) && purchase_status != 1 && if (!OrderItems.All(oi => oi.ItemTransitOrder != null) && purchase_status != 1 &&
(string.IsNullOrEmpty(out_order_no) || out_after_sale_status == "退款成功")) (string.IsNullOrEmpty(out_order_no) || out_after_sale_status == "退款成功"))
return false; return false;
return true; return true;
@@ -874,9 +882,9 @@ namespace AllBase.Model.DBModel
private bool GetIsWaitReceive() private bool GetIsWaitReceive()
{ {
if (refundItems?.Any(r => r.IsRefund) == true) if (RefundItems?.Any(r => r.IsRefund) == true)
return false; return false;
if (orderItems?.Any(oi => oi.refund_status > 1) == true) if (OrderItems?.Any(oi => oi.refund_status > 1) == true)
return false; return false;
if (!(status == 30 || status == 100 || gift_order_status == 1 || gift_order_status == 2)) if (!(status == 30 || status == 100 || gift_order_status == 1 || gift_order_status == 2))
return false; return false;
@@ -895,23 +903,23 @@ namespace AllBase.Model.DBModel
return false; return false;
// 如果有售后,直接作为售后单处理 // 如果有售后,直接作为售后单处理
if (orderItems.All(oi => oi.refund_status > 1)) if (OrderItems.All(oi => oi.refund_status > 1))
return false; return false;
// 直发或者云改直已购买且未退货,从异常单移除 // 直发或者云改直已购买且未退货,从异常单移除
if (orderItems.All(oi => oi.DirectPddBuyerOrder != null && oi.DirectPddBuyerAfterSale == null) /*&& (out_shipped != 2 || string.IsNullOrEmpty(this.out_express_no))*/) if (OrderItems.All(oi => oi.DirectPddBuyerOrder != null && oi.DirectPddBuyerAfterSale == null) /*&& (out_shipped != 2 || string.IsNullOrEmpty(this.out_express_no))*/)
return false; return false;
if (gift_order_status == 1 || gift_order_status == 2) if (gift_order_status == 1 || gift_order_status == 2)
return false; return false;
if (orderItems.Any(oi => !(oi.OrderItemExt?.abnormal_text).IsNullOrEmpty())) if (OrderItems.Any(oi => !(oi.OrderItemExt?.abnormal_text).IsNullOrEmpty()))
return true; return true;
// 订单无售后或者售后关闭,有未作废的仓库单且仓库单买手信息为退款成功 // 订单无售后或者售后关闭,有未作废的仓库单且仓库单买手信息为退款成功
if (orderItems.Any(oi => oi.refund_status <= 1 && oi.ItemTransitOrder != null && oi.ItemTransitOrder.refund_status == "买手退款成功")) if (OrderItems.Any(oi => oi.refund_status <= 1 && oi.ItemTransitOrderWithVoid != null && oi.ItemTransitOrderWithVoid.refund_status == "买手退款成功"))
return true; return true;
// 取号异常或无法调用发货也放在异常单(异常需重拍) // 取号异常或无法调用发货也放在异常单(异常需重拍)
// 订单不满足鸿浩仓库发货条件,无法调用鸿浩仓库接口发货 // 订单不满足鸿浩仓库发货条件,无法调用鸿浩仓库接口发货
else if (orderItems.Any(oi => ((oi.ItemTransitOrderWithVoid?.raw_message).ParseToString().Contains("取号异常") || else if (OrderItems.Any(oi => ((oi.ItemTransitOrderWithVoid?.raw_message).ParseToString().Contains("取号异常") ||
(oi.ItemTransitOrderWithVoid?.raw_message).ParseToString().Contains("无法调用")) && (oi.ItemTransitOrderWithVoid?.raw_message).ParseToString().Contains("无法调用")) &&
oi.ItemTransitOrderWithVoid?.transfer_warehouse_status != 1)) oi.ItemTransitOrderWithVoid?.transfer_warehouse_status != 1))
return true; return true;
@@ -921,7 +929,7 @@ namespace AllBase.Model.DBModel
public bool GetIsRefund() public bool GetIsRefund()
{ {
// return refundItems?.Count > 0 && refundItems.Any(r => r.status != "USER_CANCELD"); // return refundItems?.Count > 0 && refundItems.Any(r => r.status != "USER_CANCELD");
if (!orderItems.Any(oi => oi.refund_status > 1)) if (!OrderItems.Any(oi => oi.refund_status > 1))
return false; return false;
if (GetIsEmergency()) if (GetIsEmergency())
return false; return false;
@@ -931,16 +939,16 @@ namespace AllBase.Model.DBModel
public bool GetIsEmergency() public bool GetIsEmergency()
{ {
// 微信订单退货中 // 微信订单退货中
if (orderItems.Any(oi => oi.refund_status == 2 || oi.refund_status == 3)) if (OrderItems.Any(oi => oi.refund_status == 2 || oi.refund_status == 3))
{ {
return true; return true;
} }
// 微信订单退款中或退款成功,但是买手订单未完成退款 // 微信订单退款中或退款成功,但是买手订单未完成退款
if (orderItems.Any(oi => oi.refund_status > 1 && oi.ItemTransitOrders.Count > 0 && oi.ItemTransitOrders.Any(t => !t.refund_status.Contains("退款成功")))) if (OrderItems.Any(oi => oi.refund_status > 1 && oi.ItemTransitOrders.Count > 0 && oi.ItemTransitOrders.Any(t => !t.refund_status.Contains("退款成功"))))
{ {
return true; return true;
} }
if (orderItems.Any(oi => oi.refund_status > 1) && !out_order_no.IsNullOrEmpty() && this.out_after_sale_status != "退款成功") if (OrderItems.Any(oi => oi.refund_status > 1) && !out_order_no.IsNullOrEmpty() && this.out_after_sale_status != "退款成功")
{ {
return true; return true;
} }
@@ -951,7 +959,7 @@ namespace AllBase.Model.DBModel
{ {
//return this.orderItems.All(oi => !string.IsNullOrEmpty(oi.ItemRefund?.return_waybill_id)) && this.orderItems.All(oi => oi.ItemRefund?.return_detail == GlobalConfig.TransitReturnOrderReturnAddress); //return this.orderItems.All(oi => !string.IsNullOrEmpty(oi.ItemRefund?.return_waybill_id)) && this.orderItems.All(oi => oi.ItemRefund?.return_detail == GlobalConfig.TransitReturnOrderReturnAddress);
//return this.orderItems.All(oi => oi.ItemRefund?.return_detail == GlobalConfig.TransitReturnOrderReturnAddress); //return this.orderItems.All(oi => oi.ItemRefund?.return_detail == GlobalConfig.TransitReturnOrderReturnAddress);
return this.orderItems.All(oi => oi.ItemRefund?.return_detail?.ToUpper().Contains(GlobalConfig.TransitReturnOrderReturnAddressLite) == true); return this.OrderItems.All(oi => oi.ItemRefund?.return_detail?.ToUpper().Contains(GlobalConfig.TransitReturnOrderReturnAddressLite) == true);
} }
} }
} }
+419 -277
View File
@@ -1,11 +1,13 @@
using AllBase.Helper; using AllBase.Helper;
using AllBase.Model.MvvmBaseClasses; using AllBase.Model.MvvmBaseClasses;
using NaiBa.Util;
using NaiBa.Util.Extension; using NaiBa.Util.Extension;
using Newtonsoft.Json.Linq; using Newtonsoft.Json.Linq;
using NPOI.SS.Formula.Functions; using NPOI.SS.Formula.Functions;
using Org.BouncyCastle.Asn1.Mozilla; using Org.BouncyCastle.Asn1.Mozilla;
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Collections.ObjectModel;
using System.Linq; using System.Linq;
using System.Runtime.CompilerServices; using System.Runtime.CompilerServices;
using System.Text; using System.Text;
@@ -20,14 +22,127 @@ namespace AllBase.Model.DBModel
{ {
public class oms_wei_order_item_info : PropertyNotifyObject public class oms_wei_order_item_info : PropertyNotifyObject
{ {
/// <summary> public List<oms_wei_order_item_transit_detail_info> TransitPackageList
/// 订单对应店铺 {
/// </summary> get { return this.GetValue(x => x.TransitPackageList); }
public ShopLoginInfo Shop set
{ {
get { return this.GetValue(x => x.Shop); } this.SetValue(x => x.TransitPackageList, value);
set { this.SetValue(x => x.Shop, value); } TransitPackageLatest = TransitPackageList.OrderByDescending(p => p.CreateTime).FirstOrDefault(p => p.TransitVoidStatus != "已作废") ??
TransitPackageList.OrderByDescending(p => p.CreateTime).FirstOrDefault() ??
new oms_wei_order_item_transit_detail_info();
}
} }
public oms_wei_order_item_transit_detail_info TransitPackageLatest
{
get { return this.GetValue(x => x.TransitPackageLatest); }
set
{
this.SetValue(x => x.TransitPackageLatest, value);
TransitPackageLatestWarehouseStatusStr = value?.TransitTypeStr + value?.WarehouseStatus;
TransitPackageLatestVoidStatusStr = value?.TransitVoidStatus == "已作废" ? value?.TransitTypeStr + "已作废" : "";
if (order_id == "3740305724012410112")
{
}
if (value != null && value?.TransitTypeStr != "发货包裹")
VoidPackageTypeStr = "作废" + value?.TransitTypeStr;
else
{
VoidPackageTypeStr = "";
if (value != null) value.VoidPackageBtnVisibility = Visibility.Collapsed;
}
//if (value?.oms_wei_external_procurement_log_info is oms_wei_external_procurement_log_info transitInfo)
//{
// if (this.refund_status == 1 && transitInfo.refund_status.ParseToString().Contains("退款成功") && !TransitPackageLatest.WarehouseStatus.ParseToString().Contains("取号异常(超区)"))
// {
// CanUseTraditionalAddress = true;
// }
// else
// {
// CanUseTraditionalAddress = false;
// }
//}
}
}
public string TransitPackageLatestWarehouseStatusStr
{
get { return this.GetValue(x => x.TransitPackageLatestWarehouseStatusStr); }
set
{
this.SetValue(x => x.TransitPackageLatestWarehouseStatusStr, value);
var str = value ?? "";
TransitPackageLatestWarehouseStatusStrVisibility = str.Length > 0 ? Visibility.Visible : Visibility.Collapsed;
// 状态文字颜色
if (str.Contains("已出库"))
WarehouseWaybillStatusStrColor = GlobalConfig.GreenBrush;
else if (str.Contains("已入库") || str.Contains("拦截到仓") || str.Contains("未入库"))
WarehouseWaybillStatusStrColor = GlobalConfig.YellowBrush;
else // if (str.Contains("待取号"))
WarehouseWaybillStatusStrColor = GlobalConfig.RedBrush;
// 状态边框颜色
if (str.Contains("已出库"))
WarehouseWaybillStatusBorderColor = GlobalConfig.GreenBrush75;
else if (str.Contains("已入库") || str.Contains("拦截到仓") || str.Contains("未入库"))
WarehouseWaybillStatusBorderColor = GlobalConfig.YellowBrush75;
else // if (str.Contains("待取号"))
WarehouseWaybillStatusBorderColor = GlobalConfig.RedBrush75;
// 状态背景颜色
if (str.Contains("已出库"))
WarehouseWaybillStatusBackColor = GlobalConfig.GreenBrush35;
else if (str.Contains("已入库") || str.Contains("拦截到仓") || str.Contains("未入库"))
WarehouseWaybillStatusBackColor = GlobalConfig.YellowBrush35;
else // if (str.Contains("待取号"))
WarehouseWaybillStatusBackColor = GlobalConfig.RedBrush35;
}
}
public Visibility TransitPackageLatestWarehouseStatusStrVisibility
{
get { return this.GetValue(x => x.TransitPackageLatestWarehouseStatusStrVisibility); }
set { this.SetValue(x => x.TransitPackageLatestWarehouseStatusStrVisibility, value); }
}
public string TransitPackageLatestVoidStatusStr
{
get { return this.GetValue(x => x.TransitPackageLatestVoidStatusStr); }
set { this.SetValue(x => x.TransitPackageLatestVoidStatusStr, value); TransitPackageLatestVoidStatusStrVisibility = string.IsNullOrEmpty(value) ? Visibility.Collapsed : Visibility.Visible; }
}
public Visibility TransitPackageLatestVoidStatusStrVisibility
{
get { return this.GetValue(x => x.TransitPackageLatestVoidStatusStrVisibility); }
set { this.SetValue(x => x.TransitPackageLatestVoidStatusStrVisibility, value); }
}
public string VoidPackageTypeStr
{
get { return this.GetValue(x => x.VoidPackageTypeStr); }
set { this.SetValue(x => x.VoidPackageTypeStr, value); }
}
/// <summary>
/// 拍单时是否可以使用繁体字地址
/// </summary>
//public bool CanUseTraditionalAddress
//{
// get { return this.GetValue(x => x.CanUseTraditionalAddress); }
// set { this.SetValue(x => x.CanUseTraditionalAddress, value); }
//}
///// <summary>
///// 订单对应店铺
///// </summary>
//public ShopLoginInfo Shop
//{
// get { return this.GetValue(x => x.Shop); }
// set { this.SetValue(x => x.Shop, value); }
//}
/// <summary> /// <summary>
/// 订单扩展信息 /// 订单扩展信息
@@ -38,7 +153,6 @@ namespace AllBase.Model.DBModel
set { this.SetValue(x => x.OrderItemVisibility, value); } set { this.SetValue(x => x.OrderItemVisibility, value); }
} }
#region 订单采购参数 #region 订单采购参数
/// <summary> /// <summary>
/// 采购关联 /// 采购关联
@@ -192,10 +306,10 @@ namespace AllBase.Model.DBModel
{ {
} }
if (ItemOrder?.refundItems?.Count == 1) if (ItemOrder?.RefundItems?.Count == 1)
ItemRefund = ItemOrder?.refundItems?.FirstOrDefault(); ItemRefund = ItemOrder?.RefundItems?.FirstOrDefault();
else else
ItemRefund = ItemOrder?.refundItems?.FirstOrDefault(r => r.sku_id == this.sku_id); ItemRefund = ItemOrder?.RefundItems?.FirstOrDefault(r => r.sku_id == this.sku_id);
if (ItemRefund?.status != "MERCHANT_REFUND_SUCCESS" && ItemRefund?.status != "MERCHANT_RETURN_SUCCESS") if (ItemRefund?.status != "MERCHANT_REFUND_SUCCESS" && ItemRefund?.status != "MERCHANT_RETURN_SUCCESS")
this.RefundResultStr = ""; this.RefundResultStr = "";
@@ -268,7 +382,7 @@ namespace AllBase.Model.DBModel
/// </summary> /// </summary>
public List<oms_wei_external_procurement_log_info> ItemTransitOrders { get; set; } = new List<oms_wei_external_procurement_log_info>(); public List<oms_wei_external_procurement_log_info> ItemTransitOrders { get; set; } = new List<oms_wei_external_procurement_log_info>();
/// <summary> /// <summary>
/// 当前仓库订单(不可以是作废单) /// 当前最新的一条仓库订单(不可以是作废单)
/// </summary> /// </summary>
public oms_wei_external_procurement_log_info ItemTransitOrder public oms_wei_external_procurement_log_info ItemTransitOrder
{ {
@@ -276,7 +390,7 @@ namespace AllBase.Model.DBModel
set { this.SetValue(x => x.ItemTransitOrder, value); } set { this.SetValue(x => x.ItemTransitOrder, value); }
} }
/// <summary> /// <summary>
/// 当前仓库订单(可以是作废单) /// 当前最新的一条仓库订单(可以是作废单)
/// </summary> /// </summary>
public oms_wei_external_procurement_log_info ItemTransitOrderWithVoid public oms_wei_external_procurement_log_info ItemTransitOrderWithVoid
{ {
@@ -398,7 +512,9 @@ namespace AllBase.Model.DBModel
this.ItemTransitExtraOrder = ItemTransitExtraOrders?.FirstOrDefault(t => t.order_void_status != 1) ?? ItemTransitExtraOrders.FirstOrDefault(); this.ItemTransitExtraOrder = ItemTransitExtraOrders?.FirstOrDefault(t => t.order_void_status != 1) ?? ItemTransitExtraOrders.FirstOrDefault();
this.ItemTransitOrderAfterSale = ItemTransitOrderAfterSales?.FirstOrDefault(); // 未作废且已发出的商品退货包裹 ?? 未作废的商品退货包裹 ?? 任意商品退货包裹
this.ItemTransitOrderAfterSale = ItemTransitOrderAfterSales?.Where(taf => taf.pack_type == 1)?.FirstOrDefault(taf => taf.order_void_status != 1 && !taf.downstream_waybill.IsNullOrEmpty()) ??
ItemTransitOrderAfterSales?.Where(taf => taf.pack_type == 1)?.FirstOrDefault(taf => taf.order_void_status != 1) ?? ItemTransitOrderAfterSales?.Where(taf => taf.pack_type == 1)?.FirstOrDefault();
this.PddBuyerOrder = PddBuyerOrders?.FirstOrDefault(); this.PddBuyerOrder = PddBuyerOrders?.FirstOrDefault();
// 优先找非撤销买手退款单 // 优先找非撤销买手退款单
this.PddBuyerAfterSale = PddBuyerAfterSales?.FirstOrDefault(p => p.orderSn == this.ItemTransitOrderWithVoid?.out_order_no && p.statusText == "退款成功") ?? this.PddBuyerAfterSale = PddBuyerAfterSales?.FirstOrDefault(p => p.orderSn == this.ItemTransitOrderWithVoid?.out_order_no && p.statusText == "退款成功") ??
@@ -472,13 +588,15 @@ namespace AllBase.Model.DBModel
// 仓库物流售后拦截包裹按钮上的文字,仓库作废单不存在仓库物流,所以此处必须是有效的仓库单(含作废失败) // 仓库物流售后拦截包裹按钮上的文字,仓库作废单不存在仓库物流,所以此处必须是有效的仓库单(含作废失败)
AddEditTransitWarehouseAfterSaleStr = "添加"; AddEditTransitWarehouseAfterSaleStr = "添加";
if (order_id == "3739241588056569856") if (order_id == "3740217344404934656")
{ {
} }
if (this.ItemTransitOrderAfterSale != null) if (this.ItemTransitOrderAfterSale != null)
AddEditTransitWarehouseAfterSaleStr = "已添加"; AddEditTransitWarehouseAfterSaleStr = "已添加";
if (this.ItemTransitOrderAfterSale != null && (ItemTransitOrderWithVoid.intercept_return_status == 1 || !string.IsNullOrEmpty(ItemTransitOrderAfterSale.downstream_waybill))) if (this.ItemTransitOrderAfterSale != null && this.ItemTransitOrderAfterSale.order_void_status == 1)
AddEditTransitWarehouseAfterSaleStr = "拦截作废";
else if (this.ItemTransitOrderAfterSale != null && (ItemTransitOrderWithVoid.intercept_return_status == 1 || !string.IsNullOrEmpty(ItemTransitOrderAfterSale.downstream_waybill)))
AddEditTransitWarehouseAfterSaleStr = "拦截成功"; AddEditTransitWarehouseAfterSaleStr = "拦截成功";
else if (this.ItemTransitOrderAfterSale != null && ItemTransitOrderWithVoid.intercept_return_status == 2) else if (this.ItemTransitOrderAfterSale != null && ItemTransitOrderWithVoid.intercept_return_status == 2)
AddEditTransitWarehouseAfterSaleStr = "拦截失败"; AddEditTransitWarehouseAfterSaleStr = "拦截失败";
@@ -511,6 +629,10 @@ namespace AllBase.Model.DBModel
InterceptReturnInfoStr = this.ItemTransitOrderWithVoid.intercept_return_info; InterceptReturnInfoStr = this.ItemTransitOrderWithVoid.intercept_return_info;
// 退货仓退货 // 退货仓退货
if (order_id == "3739991023710553600")
{
}
AddEditTransitWarehouseReturnOrderStr = ""; AddEditTransitWarehouseReturnOrderStr = "";
if (ItemRefund?.return_detail?.ToUpper().Contains(GlobalConfig.TransitReturnOrderReturnAddressLite) == true) if (ItemRefund?.return_detail?.ToUpper().Contains(GlobalConfig.TransitReturnOrderReturnAddressLite) == true)
{ {
@@ -526,11 +648,12 @@ namespace AllBase.Model.DBModel
AddEditTransitWarehouseReturnOrderStr = "创建失败"; AddEditTransitWarehouseReturnOrderStr = "创建失败";
if (DistribReturnOrderInfo?.warehouse_status == 3) if (DistribReturnOrderInfo?.warehouse_status == 3)
AddEditTransitWarehouseReturnOrderStr = "已创建未到仓"; AddEditTransitWarehouseReturnOrderStr = "已创建未到仓";
if (TransitRefundStatusStr.Contains("退款成功")) // 因为可能是云改直的最后退款或者买手退款了但是东西还没退回总店,所以此处不能不赋值(不赋值就会隐藏按钮无法创建分销退货)
{ //if (TransitRefundStatusStr.Contains("退款成功"))
if (AddEditTransitWarehouseReturnOrderStr == "未创建") //{
AddEditTransitWarehouseReturnOrderStr = ""; // if (AddEditTransitWarehouseReturnOrderStr == "未创建")
} // AddEditTransitWarehouseReturnOrderStr = "";
//}
} }
} }
/// <summary> /// <summary>
@@ -880,29 +1003,7 @@ namespace AllBase.Model.DBModel
} }
public void SetTransitRefundStatusStr() public void SetTransitRefundStatusStr()
{ {
if (!string.IsNullOrEmpty(ItemTransitOrderWithVoid?.refund_status)) TransitRefundStatusStr = oms_wei_order_item_transit_model.GetTransitBuyerRefundStatusStr(this, ItemTransitOrder ?? ItemTransitOrderWithVoid);
{
// 店铺售后又取消的,如果是买手还没申请售后,不显示需手动申请售后文字
if (ItemTransitOrderWithVoid.refund_status.Contains("需手动申请售后") && this.refund_status <= 1)
TransitRefundStatusStr = "";
// 显示售后金额(如果有)
else if (ItemTransitOrderWithVoid.refund_status.EndsWith("买手退款成功"))
{
if (PddBuyerAfterSale?.refundAmount != null)
TransitRefundStatusStr = ItemTransitOrderWithVoid.refund_status + "(¥" + PddBuyerAfterSale.refundAmount * 0.01m + ")";
else
TransitRefundStatusStr = ItemTransitOrderWithVoid.refund_status + "(退款金额待获取)";
}
else if (!ItemTransitOrderWithVoid.refund_status.Contains("需手动申请售后") && !ItemTransitOrderWithVoid.refund_status.Contains("已超过可申请售后的时间"))
TransitRefundStatusStr = "已申请售后 " + ItemTransitOrderWithVoid.refund_status.Replace("申请收到,", "");
else
TransitRefundStatusStr = ItemTransitOrderWithVoid.refund_status;
}
else
TransitRefundStatusStr = "";
if (TransitRefundStatusStr.Contains("退款成功")) if (TransitRefundStatusStr.Contains("退款成功"))
TransitRefundStatusBackColor = GlobalConfig.GreenBrush; TransitRefundStatusBackColor = GlobalConfig.GreenBrush;
@@ -1175,7 +1276,7 @@ namespace AllBase.Model.DBModel
} }
if (!this.ItemOrder.out_after_sale_status.ParseToString().Contains("需手动申请售后")) if (!this.ItemOrder.out_after_sale_status.ParseToString().Contains("需手动申请售后"))
this.ItemOrder.out_after_sale_status = DirectPddBuyerAfterSale?.statusText; this.ItemOrder.out_after_sale_status = DirectPddBuyerAfterSale?.statusText ?? ItemOrder.out_after_sale_status;
DirectRefundStatusStr = this.ItemOrder.out_after_sale_status.ParseToString(); DirectRefundStatusStr = this.ItemOrder.out_after_sale_status.ParseToString();
if (DirectRefundStatusStr.Contains("退款成功")) if (DirectRefundStatusStr.Contains("退款成功"))
@@ -1194,6 +1295,17 @@ namespace AllBase.Model.DBModel
DirectOrderBuyTimeStr = DirectPddBuyerOrder != null ? DirectPddBuyerOrder.add_time.ToString("yyyy-MM-dd HH:mm:ss") : ""; DirectOrderBuyTimeStr = DirectPddBuyerOrder != null ? DirectPddBuyerOrder.add_time.ToString("yyyy-MM-dd HH:mm:ss") : "";
} }
public string ThumbImgStr
{
get { return this.GetValue(x => x.ThumbImgStr); }
set { this.SetValue(x => x.ThumbImgStr, value); }
}
public bool IsLoadThumbImg
{
get { return this.GetValue(x => x.IsLoadThumbImg); }
set { this.SetValue(x => x.IsLoadThumbImg, value); }
}
/// <summary> 直发最后一条物流信息 </summary> /// <summary> 直发最后一条物流信息 </summary>
public oms_wei_ewaybill_path LatestDirectEWaybill public oms_wei_ewaybill_path LatestDirectEWaybill
{ {
@@ -1216,7 +1328,7 @@ namespace AllBase.Model.DBModel
//get { return "¥" + (order_items.Sum(oi => oi.cash_coupon_discounted_price.ParseToInt()) * 0.01m).ParseToDecimal().ToString("0.00"); } //get { return "¥" + (order_items.Sum(oi => oi.cash_coupon_discounted_price.ParseToInt()) * 0.01m).ParseToDecimal().ToString("0.00"); }
CashCouponDiscountedPriceStr = "¥" + (cash_coupon_discounted_price.ParseToInt() * 0.01m).ParseToDecimal().ToString("0.00"); CashCouponDiscountedPriceStr = "¥" + (cash_coupon_discounted_price.ParseToInt() * 0.01m).ParseToDecimal().ToString("0.00");
PostagePriceStr = "¥" + (ItemOrder?.postage_price * 0.01m / ItemOrder?.orderItems.Count).ParseToDecimal().ToString("0.00"); PostagePriceStr = "¥" + (ItemOrder?.postage_price * 0.01m / ItemOrder?.OrderItems.Count).ParseToDecimal().ToString("0.00");
//get { return "¥" + (order_items.Sum(oi => oi.purchase_price.ParseToInt()) * 0.01m).ParseToDecimal().ToString("0.00"); } //get { return "¥" + (order_items.Sum(oi => oi.purchase_price.ParseToInt()) * 0.01m).ParseToDecimal().ToString("0.00"); }
PurchasePriceStr = "¥" + (purchase_price * 0.01m).ParseToDecimal().ToString("0.00"); PurchasePriceStr = "¥" + (purchase_price * 0.01m).ParseToDecimal().ToString("0.00");
@@ -1230,6 +1342,10 @@ namespace AllBase.Model.DBModel
//get { if (ItemOrder.out_amount > 0 || ItemTransitOrder?.out_amount > 0) return Visibility.Collapsed; return Visibility.Visible; } //get { if (ItemOrder.out_amount > 0 || ItemTransitOrder?.out_amount > 0) return Visibility.Collapsed; return Visibility.Visible; }
FreightVisibility = Visibility.Collapsed; FreightVisibility = Visibility.Collapsed;
if (order_id == "3740014218899272960")
{
}
//get { return "¥" + (order_items.Sum(oi => oi.predict_commission_fee.ParseToInt()) * 0.01m).ParseToDecimal().ToString("0.00"); } //get { return "¥" + (order_items.Sum(oi => oi.predict_commission_fee.ParseToInt()) * 0.01m).ParseToDecimal().ToString("0.00"); }
PredictCommissionFeeStr = "¥" + (predict_commission_fee * 0.01m).ParseToDecimal().ToString("0.00"); PredictCommissionFeeStr = "¥" + (predict_commission_fee * 0.01m).ParseToDecimal().ToString("0.00");
@@ -1245,8 +1361,8 @@ namespace AllBase.Model.DBModel
OutAmountStr = "¥" + ((ItemOrder?.out_amount).ParseToInt() * 0.01m).ParseToDecimal().ToString("0.00"); OutAmountStr = "¥" + ((ItemOrder?.out_amount).ParseToInt() * 0.01m).ParseToDecimal().ToString("0.00");
//ItemOrder.out_amount ItemTransitOrder.out_amount 只有一个有值 //ItemOrder.out_amount ItemTransitOrder.out_amount 只有一个有值
var out_amount = ItemTransitOrder?.out_amount ?? ItemOrder.out_amount / ItemOrder.orderItems.Count; var out_amount = ItemTransitOrder?.out_amount ?? ItemOrder.out_amount / ItemOrder.OrderItems.Count;
var postage_price = ItemOrder?.postage_price ?? ItemOrder.postage_price / ItemOrder.orderItems.Count; var postage_price = ItemOrder?.postage_price ?? ItemOrder.postage_price / ItemOrder.OrderItems.Count;
ProfitCount = ((real_price.ParseToInt() + cash_coupon_discounted_price.ParseToInt() + postage_price - purchase_price.ParseToInt() - freight.ParseToInt() - ProfitCount = ((real_price.ParseToInt() + cash_coupon_discounted_price.ParseToInt() + postage_price - purchase_price.ParseToInt() - freight.ParseToInt() -
predict_commission_fee.ParseToInt() - commission_amount.ParseToInt() - out_amount.ParseToInt()) * 0.01m).ParseToDecimal(); predict_commission_fee.ParseToInt() - commission_amount.ParseToInt() - out_amount.ParseToInt()) * 0.01m).ParseToDecimal();
@@ -1335,8 +1451,8 @@ namespace AllBase.Model.DBModel
/// </summary> /// </summary>
public string CommissionAmountStr public string CommissionAmountStr
{ {
get { return this.GetValue(x => x.PredictCommissionFeeStr); } get { return this.GetValue(x => x.CommissionAmountStr); }
set { this.SetValue(x => x.PredictCommissionFeeStr, value); } set { this.SetValue(x => x.CommissionAmountStr, value); }
} }
/// <summary> /// <summary>
@@ -1413,64 +1529,84 @@ namespace AllBase.Model.DBModel
catch { SkuAttrStr = "获取失败"; } catch { SkuAttrStr = "获取失败"; }
} }
/// <summary> /// <summary>
/// 拼多多秒退异常重拍按钮可见条件 /// 作废按钮可见性
/// </summary> /// </summary>
public Visibility BtnAbnormalBtnVisibility public Visibility BtnVoidTransitOrderVisibility
{ {
get { return this.GetValue(x => x.BtnAbnormalBtnVisibility); } get { return this.GetValue(x => x.BtnVoidTransitOrderVisibility); }
set { this.SetValue(x => x.BtnAbnormalBtnVisibility, value); } set { this.SetValue(x => x.BtnVoidTransitOrderVisibility, value); }
} }
/// <summary> /// <summary>
/// 直发按钮可见条件 /// 异常重拍按钮可见性
/// </summary> /// </summary>
public Visibility BtnDirectBuyOrderVisibility public Visibility BtnAbnormalOrderRebuyVisibility
{ {
get { return this.GetValue(x => x.BtnDirectBuyOrderVisibility); } get { return this.GetValue(x => x.BtnAbnormalOrderRebuyVisibility); }
set { this.SetValue(x => x.BtnDirectBuyOrderVisibility, value); } set { this.SetValue(x => x.BtnAbnormalOrderRebuyVisibility, value); }
} }
public void SetAbnormalAndDirectBtnVisibility() /// <summary>
{ /// 直发按钮可见条件
// 买手秒退异常重拍 /// </summary>
BtnAbnormalBtnVisibility = Visibility.Visible; public Visibility BtnDirectBuyOrderVisibility
// 不是异常单的不可异常重拍 {
if (this.ItemOrder?.IsAbnormal != true) get { return this.GetValue(x => x.BtnDirectBuyOrderVisibility); }
BtnAbnormalBtnVisibility = Visibility.Collapsed; set { this.SetValue(x => x.BtnDirectBuyOrderVisibility, value); }
// 买手未退款的,中转正式取号以后的,不可异常重拍 }
else if (this.ItemTransitOrder?.refund_status != "买手退款成功" || public bool? _itemOrderIsAbnormal { get; set; } = false;
this.WarehouseWaybillStatusStr == "中转已取号" || this.WarehouseWaybillStatusStr == "中转已入库" || public bool? _itemOrderIsWaitBuy { get; set; } = false;
public void SetAbnormalAndDirectBtnVisibility()
{
_itemOrderIsAbnormal = ItemOrder?.GetIsAbnormal();
if (ItemOrder != null)
ItemOrder.IsAbnormal = _itemOrderIsAbnormal == true;
_itemOrderIsWaitBuy = ItemOrder?.GetIsWaitBuy();
if (ItemOrder != null)
ItemOrder.IsWaitBuy = _itemOrderIsWaitBuy == true;
// 买手秒退异常重拍
var _btnAbnormalOrderRebuyVisibility = Visibility.Visible;
// 不是异常单的不可异常重拍
if (_itemOrderIsAbnormal != true)
_btnAbnormalOrderRebuyVisibility = Visibility.Collapsed;
// 买手未退款的,中转正式取号以后的,不可异常重拍
else if (this.ItemTransitOrder?.refund_status != "买手退款成功" ||
this.WarehouseWaybillStatusStr == "中转已取号" || this.WarehouseWaybillStatusStr == "中转已入库" ||
this.WarehouseWaybillStatusStr == "中转已出库" || this.WarehouseWaybillStatusStr == "中转拦截到仓") this.WarehouseWaybillStatusStr == "中转已出库" || this.WarehouseWaybillStatusStr == "中转拦截到仓")
BtnAbnormalBtnVisibility = Visibility.Collapsed; _btnAbnormalOrderRebuyVisibility = Visibility.Collapsed;
// 已正式取号的,不可异常重拍 // 已正式取号的,不可异常重拍
if (this.ItemTransitOrder?.pre_allocated_order_no == 1 || this.ItemTransitOrder?.pre_allocated_order_no == 3) else if (this.ItemTransitOrder?.pre_allocated_order_no == 1 || this.ItemTransitOrder?.pre_allocated_order_no == 3)
BtnAbnormalBtnVisibility = Visibility.Collapsed; _btnAbnormalOrderRebuyVisibility = Visibility.Collapsed;
// 仓库异常的异常单不可异常重拍 // 仓库异常的异常单不可异常重拍
List<string> rawMsgKeyWords = new List<string> { "取号异常", "无法调用" }; List<string> rawMsgKeyWords = new List<string> { "取号异常", "无法调用" };
if (rawMsgKeyWords.Any(k => (this.ItemTransitOrderWithVoid?.raw_message).ParseToString().Contains(k)) && this.ItemTransitOrderWithVoid?.transfer_warehouse_status != 1) if (rawMsgKeyWords.Any(k => (this.ItemTransitOrderWithVoid?.raw_message).ParseToString().Contains(k)) && this.ItemTransitOrderWithVoid?.transfer_warehouse_status != 1)
BtnAbnormalBtnVisibility = Visibility.Collapsed; _btnAbnormalOrderRebuyVisibility = Visibility.Collapsed;
BtnAbnormalOrderRebuyVisibility = _btnAbnormalOrderRebuyVisibility;
if (order_id == "3738706885587395328") // 直拍按钮
BtnDirectBuyOrderVisibility = Visibility.Collapsed;
if (BaseClass.Setting.SwitchEnableDirectBuy && this.ItemOrder?.status < 30)
{ {
//if (GlobalConfig.CurrentBuyPlatform == "pdd")
} //{
//}
// 直拍按钮 //else if (GlobalConfig.CurrentBuyPlatform == "tb")
BtnDirectBuyOrderVisibility = Visibility.Collapsed; //{
//if (GlobalConfig.CurrentBuyPlatform == "pdd") if (_itemOrderIsWaitBuy == true && this.BuyGoodsBtnTxt != "关联拍单")
{
if (this.ItemOrder?.GetIsWaitBuy() == true && this.BuyGoodsBtnTxt != "关联拍单")
BtnDirectBuyOrderVisibility = Visibility.Visible; BtnDirectBuyOrderVisibility = Visibility.Visible;
if (this.ItemOrder?.GetIsAbnormal() == true && this.refund_status <= 1) else if (_itemOrderIsAbnormal == true && this.refund_status <= 1)
{ {
//if (BtnAbnormalBtnVisibility == Visibility.Collapsed && (this.ItemOrder.out_order_no.IsNullOrEmpty() || this.ItemOrder.out_after_sale_status == "退款成功")) //if (BtnAbnormalBtnVisibility == Visibility.Collapsed && (this.ItemOrder.out_order_no.IsNullOrEmpty() || this.ItemOrder.out_after_sale_status == "退款成功"))
if (this.ItemOrder.out_order_no.IsNullOrEmpty() || this.ItemOrder.out_after_sale_status == "退款成功") if (this.ItemOrder.out_order_no.IsNullOrEmpty() || this.ItemOrder.out_after_sale_status == "退款成功")
BtnDirectBuyOrderVisibility = Visibility.Visible; BtnDirectBuyOrderVisibility = Visibility.Visible;
} }
else
BtnDirectBuyOrderVisibility = Visibility.Collapsed;
//}
} }
//else if (GlobalConfig.CurrentBuyPlatform == "tb") else
{ BtnDirectBuyOrderVisibility = Visibility.Collapsed;
} }
}
public string RefundStatusStr public string RefundStatusStr
{ {
@@ -1483,164 +1619,162 @@ namespace AllBase.Model.DBModel
set { this.SetValue(x => x.RefundStatusStrVisibility, value); } set { this.SetValue(x => x.RefundStatusStrVisibility, value); }
} }
public Visibility BtnVoidTransitOrderVisibility public Visibility OutOrderNoVisibility
{ {
get { return this.GetValue(x => x.BtnVoidTransitOrderVisibility); } get { return this.GetValue(x => x.OutOrderNoVisibility); }
set { this.SetValue(x => x.BtnVoidTransitOrderVisibility, value); } set { this.SetValue(x => x.OutOrderNoVisibility, value); }
} }
public Visibility BtnAbnormalOrderRebuyVisibility
{
get { return this.GetValue(x => x.BtnAbnormalOrderRebuyVisibility); }
set { this.SetValue(x => x.BtnAbnormalOrderRebuyVisibility, value); }
}
/// <summary> /// <summary>
/// 订单商品表数据库id /// 订单商品表数据库id
/// </summary> /// </summary>
public long id { get; set; } public long id { get; set; }
public long shop_id { get; set; } public long shop_id { get; set; }
/// <summary> /// <summary>
/// 商户ID /// 商户ID
/// </summary> /// </summary>
public long merchant_id { get; set; } public long merchant_id { get; set; }
/// <summary> /// <summary>
/// 订单id(平台订单id) /// 订单id(平台订单id)
/// </summary> /// </summary>
public string order_id { get; set; } public string order_id { get; set; }
/// <summary> /// <summary>
/// 商品spuid /// 商品spuid
/// </summary> /// </summary>
public string product_id { get; set; } public string product_id { get; set; }
public string sku_id { get; set; } public string sku_id { get; set; }
/// <summary> /// <summary>
/// sku小图 /// sku小图
/// </summary> /// </summary>
public string thumb_img { get; set; } public string thumb_img
/// <summary> {
/// sku数量 get { return this.GetValue(x => x.thumb_img); }
/// </summary> set { this.SetValue(x => x.thumb_img, value); IsLoadThumbImg = !string.IsNullOrEmpty(value); ThumbImgStr = thumb_img + "?imageView2/1/w/100/h/100/format/jpg/q/80"; }
public int? sku_cnt { get; set; } }
/// <summary> /// <summary>
/// 售卖单价(单位:分) /// sku数量
/// </summary> /// </summary>
public int? sale_price { get; set; } public int? sku_cnt { get; set; }
/// <summary> /// <summary>
/// 商品名称 /// 售卖单价(单位:分)
/// </summary> /// </summary>
public string title { get; set; } public int? sale_price { get; set; }
/// <summary> /// <summary>
/// 正在售后/退款流程中的 sku 数量 /// 商品名称
/// </summary> /// </summary>
public int? on_aftersale_sku_cnt { get; set; } public string title { get; set; }
/// <summary> /// <summary>
/// 完成售后/退款的 sku 数量 /// 正在售后/退款流程中的 sku 数量
/// </summary> /// </summary>
public int? finish_aftersale_sku_cnt { get; set; } public int? on_aftersale_sku_cnt { get; set; }
/// <summary> /// <summary>
/// 商品编码 /// 完成售后/退款的 sku 数量
/// </summary> /// </summary>
public string sku_code { get; set; } public int? finish_aftersale_sku_cnt { get; set; }
/// <summary> /// <summary>
/// 市场单价(单位:分) /// 商品编码
/// </summary> /// </summary>
public int? market_price { get; set; } public string sku_code { get; set; }
/// <summary> /// <summary>
/// sku属性JSON /// 市场单价(单位:分)
/// </summary> /// </summary>
public string sku_attrs public int? market_price { get; set; }
/// <summary>
/// sku属性JSON
/// </summary>
public string sku_attrs
{ {
get { return this.GetValue(x => x.sku_attrs); } get { return this.GetValue(x => x.sku_attrs); }
set { this.SetValue(x => x.sku_attrs, value); SetSkuAttrStr(); } set { this.SetValue(x => x.sku_attrs, value); SetSkuAttrStr(); }
} }
/// <summary> /// <summary>
/// sku实付总价,取estimate_price和change_price中较小值 /// sku实付总价,取estimate_price和change_price中较小值
/// </summary> /// </summary>
public int? real_price { get; set; } public int? real_price { get; set; }
/// <summary> /// <summary>
/// 商品外部spuid /// 商品外部spuid
/// </summary> /// </summary>
public string out_product_id { get; set; } public string out_product_id { get; set; }
/// <summary> /// <summary>
/// 采购价 /// 采购价
/// </summary> /// </summary>
public int? purchase_price { get; set; } public int? purchase_price { get; set; }
/// <summary> /// <summary>
/// 运费 /// 运费
/// </summary> /// </summary>
public int? freight { get; set; } public int? freight { get; set; }
/// <summary> /// <summary>
/// 商品外部skuid /// 商品外部skuid
/// </summary> /// </summary>
public string out_sku_id { get; set; } public string out_sku_id { get; set; }
/// <summary> /// <summary>
/// 是否有优惠金额,非必填,默认为false /// 是否有优惠金额,非必填,默认为false
/// </summary> /// </summary>
public string is_discounted { get; set; } public string is_discounted { get; set; }
/// <summary> /// <summary>
/// 优惠后sku总价,非必填,is_discounted为true时有值 /// 优惠后sku总价,非必填,is_discounted为true时有值
/// </summary> /// </summary>
public int? estimate_price { get; set; } public int? estimate_price { get; set; }
/// <summary> /// <summary>
/// 是否修改过价格,非必填,默认为false /// 是否修改过价格,非必填,默认为false
/// </summary> /// </summary>
public string is_change_price { get; set; } public string is_change_price { get; set; }
/// <summary> /// <summary>
/// 改价后sku总价,非必填,is_change_price为true时有值 /// 改价后sku总价,非必填,is_change_price为true时有值
/// </summary> /// </summary>
public int? change_price { get; set; } public int? change_price { get; set; }
/// <summary> /// <summary>
/// 订单内商品维度平台券优惠金额(利润需要计算这个金额在内) /// 订单内商品维度平台券优惠金额(利润需要计算这个金额在内)
/// </summary> /// </summary>
public int? cash_coupon_discounted_price { get; set; } public int? cash_coupon_discounted_price { get; set; }
/// <summary> /// <summary>
/// 区域库存id /// 区域库存id
/// </summary> /// </summary>
public string out_warehouse_id { get; set; } public string out_warehouse_id { get; set; }
/// <summary> /// <summary>
/// 退货地址 /// 退货地址
/// </summary> /// </summary>
public string return_address { get; set; } public string return_address { get; set; }
/// <summary> /// <summary>
/// 商品发货信息JSON /// 商品发货信息JSON
/// </summary> /// </summary>
public string sku_deliver_info { get; set; } public string sku_deliver_info { get; set; }
/// <summary> /// <summary>
/// 商品额外服务信息JSON /// 商品额外服务信息JSON
/// </summary> /// </summary>
public string extra_service { get; set; } public string extra_service { get; set; }
/// <summary> /// <summary>
/// 是否使用了会员积分抵扣 /// 是否使用了会员积分抵扣
/// </summary> /// </summary>
public string use_deduction { get; set; } public string use_deduction { get; set; }
/// <summary> /// <summary>
/// 会员积分抵扣金额,单位为分 /// 会员积分抵扣金额,单位为分
/// </summary> /// </summary>
public int? deduction_price { get; set; } public int? deduction_price { get; set; }
/// <summary> /// <summary>
/// 平台服务费(微信小店:预计技术服务费),单位为分 /// 平台服务费(微信小店:预计技术服务费),单位为分
/// </summary> /// </summary>
public int? predict_commission_fee { get; set; } public int? predict_commission_fee { get; set; }
/// <summary> /// <summary>
/// 达人佣金(微信小店:分账金额),单位为分 /// 达人佣金(微信小店:分账金额),单位为分
/// </summary> /// </summary>
public int? commission_amount { get; set; } public int? commission_amount { get; set; }
/// <summary> /// <summary>
/// 商品优惠券信息,逐步替换 order.order_detail.coupon_info /// 商品优惠券信息,逐步替换 order.order_detail.coupon_info
/// </summary> /// </summary>
public string order_product_coupon_info_list { get; set; } public string order_product_coupon_info_list { get; set; }
/// <summary> /// <summary>
/// 商品id(o_goods外键) /// 商品id(o_goods外键)
/// </summary> /// </summary>
public long? erp_goods_id { get; set; } public long? erp_goods_id { get; set; }
/// <summary> /// <summary>
/// 商品skuid(o_goods_sku外键) /// 商品skuid(o_goods_sku外键)
/// </summary> /// </summary>
public long? erp_goods_sku_id { get; set; } public long? erp_goods_sku_id { get; set; }
/// <summary> /// <summary>
/// 售后状态 1:无售后或售后关闭,2:售后处理中,3:退款中,4:退款成功,11:已取消(售后完成订单取消) /// 售后状态 1:无售后或售后关闭,2:售后处理中,3:退款中,4:退款成功,11:已取消(售后完成订单取消)
/// </summary> /// </summary>
public int? refund_status public int? refund_status
{ {
get { return this.GetValue(x => x.refund_status); } get { return this.GetValue(x => x.refund_status); }
set set
@@ -1659,11 +1793,11 @@ namespace AllBase.Model.DBModel
} }
} }
public void SetOrderItemTextProperty() public void SetOrderItemTextProperty()
{ {
CreateDateTime = BaseClass.StampToDateTime((ItemOrder?.create_time).ParseToInt()); CreateDateTime = BaseClass.StampToDateTime((ItemOrder?.create_time).ParseToInt());
CreateDateTimeStr = CreateDateTime.ToString("yy-MM-dd HH:mm:ss"); CreateDateTimeStr = CreateDateTime.ToString("yy-MM-dd HH:mm:ss");
UpdateTimeStr = BaseClass.StampToDateTime((ItemOrder?.update_time).ParseToInt()).ToString("yy-MM-dd HH:mm:ss"); UpdateTimeStr = BaseClass.StampToDateTime((ItemOrder?.update_time).ParseToInt()).ToString("yy-MM-dd HH:mm:ss");
//if (PurpleBrush == null && GlobalConfig.Dispatcher != null) //if (PurpleBrush == null && GlobalConfig.Dispatcher != null)
//{ //{
@@ -1675,14 +1809,13 @@ namespace AllBase.Model.DBModel
//} //}
this.SetItemRefund(); this.SetItemRefund();
this.SetTransitOrder(); this.SetTransitOrder();
this.SetDirectOrder(); this.SetDirectOrder();
this.SetBuyerTransitWaybillStatusStr(); this.SetBuyerTransitWaybillStatusStr();
this.SetWarehouseWaybillStatusStr(); this.SetWarehouseWaybillStatusStr();
// 拍单、代发等信息判断并控制拍单按钮 // 拍单、代发等信息判断并控制拍单按钮
this.UpdateOrderItemBuyButton(); this.UpdateOrderItemBuyButton();
this.SetAbnormalAndDirectBtnVisibility();
SetEWaybillInfo(); SetEWaybillInfo();
SetOutOrderTimeQualifiedStr(); SetOutOrderTimeQualifiedStr();
@@ -1690,6 +1823,7 @@ namespace AllBase.Model.DBModel
SetOrderItemStatusAndColor(); SetOrderItemStatusAndColor();
SetOrderItemExtInfo(); SetOrderItemExtInfo();
OutOrderNoVisibility = string.IsNullOrWhiteSpace(ItemOrder?.out_order_no) ? Visibility.Collapsed : Visibility.Visible;
if (this.ItemTransitOrders != null) if (this.ItemTransitOrders != null)
{ {
foreach (var tOrder in this.ItemTransitOrders) foreach (var tOrder in this.ItemTransitOrders)
@@ -1699,22 +1833,25 @@ namespace AllBase.Model.DBModel
ItemTransitOutOrderBuyerStrVisibility = (ItemTransitOrderWithVoid?.OutOrderBuyerStr).IsNullOrEmpty() ? Visibility.Collapsed : Visibility.Visible; ItemTransitOutOrderBuyerStrVisibility = (ItemTransitOrderWithVoid?.OutOrderBuyerStr).IsNullOrEmpty() ? Visibility.Collapsed : Visibility.Visible;
ItemTransitOutOrderNoStrVisibility = (ItemTransitOrderWithVoid?.OutOrderNumStr).IsNullOrEmpty() ? Visibility.Collapsed : Visibility.Visible; ItemTransitOutOrderNoStrVisibility = (ItemTransitOrderWithVoid?.OutOrderNumStr).IsNullOrEmpty() ? Visibility.Collapsed : Visibility.Visible;
} }
oms_wei_order_item_transit_model transitInfo = new oms_wei_order_item_transit_model()
{
OrderItem = this,
};
TransitPackageList = [.. transitInfo.OrderItemTransitDetailList];
} }
/// <summary> 初始化物流明细信息 </summary> /// <summary> 初始化物流明细信息 </summary>
public void SetEWaybillInfo() public void SetEWaybillInfo()
{ {
if(order_id == "3738794693820307200") if (this.ItemOrder?.LatestEWaybills?.Count > 0 && !string.IsNullOrEmpty(ItemTransitOrderWithVoid?.express_2_waybill))
{ LatestTransitEWaybill = ItemOrder.LatestEWaybills.FirstOrDefault(ew => ew.waybill_id == ItemTransitOrderWithVoid.express_2_waybill);
}
if (this.ItemOrder?.latestEWaybills?.Count > 0 && !string.IsNullOrEmpty(ItemTransitOrderWithVoid?.express_2_waybill))
LatestTransitEWaybill = ItemOrder.latestEWaybills.FirstOrDefault(ew => ew.waybill_id == ItemTransitOrderWithVoid.express_2_waybill);
else else
LatestTransitEWaybill = null; LatestTransitEWaybill = null;
if (this.ItemOrder?.latestEWaybills?.Count > 0 && !string.IsNullOrEmpty(this.ItemOrder?.out_express_no)) if (this.ItemOrder?.LatestEWaybills?.Count > 0 && !string.IsNullOrEmpty(this.ItemOrder?.out_express_no))
LatestDirectEWaybill = ItemOrder.latestEWaybills.FirstOrDefault(ew => ew.waybill_id == this.ItemOrder?.out_express_no); LatestDirectEWaybill = ItemOrder.LatestEWaybills.FirstOrDefault(ew => ew.waybill_id == this.ItemOrder?.out_express_no);
else else
LatestDirectEWaybill = null; LatestDirectEWaybill = null;
} }
@@ -1722,10 +1859,12 @@ namespace AllBase.Model.DBModel
public void UpdateOrderItemBuyButton() public void UpdateOrderItemBuyButton()
{ {
var order_item = this; var order_item = this;
order_item.Shop = GlobalConfig.ShopLoginList.FirstOrDefault(s => s.ErpShopId == order_item.shop_id.ParseToString()); var Shop = GlobalConfig.ShopLoginList.FirstOrDefault(s => s.ErpShopId == order_item.shop_id.ParseToString());
// 关联商品sku // 关联商品sku
if (GlobalConfig.CurrentBuyPlatform == "pdd") if (this.refund_status > 1)
MapSkusBtnVisibility = Visibility.Collapsed;
else if (GlobalConfig.CurrentBuyPlatform == "pdd")
{ {
if (PddBuyMapSkus != null && PddBuyMapSkus.Count > 0) if (PddBuyMapSkus != null && PddBuyMapSkus.Count > 0)
MapSkusBtnVisibility = Visibility.Visible; MapSkusBtnVisibility = Visibility.Visible;
@@ -1798,31 +1937,34 @@ namespace AllBase.Model.DBModel
BtnVoidTransitOrderVisibility = Visibility.Visible; BtnVoidTransitOrderVisibility = Visibility.Visible;
else else
BtnVoidTransitOrderVisibility = Visibility.Collapsed; BtnVoidTransitOrderVisibility = Visibility.Collapsed;
// 异常重拍 // 异常重拍和直拍按钮
if (order_item.GetIsAbnormalOrderRebuy()) SetAbnormalAndDirectBtnVisibility();
BtnAbnormalOrderRebuyVisibility = Visibility.Visible;
else
BtnAbnormalOrderRebuyVisibility = Visibility.Collapsed;
} }
/// <summary> /// <summary>
/// 判断中转仓订单是否可以异常重拍 /// 判断中转仓订单是否可以异常重拍(拍单时用,初始化数据时候返回的数据是错的)
/// </summary> /// </summary>
/// <param name="order_item"></param> /// <param name="order_item"></param>
/// <returns></returns> /// <returns></returns>
public bool GetIsAbnormalOrderRebuy() public bool GetIsAbnormalOrderRebuy()
{ {
if (order_id == "3740287208579314176")
{
}
var order_item = this; var order_item = this;
// 不是异常单的不可异常重拍 // 不是异常单的不可异常重拍
if (order_item?.ItemOrder?.IsAbnormal != true) if (order_item?.ItemOrder?.GetIsAbnormal() != true)
return false; return false;
// 买手未退款的,中转正式取号以后的,不可异常重拍 // 买手未退款的,中转正式取号以后的,不可异常重拍
if (order_item.ItemTransitOrder?.refund_status != "买手退款成功" || if (order_item.ItemTransitOrderWithVoid?.refund_status != "买手退款成功" ||
order_item.WarehouseWaybillStatusStr == "中转已取号" || order_item.WarehouseWaybillStatusStr == "中转已入库" || order_item.WarehouseWaybillStatusStr == "中转已出库") this.WarehouseWaybillStatusStr == "中转已取号" || this.WarehouseWaybillStatusStr == "中转已入库" ||
this.WarehouseWaybillStatusStr == "中转已出库" || this.WarehouseWaybillStatusStr == "中转拦截到仓")
return false; return false;
// 已正式取号的,不可异常重拍 // 已正式取号的,不可异常重拍
if (order_item.ItemTransitOrder?.pre_allocated_order_no == 1 || order_item.ItemTransitOrder?.pre_allocated_order_no == 3) if (order_item.ItemTransitOrderWithVoid?.pre_allocated_order_no == 1 || order_item.ItemTransitOrderWithVoid?.pre_allocated_order_no == 3)
return false; return false;
// 仓库异常的异常单不可异常重拍 // 仓库异常的异常单不可异常重拍
List<string> rawMsgKeyWords = new List<string> { "取号异常", "无法调用" }; List<string> rawMsgKeyWords = new List<string> { "取号异常", "无法调用" };
@@ -0,0 +1,801 @@
using AllBase.Helper;
using AllBase.Model.MvvmBaseClasses;
using NaiBa.Util.Extension;
using Newtonsoft.Json;
using System;
using System.Collections.Generic;
using System.Collections.ObjectModel;
using System.IO.Ports;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Windows;
using System.Windows.Media;
namespace AllBase.Model.DBModel;
public class oms_wei_order_item_transit_model : PropertyNotifyObject
{
public oms_wei_order_item_info OrderItem
{
get { return this.GetValue(x => x.OrderItem); }
set
{
this.SetValue(x => x.OrderItem, value);
GetOrderItemTransitList();
}
}
public ObservableCollection<oms_wei_order_item_transit_detail_info> OrderItemTransitDetailList
{
get { return this.GetValue(x => x.OrderItemTransitDetailList); }
private set { this.SetValue(x => x.OrderItemTransitDetailList, value); }
}
private bool isGetLatestPackageInfo = false;
public oms_wei_order_item_transit_model (bool _isGetLatestPackage = false)
{
isGetLatestPackageInfo = _isGetLatestPackage;
}
void GetOrderItemTransitList()
{
List<oms_wei_order_item_transit_detail_info> transitDetailList =
[
.. GetOrderItemTransitDetailList(),
.. GetOrderItemTransitAftersaleList(),
.. GetOrderItemTransitExtraList(),
];
this.OrderItemTransitDetailList = new ObservableCollection<oms_wei_order_item_transit_detail_info>(transitDetailList);
}
/// <summary>
/// 获取发货包裹对应信息列表
/// </summary>
/// <returns></returns>
List<oms_wei_order_item_transit_detail_info> GetOrderItemTransitDetailList()
{
if (OrderItem == null || OrderItem.ItemOrder == null)
{
return new List<oms_wei_order_item_transit_detail_info>();
}
List<oms_wei_order_item_transit_detail_info> detailList = new List<oms_wei_order_item_transit_detail_info>();
foreach (var transitOrder in OrderItem.ItemTransitOrders ?? new List<oms_wei_external_procurement_log_info>())
{
try
{
var transitDetail = new oms_wei_order_item_transit_detail_info()
{
oms_wei_order_item_info = OrderItem,
oms_wei_external_procurement_log_info = transitOrder,
ShopName = OrderItem.ItemOrder.shop_name,
TransitTypeStr = "发货包裹",
OrderCode = transitOrder.order_code,
SourceCode = transitOrder.random_code,
WxOrderId = transitOrder.order_no,
WxOrderSkuId = transitOrder.order_sku_id,
WxOrderThumbImg = OrderItem.thumb_img,
WxOrderCreateTime = OrderItem.ItemOrder.CreateDateTime,
TransitAddTimeStr = transitOrder.created_time.ToString("yyyy-MM-dd HH:mm:ss"),
OutOrderId = transitOrder.out_order_no,
OutBuyerName = transitOrder.OutOrderBuyerStr,
//UpperWaybill = transitOrder.express_1_waybill != transitOrder.virtual_waybill_no ? "" : (transitOrder.express_1_company + "-" + transitOrder.express_1_waybill).Trim('-'),
UpperWaybill = transitOrder.pre_allocated_order_no != 1 && transitOrder.pre_allocated_order_no != 3 ? "" : (transitOrder.express_1_company + "-" + transitOrder.express_1_waybill).Trim('-'),
DownWaybill = (transitOrder.express_2_company + "-" + transitOrder.express_2_waybill).Trim('-'),
BuyRefundStatus = transitOrder.refund_status,
CreateTime = transitOrder.created_time == DateTime.MinValue ? null : transitOrder.created_time,
PickUpTime = transitOrder.pickup_time == DateTime.MinValue ? null : transitOrder.pickup_time,
InboundTime = transitOrder.inbound_time,
OutboundTime = transitOrder.outbound_time,
WarehouseId = transitOrder.platform,
WarehouseName = TransitWarehouseData.dicWarehouseIdName.ContainsKey(transitOrder.platform) ? TransitWarehouseData.dicWarehouseIdName[transitOrder.platform] : transitOrder.platform,
ShelfCodeStr = transitOrder.location_code,
ShelfTimeStr = transitOrder.location_write_time == null ? "" : transitOrder.location_write_time.Value.ToString("yyyy-MM-dd HH:mm:ss"),
};
if (!transitDetail.OutOrderId.StartsWith("tb_"))
transitDetail.OutBuyerId = GlobalConfig.PDDBuyerLoginList.FirstOrDefault(b => b.buyer_id == transitOrder.buyer_account)?.buyer_id ?? "";
else
transitDetail.OutBuyerId = GlobalConfig.TaobaoBuyerLoginList.FirstOrDefault(b => b.buyer_id == transitOrder.buyer_account)?.buyer_id ?? "";
// 中转仓订单创建状态 0 未使用,1 已创建,2 创建失败,3 处理中(业务方根据此字段处理中转流程)
if (transitOrder.transfer_warehouse_status == 0)
transitDetail.TransitStatus = "未使用";
if (transitOrder.transfer_warehouse_status == 1)
transitDetail.TransitStatus = "已创建";
else if (transitOrder.transfer_warehouse_status == 2)
transitDetail.TransitStatus = "创建失败";
else if (transitOrder.transfer_warehouse_status == 3)
transitDetail.TransitStatus = "创建中";
else if (transitOrder.transfer_warehouse_status == 4)
transitDetail.TransitStatus = "取号失败";
// 中转仓入库状态 0: 未入库, 1: 已入库, 2: 已出库, 3: 拦截到仓
if (transitOrder.transfer_warehouse_status == 4)
transitDetail.WarehouseStatus = "取号失败";
else if ((transitOrder.raw_message.ParseToString().Contains("取号异常") || transitOrder.raw_message.ParseToString().Contains("无法调用")) && transitOrder.transfer_warehouse_status != 1)
transitDetail.WarehouseStatus = transitOrder.raw_message.Contains("超出派送范围") ? "取号异常(超区)" : "取号异常";
else if (transitOrder.pickup_time > DateTime.MinValue == false)
transitDetail.WarehouseStatus = "未取号";
else if (transitOrder.warehouse_status == null || transitOrder.warehouse_status == 0)
transitDetail.WarehouseStatus = "未入库";
else if (transitOrder.warehouse_status == 1)
transitDetail.WarehouseStatus = "已入库";
else if (transitOrder.warehouse_status == 2)
transitDetail.WarehouseStatus = "已出库";
else if (transitOrder.warehouse_status == 3)
transitDetail.WarehouseStatus = "已拦截到仓";
if (transitOrder.order_void_status == 1)
transitDetail.TransitVoidStatus = "已作废";
//else if (transitOrder.order_void_status == 2)
// transitDetail.TransitVoidStatus = "作废失败";
if (transitOrder?.has_reject == 1)
transitDetail.TransitRejectStatus = "已申请拒收";
if (transitOrder?.has_reject == 2)
transitDetail.TransitRejectStatus = "申请失败";
if (transitOrder?.has_reject == 3)
transitDetail.TransitRejectStatus = "申请成功";
if (transitOrder?.has_reject == 5)
transitDetail.TransitRejectStatus = "已取消拒收";
if (transitOrder?.has_reject == 99)
transitDetail.TransitRejectStatus = "拒收成功";
var wayBillId = transitOrder.express_2_waybill ?? transitOrder.express_1_waybill;
var transitAfterSaleOrder = /* 取未作废的退货包裹,如果取不到,就取第一个退货包裹 */
OrderItem.ItemTransitOrderAfterSales.FirstOrDefault(a => a.order_code == transitOrder.order_code && a.refund_waybill == wayBillId && a.order_void_status != 1 && a.pack_type == 1) ??
OrderItem.ItemTransitOrderAfterSales.FirstOrDefault(a => a.order_code == transitOrder.order_code && a.refund_waybill == wayBillId && a.pack_type == 1);
if (transitAfterSaleOrder != null)
transitDetail.TransitReturnStatus = "已申请拦截";
if (transitAfterSaleOrder != null && transitAfterSaleOrder.order_void_status == 1)
transitDetail.TransitReturnStatus = "拦截作废";
else if (transitAfterSaleOrder != null && (transitOrder.intercept_return_status == 1 || !string.IsNullOrEmpty(transitAfterSaleOrder?.downstream_waybill)))
transitDetail.TransitReturnStatus = "拦截成功";
else if (transitAfterSaleOrder != null && transitOrder.intercept_return_status == 2)
transitDetail.TransitReturnStatus = "拦截失败";
transitDetail.TransitDetailRefundStatusStr = GetTransitBuyerRefundStatusStr(OrderItem, transitOrder);
//transitDetail.VoidPackageBtnVisibility = !(transitDetail.InboundTime > DateTime.MinValue) && transitOrder.order_void_status != 1 ? Visibility.Visible : Visibility.Collapsed; /* 作废发货包裹按钮 */
//transitDetail.RejectPackageBtnVisibility = !(transitDetail.InboundTime > DateTime.MinValue) ? Visibility.Visible : Visibility.Collapsed; /* 拒收发货包裹按钮 */
//transitDetail.ReturnPackageBtnVisibility = transitDetail.InboundTime > DateTime.MinValue && !(transitDetail.OutboundTime > DateTime.MinValue) &&
// !OrderItem.ItemTransitOrderAfterSales.Any(af => af.pack_type == 1 && af.order_code == transitDetail.OrderCode && af.order_void_status != 1) &&
// !OrderItem.ItemTransitExtraOrders.Any(af => af.pack_type == "1" && af.order_code == transitDetail.OrderCode && af.order_void_status != 1) ?
// Visibility.Visible : Visibility.Collapsed; /* 退货包裹按钮 */
//transitDetail.InterceptPackageBtnVisibility = transitDetail.OutboundTime > DateTime.MinValue &&
// !OrderItem.ItemTransitOrderAfterSales.Any(af => af.pack_type == 1 && af.order_code == transitDetail.OrderCode && af.order_void_status != 1) &&
// !OrderItem.ItemTransitExtraOrders.Any(af => af.pack_type == "1" && af.order_code == transitDetail.OrderCode && af.order_void_status != 1) ?
// Visibility.Visible : Visibility.Collapsed; /* 拦截退货包裹按钮 */
//transitDetail.ExtraPackagesBtnVisibility = transitDetail.InboundTime > DateTime.MinValue && !(transitDetail.OutboundTime > DateTime.MinValue) && !(transitDetail.CreateTime > DateTime.Now.AddDays(-4)) &&
// !OrderItem.ItemTransitOrderAfterSales.Any(af => af.pack_type == 1 && af.order_code == transitDetail.OrderCode && af.order_void_status != 1) &&
// !OrderItem.ItemTransitExtraOrders.Any(af => af.pack_type == "1" && af.order_code == transitDetail.OrderCode && af.order_void_status != 1) ?
// Visibility.Visible : Visibility.Collapsed; /* 额外发货包裹按钮 */
transitDetail.VoidPackageBtnVisibility = transitOrder.warehouse_status == 0 && transitOrder.order_void_status != 1 ? Visibility.Visible : Visibility.Collapsed; /* 作废发货包裹按钮 */
transitDetail.RejectPackageBtnVisibility = OrderItem?.ItemOrder?.GetIsWaitBuy() != true && transitOrder.warehouse_status == 0 ? Visibility.Visible : Visibility.Collapsed; /* 拒收发货包裹按钮 */
transitDetail.ReturnPackageBtnVisibility = (transitOrder.warehouse_status == 1 || transitOrder.warehouse_status == 3 || !transitOrder.location_code.IsNullOrEmpty()) &&
!OrderItem.ItemTransitOrderAfterSales.Any(af => af.pack_type == 1 && af.order_code == transitDetail.OrderCode && af.order_void_status != 1) &&
!OrderItem.ItemTransitExtraOrders.Any(af => af.pack_type == "1" && af.order_code == transitDetail.OrderCode && af.order_void_status != 1) ?
Visibility.Visible : Visibility.Collapsed; /* 发回退货包裹按钮 */
transitDetail.InterceptPackageBtnVisibility = transitOrder.warehouse_status == 2 &&
!OrderItem.ItemTransitOrderAfterSales.Any(af => af.pack_type == 1 && af.order_code == transitDetail.OrderCode && af.order_void_status != 1) &&
!OrderItem.ItemTransitExtraOrders.Any(af => af.pack_type == "2" && af.order_code == transitDetail.OrderCode && af.order_void_status != 1) ?
Visibility.Visible : Visibility.Collapsed; /* 拦截退货包裹按钮 */
transitDetail.ExtraPackagesBtnVisibility = ((transitOrder.warehouse_status == 0 || transitOrder.warehouse_status == 1 || transitOrder.warehouse_status == 3 || !transitOrder.location_code.IsNullOrEmpty()) &&
!(transitDetail.CreateTime > DateTime.Now.AddDays(-2)) &&
!OrderItem.ItemTransitOrderAfterSales.Any(af => af.pack_type == 1 && af.order_code == transitDetail.OrderCode && af.order_void_status != 1) &&
!OrderItem.ItemTransitExtraOrders.Any(af => af.pack_type == "2" && af.order_code == transitDetail.OrderCode && af.order_void_status != 1)) ||
OrderItem._itemOrderIsAbnormal == true ?
Visibility.Visible : Visibility.Collapsed; /* 额外发货包裹按钮 */
//transitDetail.VoidPackageBtnVisibility = Visibility.Visible; /* 作废发货包裹按钮 */
//transitDetail.RejectPackageBtnVisibility = Visibility.Visible; /* 拒收发货包裹按钮 */
//transitDetail.ReturnPackageBtnVisibility = Visibility.Visible; /* 退货包裹按钮 */
//transitDetail.InterceptPackageBtnVisibility = Visibility.Visible; /* 拦截退货包裹按钮 */
//transitDetail.ExtraPackagesBtnVisibility = Visibility.Visible; /* 额外发货包裹按钮 */
detailList.Add(transitDetail);
}
catch (Exception ex)
{
}
}
return detailList;
}
/// <summary>
/// 获取退货包裹对应信息列表
/// </summary>
/// <returns></returns>
List<oms_wei_order_item_transit_detail_info> GetOrderItemTransitAftersaleList()
{
if (OrderItem == null || OrderItem.ItemOrder == null)
{
return new List<oms_wei_order_item_transit_detail_info>();
}
List<oms_wei_order_item_transit_detail_info> detailList = new List<oms_wei_order_item_transit_detail_info>();
foreach (var transitAftersaleOrder in OrderItem.ItemTransitOrderAfterSales ?? new List<oms_wei_external_procurement_after_sale_info>())
{
try
{
var transitOrder = OrderItem.ItemTransitOrders?.FirstOrDefault(t => t.order_code == transitAftersaleOrder.order_code);
var transitDetail = new oms_wei_order_item_transit_detail_info()
{
oms_wei_order_item_info = OrderItem,
oms_wei_external_procurement_after_sale_info = transitAftersaleOrder,
ShopName = OrderItem.ItemOrder.shop_name,
TransitTypeStr = "退货包裹", /* 拦截退回 */
OrderCode = transitAftersaleOrder.order_code + " / " + transitAftersaleOrder.external_order_no,
SourceCode = transitOrder?.random_code,
WxOrderId = transitAftersaleOrder.order_no,
WxOrderSkuId = transitOrder?.order_sku_id,
WxOrderThumbImg = OrderItem.thumb_img,
WxOrderCreateTime = OrderItem.ItemOrder.CreateDateTime,
TransitAddTimeStr = transitAftersaleOrder.created_time == null ? "" : transitAftersaleOrder.created_time.Value.ToString("yyyy-MM-dd HH:mm:ss"),
OutOrderId = transitOrder?.out_order_no,
OutBuyerName = transitOrder?.OutOrderBuyerStr,
UpperWaybill = (transitAftersaleOrder.return_express_company + "-" + transitAftersaleOrder.refund_waybill).Trim('-'),
DownWaybill = (transitAftersaleOrder.downstream_express_code + "-" + transitAftersaleOrder.downstream_waybill).Trim('-'),
BuyRefundStatus = transitOrder.refund_status,
CreateTime = transitAftersaleOrder.created_time,
PickUpTime = transitAftersaleOrder.pickup_time,
InboundTime = transitAftersaleOrder.inbound_time,
OutboundTime = transitAftersaleOrder.outbound_time,
WarehouseId = transitOrder?.platform,
WarehouseName = TransitWarehouseData.dicWarehouseIdName.ContainsKey(transitOrder?.platform) ? TransitWarehouseData.dicWarehouseIdName[transitOrder?.platform] : transitOrder?.platform,
ShelfCodeStr = transitAftersaleOrder.location_code,
ShelfTimeStr = transitAftersaleOrder.location_write_time == null ? "" : transitAftersaleOrder.location_write_time.Value.ToString("yyyy-MM-dd HH:mm:ss"),
};
if (!transitDetail.OutOrderId.StartsWith("tb_"))
transitDetail.OutBuyerId = GlobalConfig.PDDBuyerLoginList.FirstOrDefault(b => b.buyer_id == transitOrder?.buyer_account)?.buyer_id ?? "";
else
transitDetail.OutBuyerId = GlobalConfig.TaobaoBuyerLoginList.FirstOrDefault(b => b.buyer_id == transitOrder?.buyer_account)?.buyer_id ?? "";
// 退货包裹处理状态,0未处理,1处理中,2已完成,9异常
if (transitAftersaleOrder.status == 0)
transitDetail.TransitStatus = "未处理";
if (transitAftersaleOrder.status == 1)
transitDetail.TransitStatus = "处理中";
else if (transitAftersaleOrder.status == 2)
transitDetail.TransitStatus = "已完成";
else if (transitAftersaleOrder.status == 9)
transitDetail.TransitStatus = "异常";
// 退货包裹入库状态 1=入库 2=出库
if (transitAftersaleOrder.warehouse_status == null || transitAftersaleOrder.warehouse_status == 0)
transitDetail.WarehouseStatus = "未入库";
else if (transitAftersaleOrder.warehouse_status == 1)
transitDetail.WarehouseStatus = "已入库";
else if (transitAftersaleOrder.warehouse_status == 2)
transitDetail.WarehouseStatus = "已出库";
else if (transitAftersaleOrder.warehouse_status == 3)
transitDetail.WarehouseStatus = "已拦截到仓";
// 售后作废状态
if (transitAftersaleOrder.order_void_status == 1)
transitDetail.TransitVoidStatus = "已作废";
//else if (transitOrder.order_void_status == 2)
// transitDetail.TransitVoidStatus = "作废失败";
//transitDetail.VoidPackageBtnVisibility = !(transitDetail.InboundTime > DateTime.MinValue) && transitAftersaleOrder.order_void_status != 1 ? Visibility.Visible : Visibility.Collapsed; /* 作废退货包裹 */
transitDetail.VoidPackageBtnVisibility = /*(transitAftersaleOrder.warehouse_status == null || transitAftersaleOrder.warehouse_status == 0 || transitAftersaleOrder.warehouse_status == 1 || transitAftersaleOrder.warehouse_status == 3) &&*/
transitAftersaleOrder.order_void_status != 1 ? Visibility.Visible : Visibility.Collapsed; /* 作废退货包裹 */
//transitDetail.VoidPackageBtnVisibility = Visibility.Visible;
// 售后表没有拒收和拒收状态功能
// 售后表没有拦截和拦截状态功能
// 主表或者额外包裹表的售后状态在主表显示
detailList.Add(transitDetail);
}
catch (Exception ex)
{
}
}
return detailList;
}
/// <summary>
/// 获取额外包裹对应信息列表
/// </summary>
/// <returns></returns>
List<oms_wei_order_item_transit_detail_info> GetOrderItemTransitExtraList()
{
if (OrderItem == null || OrderItem.ItemOrder == null)
{
return new List<oms_wei_order_item_transit_detail_info>();
}
List<oms_wei_order_item_transit_detail_info> detailList = new List<oms_wei_order_item_transit_detail_info>();
foreach (var transitExtraOrder in OrderItem.ItemTransitExtraOrders ?? new List<oms_wei_transfer_extra_package>())
{
try
{
var transitOrder = OrderItem.ItemTransitOrders?.FirstOrDefault(t => t.order_code == transitExtraOrder.order_code);
var transitDetail = new oms_wei_order_item_transit_detail_info()
{
oms_wei_order_item_info = OrderItem,
oms_wei_transfer_extra_package = transitExtraOrder, // 额外包裹
ShopName = OrderItem.ItemOrder.shop_name,
TransitTypeStr = "额外包裹",
OrderCode = transitExtraOrder.order_code + " / " + transitExtraOrder.batchId,
SourceCode = transitOrder?.random_code,
WxOrderId = transitExtraOrder.order_no,
WxOrderSkuId = transitOrder?.order_sku_id,
WxOrderThumbImg = OrderItem.thumb_img,
WxOrderCreateTime = OrderItem.ItemOrder.CreateDateTime,
TransitAddTimeStr = transitExtraOrder.created_time == null ? "" : transitExtraOrder.created_time.Value.ToString("yyyy-MM-dd HH:mm:ss"),
OutOrderId = transitOrder?.out_order_no,
OutBuyerName = transitOrder?.OutOrderBuyerStr,
UpperWaybill = (transitExtraOrder.logistics_code + "-" + transitExtraOrder.logistics_express_code).Trim('-'),
DownWaybill = (transitExtraOrder.real_logistics_code + "-" + transitExtraOrder.real_logistics_express_code).Trim('-'),
BuyRefundStatus = transitOrder.refund_status,
CreateTime = transitExtraOrder.created_time,
PickUpTime = transitExtraOrder.pickup_time,
InboundTime = transitExtraOrder.inbound_time,
OutboundTime = transitExtraOrder.outbound_time,
WarehouseId = transitOrder?.platform,
WarehouseName = TransitWarehouseData.dicWarehouseIdName.ContainsKey(transitOrder?.platform) ? TransitWarehouseData.dicWarehouseIdName[transitOrder?.platform] : transitOrder?.platform,
ShelfCodeStr = transitExtraOrder.location_code,
ShelfTimeStr = transitExtraOrder.location_write_time == null ? "" : transitExtraOrder.location_write_time.Value.ToString("yyyy-MM-dd HH:mm:ss"),
};
if (!transitDetail.OutOrderId.StartsWith("tb_"))
transitDetail.OutBuyerId = GlobalConfig.PDDBuyerLoginList.FirstOrDefault(b => b.buyer_id == transitOrder?.buyer_account)?.buyer_id ?? "";
else
transitDetail.OutBuyerId = GlobalConfig.TaobaoBuyerLoginList.FirstOrDefault(b => b.buyer_id == transitOrder?.buyer_account)?.buyer_id ?? "";
// 额外包裹处理状态,0 未使用,1 已创建,2 创建失败
if (transitExtraOrder.transfer_warehouse_status == 0)
transitDetail.TransitStatus = "未使用";
if (transitExtraOrder.transfer_warehouse_status == 1)
transitDetail.TransitStatus = "已创建";
else if (transitExtraOrder.transfer_warehouse_status == 2)
transitDetail.TransitStatus = "创建失败";
else if (transitExtraOrder.transfer_warehouse_status == 3)
transitDetail.TransitStatus = "处理中";
// 额外包裹入库状态 1=入库 2=出库
if (transitExtraOrder.warehouse_status == null || transitExtraOrder.warehouse_status == 0)
transitDetail.WarehouseStatus = "未入库";
else if (transitExtraOrder.warehouse_status == 1)
transitDetail.WarehouseStatus = "已入库";
else if (transitExtraOrder.warehouse_status == 2)
transitDetail.WarehouseStatus = "已出库";
else if (transitExtraOrder.warehouse_status == 3)
transitDetail.WarehouseStatus = "已拦截到仓";
// 额外包裹作废状态
if (transitExtraOrder.order_void_status == 1)
transitDetail.TransitVoidStatus = "已作废";
//else if (transitExtraOrder.order_void_status == 2)
// transitDetail.TransitVoidStatus = "作废失败";
if (transitExtraOrder?.has_reject == 1)
transitDetail.TransitRejectStatus = "已申请拒收";
if (transitExtraOrder?.has_reject == 2)
transitDetail.TransitRejectStatus = "申请失败";
if (transitExtraOrder?.has_reject == 3)
transitDetail.TransitRejectStatus = "申请成功";
if (transitExtraOrder?.has_reject == 5)
transitDetail.TransitRejectStatus = "已取消拒收";
if (transitExtraOrder?.has_reject == 99)
transitDetail.TransitRejectStatus = "拒收成功";
// 额外包裹拦截状态暂时没有,待补充
var wayBillId = transitExtraOrder.logistics_express_code ?? transitExtraOrder.real_logistics_express_code;
var transitAfterSaleOrder = /* 取未作废的退货包裹,如果取不到,就取第一个退货包裹 */
OrderItem.ItemTransitOrderAfterSales.FirstOrDefault(a => a.order_code == transitExtraOrder.order_code && a.refund_waybill == wayBillId && a.order_void_status != 1 && a.pack_type == 2) ??
OrderItem.ItemTransitOrderAfterSales.FirstOrDefault(a => a.order_code == transitExtraOrder.order_code && a.refund_waybill == wayBillId && a.pack_type == 2);
if (transitAfterSaleOrder != null)
transitDetail.TransitReturnStatus = "已申请拦截";
if (transitAfterSaleOrder != null && transitAfterSaleOrder.order_void_status == 1)
transitDetail.TransitReturnStatus = "拦截作废";
if (transitAfterSaleOrder != null && transitExtraOrder.intercept_return_status == 1 || !string.IsNullOrEmpty(transitAfterSaleOrder?.downstream_waybill))
transitDetail.TransitReturnStatus = "拦截成功";
else if (transitAfterSaleOrder != null && transitExtraOrder.intercept_return_status == 2)
transitDetail.TransitReturnStatus = "拦截失败";
//transitDetail.VoidPackageBtnVisibility = !(transitDetail.InboundTime > DateTime.MinValue) && transitExtraOrder.order_void_status != 1 ? Visibility.Visible : Visibility.Collapsed; /* 作废额外包裹 */
//transitDetail.ReturnPackageBtnVisibility = transitDetail.InboundTime > DateTime.MinValue && !(transitDetail.OutboundTime > DateTime.MinValue) &&
// transitExtraOrder.pack_type == "1" && !OrderItem.ItemTransitOrderAfterSales.Any(af => af.pack_type == 2 && af.order_code == transitDetail.OrderCode && af.order_void_status != 1) ?
// Visibility.Visible : Visibility.Collapsed; /* 退货包裹按钮 */
//transitDetail.InterceptPackageBtnVisibility = transitDetail.OutboundTime > DateTime.MinValue &&
// transitExtraOrder.pack_type == "1" && !OrderItem.ItemTransitOrderAfterSales.Any(af => af.pack_type == 2 && af.order_code == transitDetail.OrderCode && af.order_void_status != 1) ?
// Visibility.Visible : Visibility.Collapsed; /* 拦截退货包裹按钮 */
transitDetail.VoidPackageBtnVisibility = (transitExtraOrder.warehouse_status == null || transitExtraOrder.warehouse_status == 0 || transitExtraOrder.warehouse_status == 1 || transitExtraOrder.warehouse_status == 3) &&
transitExtraOrder.order_void_status != 1 ? Visibility.Visible : Visibility.Collapsed; /* 作废额外包裹 */
// 额外包裹在仓库只能作废,出仓以后才能拦截退回
//transitDetail.ReturnPackageBtnVisibility = (transitExtraOrder.warehouse_status == 1 || transitExtraOrder.warehouse_status == 3 || !transitExtraOrder.location_code.IsNullOrEmpty()) &&
// transitExtraOrder.pack_type == "2" && !OrderItem.ItemTransitOrderAfterSales.Any(af => af.pack_type == 2 && af.order_code == transitDetail.OrderCode && af.order_void_status != 1) ?
// Visibility.Visible : Visibility.Collapsed; /* 退货包裹按钮 */
transitDetail.InterceptPackageBtnVisibility = (transitExtraOrder.warehouse_status == 2 || transitExtraOrder.outbound_time > DateTime.MinValue || !transitExtraOrder.real_logistics_express_code.IsNullOrEmpty()) &&
transitExtraOrder.pack_type == "2" && !OrderItem.ItemTransitOrderAfterSales.Any(af => af.pack_type == 2 && af.order_code == transitDetail.OrderCode && af.order_void_status != 1) ?
Visibility.Visible : Visibility.Collapsed; /* 拦截退货包裹按钮 */
//transitDetail.VoidPackageBtnVisibility = Visibility.Visible; /* 作废额外包裹 */
//transitDetail.ReturnPackageBtnVisibility = Visibility.Visible; /* 退货包裹按钮 */
//transitDetail.InterceptPackageBtnVisibility = Visibility.Visible; /* 拦截退货包裹按钮 */
detailList.Add(transitDetail);
}
catch (Exception ex)
{
}
}
return detailList;
}
public static string GetTransitBuyerRefundStatusStr(oms_wei_order_item_info orderItem, oms_wei_external_procurement_log_info itemTransitOrder)
{
if (!string.IsNullOrEmpty(itemTransitOrder?.refund_status))
{
var pddBuyerAfterSale = orderItem.PddBuyerAfterSales.FirstOrDefault(af => af.orderSn == itemTransitOrder.out_order_no);
// 店铺售后又取消的,如果是买手还没申请售后,不显示需手动申请售后文字
if (itemTransitOrder.refund_status.Contains("需手动申请售后") && orderItem.refund_status <= 1)
return "";
// 显示售后金额(如果有)
else if (itemTransitOrder.refund_status.EndsWith("买手退款成功"))
{
if (pddBuyerAfterSale?.refundAmount != null)
return itemTransitOrder.refund_status + "(¥" + pddBuyerAfterSale.refundAmount * 0.01m + ")";
else
return itemTransitOrder.refund_status + "(退款金额待获取)";
}
else if (!itemTransitOrder.refund_status.Contains("需手动申请售后") && !itemTransitOrder.refund_status.Contains("已超过可申请售后的时间"))
return "已申请售后 " + itemTransitOrder.refund_status.Replace("申请收到,", "");
else
return itemTransitOrder.refund_status;
}
return "";
}
}
/// <summary>
/// 包裹相关信息
/// </summary>
public class oms_wei_order_item_transit_detail_info : PropertyNotifyObject
{
public oms_wei_order_item_transit_detail_info()
{
Opacity = 1m;
VoidPackageBtnVisibility = Visibility.Collapsed;
RejectPackageBtnVisibility = Visibility.Collapsed;
ReturnPackageBtnVisibility = Visibility.Collapsed;
InterceptPackageBtnVisibility = Visibility.Collapsed;
ExtraPackagesBtnVisibility = Visibility.Collapsed;
}
public oms_wei_order_item_info oms_wei_order_item_info { get; set; }
public oms_wei_external_procurement_log_info oms_wei_external_procurement_log_info { get; set; } /* 发货包裹 */
public oms_wei_external_procurement_after_sale_info oms_wei_external_procurement_after_sale_info { get; set; } /* 退货包裹 */
public oms_wei_transfer_extra_package oms_wei_transfer_extra_package { get; set; } /* 额外包裹 */
public decimal Opacity
{
get { return this.GetValue(x => x.Opacity); }
set { this.SetValue(x => x.Opacity, value); }
}
public string ShopName
{
get { return this.GetValue(x => x.ShopName); }
set { this.SetValue(x => x.ShopName, value); }
}
/// <summary> 仓库类型: 发货包裹 退货包裹 额外包裹 </summary>
public string TransitTypeStr
{
get { return this.GetValue(x => x.TransitTypeStr); }
set
{
this.SetValue(x => x.TransitTypeStr, value);
TransitTypeStrColor = GlobalConfig.PurpleBrush;
if (value == "退货包裹")
TransitTypeStrColor = GlobalConfig.RedBrush;
else if (value == "额外包裹")
TransitTypeStrColor = GlobalConfig.GreenBrush;
}
}
public SolidColorBrush TransitTypeStrColor
{
get { return this.GetValue(x => x.TransitTypeStrColor); }
set { this.SetValue(x => x.TransitTypeStrColor, value); }
}
/// <summary> 仓库订单号 </summary>
public string OrderCode
{
get { return this.GetValue(x => x.OrderCode); }
set { this.SetValue(x => x.OrderCode, value); }
}
public string SourceCode
{
get { return this.GetValue(x => x.SourceCode); }
set { this.SetValue(x => x.SourceCode, value); }
}
public string WarehouseId
{
get { return this.GetValue(x => x.WarehouseId); }
set { this.SetValue(x => x.WarehouseId, value); }
}
public string WarehouseName
{
get { return this.GetValue(x => x.WarehouseName); }
set { this.SetValue(x => x.WarehouseName, value); }
}
public DateTime? CreateTime
{
get { return this.GetValue(x => x.CreateTime); }
set { this.SetValue(x => x.CreateTime, value); CreateTimeStr = value == null ? null : value.Value.ToString("yyyy-MM-dd HH:mm:ss"); }
}
public string CreateTimeStr
{
get { return this.GetValue(x => x.CreateTimeStr); }
set { this.SetValue(x => x.CreateTimeStr, value); }
}
/// <summary> 取号时间((中转单)创建时间) </summary>
public DateTime? PickUpTime
{
get { return this.GetValue(x => x.PickUpTime); }
set { this.SetValue(x => x.PickUpTime, value); PickUpTimeStr = value == null ? "" : value.Value.ToString("yyyy-MM-dd HH:mm:ss"); }
}
public string PickUpTimeStr
{
get { return this.GetValue(x => x.PickUpTimeStr); }
set { this.SetValue(x => x.PickUpTimeStr, value); }
}
/// <summary> 微信订单号(交易单号) </summary>
public string WxOrderId
{
get { return this.GetValue(x => x.WxOrderId); }
set { this.SetValue(x => x.WxOrderId, value); }
}
public string WxOrderSkuId
{
get { return this.GetValue(x => x.WxOrderSkuId); }
set { this.SetValue(x => x.WxOrderSkuId, value); }
}
/// <summary> 微信订单创建时间(支付时间) </summary>
public DateTime WxOrderCreateTime
{
get { return this.GetValue(x => x.WxOrderCreateTime); }
set { this.SetValue(x => x.WxOrderCreateTime, value); WxOrderCreateTimeStr = value.ToString("yyyy-MM-dd HH:mm:ss"); }
}
public string WxOrderCreateTimeStr
{
get { return this.GetValue(x => x.WxOrderCreateTimeStr); }
set { this.SetValue(x => x.WxOrderCreateTimeStr, value); }
}
/// <summary>
/// 添加记录时间
/// </summary>
public string TransitAddTimeStr
{
get { return this.GetValue(x => x.TransitAddTimeStr); }
set { this.SetValue(x => x.TransitAddTimeStr, value); }
}
public string WxOrderThumbImg
{
get { return this.GetValue(x => x.WxOrderThumbImg); }
set { this.SetValue(x => x.WxOrderThumbImg, value); }
}
public string OutOrderId
{
get { return this.GetValue(x => x.OutOrderId); }
set { this.SetValue(x => x.OutOrderId, value); }
}
public string OutBuyerId
{
get { return this.GetValue(x => x.OutBuyerId); }
set { this.SetValue(x => x.OutBuyerId, value); }
}
public string OutBuyerName
{
get { return this.GetValue(x => x.OutBuyerName); }
set { this.SetValue(x => x.OutBuyerName, value); }
}
/// <summary> 中转状态 </summary>
public string TransitStatus
{
get { return this.GetValue(x => x.TransitStatus); }
set { this.SetValue(x => x.TransitStatus, value); }
}
/// <summary> 仓库状态文本: 未入库 已入库 已出库 拦截到仓</summary>
public string WarehouseStatus
{
get { return this.GetValue(x => x.WarehouseStatus); }
set { this.SetValue(x => x.WarehouseStatus, value); }
}
/// <summary> 作废状态 </summary>
public string TransitVoidStatus
{
get { return this.GetValue(x => x.TransitVoidStatus); }
set { this.SetValue(x => x.TransitVoidStatus, value); if (value == "已作废") this.Opacity = 0.6m; }
}
/// <summary> 拒收状态 </summary>
public string TransitRejectStatus
{
get { return this.GetValue(x => x.TransitRejectStatus); }
set { this.SetValue(x => x.TransitRejectStatus, value); }
}
/// <summary> 拦截退回状态 </summary>
public string TransitReturnStatus
{
get { return this.GetValue(x => x.TransitReturnStatus); }
set { this.SetValue(x => x.TransitReturnStatus, value); }
}
/// <summary> 买手退货状态 </summary>
public string BuyRefundStatus
{
get { return this.GetValue(x => x.BuyRefundStatus); }
set { this.SetValue(x => x.BuyRefundStatus, value); }
}
public string UpperWaybill
{
get { return this.GetValue(x => x.UpperWaybill); }
set { this.SetValue(x => x.UpperWaybill, value); UpperWaybillVisibility = string.IsNullOrEmpty(value) ? Visibility.Collapsed : Visibility.Visible; }
}
public Visibility UpperWaybillVisibility
{
get { return this.GetValue(x => x.UpperWaybillVisibility); }
private set { this.SetValue(x => x.UpperWaybillVisibility, value); }
}
public string DownWaybill
{
get { return this.GetValue(x => x.DownWaybill); }
set { this.SetValue(x => x.DownWaybill, value); DownWaybillVisibility = string.IsNullOrEmpty(value) ? Visibility.Collapsed : Visibility.Visible; }
}
public Visibility DownWaybillVisibility
{
get { return this.GetValue(x => x.DownWaybillVisibility); }
set { this.SetValue(x => x.DownWaybillVisibility, value); }
}
public DateTime? InboundTime
{
get { return this.GetValue(x => x.InboundTime); }
set { this.SetValue(x => x.InboundTime, value); InboundTimeStr = value == null ? "" : value.Value.ToString("yyyy-MM-dd HH:mm:ss"); }
}
public string InboundTimeStr
{
get { return this.GetValue(x => x.InboundTimeStr); }
set { this.SetValue(x => x.InboundTimeStr, value); }
}
public DateTime? OutboundTime
{
get { return this.GetValue(x => x.OutboundTime); }
set { this.SetValue(x => x.OutboundTime, value); OutboundTimeStr = value == null ? "" : value.Value.ToString("yyyy-MM-dd HH:mm:ss"); }
}
public string OutboundTimeStr
{
get { return this.GetValue(x => x.OutboundTimeStr); }
set { this.SetValue(x => x.OutboundTimeStr, value); }
}
public string ShelfCodeStr
{
get { return this.GetValue(x => x.ShelfCodeStr); }
set { this.SetValue(x => x.ShelfCodeStr, value); }
}
public string ShelfTimeStr
{
get { return this.GetValue(x => x.ShelfTimeStr); }
set { this.SetValue(x => x.ShelfTimeStr, value); }
}
public Visibility VoidPackageBtnVisibility
{
get { return this.GetValue(x => x.VoidPackageBtnVisibility); }
set { this.SetValue(x => x.VoidPackageBtnVisibility, value); }
}
public Visibility RejectPackageBtnVisibility
{
get { return this.GetValue(x => x.RejectPackageBtnVisibility); }
set { this.SetValue(x => x.RejectPackageBtnVisibility, value); }
}
/// <summary>
/// 直接退回包裹
/// </summary>
public Visibility ReturnPackageBtnVisibility
{
get { return this.GetValue(x => x.ReturnPackageBtnVisibility); }
set { this.SetValue(x => x.ReturnPackageBtnVisibility, value); }
}
/// <summary>
/// 拦截退回包裹
/// </summary>
public Visibility InterceptPackageBtnVisibility
{
get { return this.GetValue(x => x.InterceptPackageBtnVisibility); }
set { this.SetValue(x => x.InterceptPackageBtnVisibility, value); }
}
public Visibility ExtraPackagesBtnVisibility
{
get { return this.GetValue(x => x.ExtraPackagesBtnVisibility); }
set { this.SetValue(x => x.ExtraPackagesBtnVisibility, value); }
}
public string TransitDetailRefundStatusStr
{
get { return this.GetValue(x => x.TransitDetailRefundStatusStr); }
set
{
this.SetValue(x => x.TransitDetailRefundStatusStr, value);
TransitDetailRefundStatusStrVisibility = string.IsNullOrWhiteSpace(value) ? Visibility.Collapsed : Visibility.Visible;
if (value.Contains("退款成功"))
TransitDetailRefundStatusBackColor = GlobalConfig.GreenBrush;
else if (value.Contains("需手动申请售后") || value.Contains("已超过可申请售后的时间") || value.Contains("退款失败"))
TransitDetailRefundStatusBackColor = GlobalConfig.RedBrush;
else
TransitDetailRefundStatusBackColor = GlobalConfig.LightOrangeBrush;
}
}
public Visibility TransitDetailRefundStatusStrVisibility
{
get { return this.GetValue(x => x.TransitDetailRefundStatusStrVisibility); }
set { this.SetValue(x => x.TransitDetailRefundStatusStrVisibility, value); }
}
/// <summary> 中转仓买手售后字段文字显示背景颜色 </summary>
public SolidColorBrush TransitDetailRefundStatusBackColor
{
get { return this.GetValue(x => x.TransitDetailRefundStatusBackColor); }
set { this.SetValue(x => x.TransitDetailRefundStatusBackColor, value); }
}
}
@@ -9,25 +9,58 @@ namespace AllBase.Model.DBModel;
public class oms_wei_transfer_extra_package : PropertyNotifyObject public class oms_wei_transfer_extra_package : PropertyNotifyObject
{ {
public long id { get; set; } // 主键ID /// <summary>
public string batchId { get; set; } // 新订单号 /// 主键ID
public string order_no { get; set; } // 平台订单号 /// </summary>
public string buyer_account { get; set; } // '买家账号', public long id { get; set; }
public int? out_amount { get; set; } // '外部金额(分)', /// <summary>
public string purchaser_note { get; set; } // '采购人备注' /// 新订单号
public string logistics_code { get; set; } // '快递公司', /// </summary>
public string logistics_express_code { get; set; } // '快递单号', public string batchId { get; set; }
public string real_logistics_code // '出库快递公司', /// <summary>
/// 平台订单号
/// </summary>
public string order_no { get; set; }
/// <summary>
/// 买家账号
/// </summary>
public string buyer_account { get; set; }
/// <summary>
/// 外部金额(分)
/// </summary>
public int? out_amount { get; set; }
/// <summary>
/// 采购人备注
/// </summary>
public string purchaser_note { get; set; }
/// <summary>
/// 快递公司
/// </summary>
public string logistics_code { get; set; }
/// <summary>
/// 快递单号
/// </summary>
public string logistics_express_code { get; set; }
/// <summary>
/// 出库快递公司
/// </summary>
public string real_logistics_code
{ {
get { return this.GetValue(x => x.real_logistics_code); } get { return this.GetValue(x => x.real_logistics_code); }
set { this.SetValue(x => x.real_logistics_code, value); } set { this.SetValue(x => x.real_logistics_code, value); }
} }
public string real_logistics_express_code // '出库单号', /// <summary>
/// 出库单号
/// </summary>
public string real_logistics_express_code
{ {
get { return this.GetValue(x => x.real_logistics_express_code); } get { return this.GetValue(x => x.real_logistics_express_code); }
set { this.SetValue(x => x.real_logistics_express_code, value); } set { this.SetValue(x => x.real_logistics_express_code, value); }
} }
public string refund_status { get; set; } // '买手退款状态', /// <summary>
/// 买手退款状态
/// </summary>
public string refund_status { get; set; }
public DateTime? pickup_time { get; set; } // '取号时间', public DateTime? pickup_time { get; set; } // '取号时间',
public int? transfer_warehouse_status { get; set; } // '中转仓状态:0 未使用,1 已创建,2 创建失败', public int? transfer_warehouse_status { get; set; } // '中转仓状态:0 未使用,1 已创建,2 创建失败',
public string raw_message { get; set; } // '原始消息/请求体', public string raw_message { get; set; } // '原始消息/请求体',
@@ -44,8 +77,55 @@ public class oms_wei_transfer_extra_package : PropertyNotifyObject
public int? postage { get; set; } // '订单初始费用(分)', public int? postage { get; set; } // '订单初始费用(分)',
public int? retry_acquire_success { get; set; } // '重试取号是否成功 0=未尝试/未重试 1=成功 2=失败', public int? retry_acquire_success { get; set; } // '重试取号是否成功 0=未尝试/未重试 1=成功 2=失败',
public int? over_weight_fee { get; set; } // '超重费用', public int? over_weight_fee { get; set; } // '超重费用',
public string pack_type { get; set; } // '中转仓额外包裹类型 1商品2额外3礼品4退货', /// <summary>
/// 中转仓额外包裹类型 1商品2额外3礼品4退货
/// </summary>
public string pack_type { get; set; }
public DateTime? rejected_time { get; set; } // '拒收时间', public DateTime? rejected_time { get; set; } // '拒收时间',
public int? has_reject { get; set; } // DEFAULT NULL, public int? has_reject { get; set; } // DEFAULT NULL,
public DateTime? blocked_arrival_time { get; set; } public DateTime? blocked_arrival_time { get; set; }
/// <summary>
/// 货架号
/// </summary>
public string location_code { get; set; }
/// <summary>
/// 货架写入时间
/// </summary>
public DateTime? location_write_time { get; set; }
/// <summary>
/// 外采单号
/// </summary>
public string out_order_no { get; set; }
/// <summary>
/// 商品skuId
/// </summary>
public string out_sku_id { get; set; }
/// <summary>
/// 拦截退回状态:0未处理,1已退回成功,2退回失败(或其它业务码)
/// </summary>
public int? intercept_return_status { get; set; }
/// <summary>
/// 拦截退回时间
/// </summary>
public DateTime? intercept_return_time { get; set; }
/// <summary>
/// 拦截退回操作信息(回调/失败信息/备注等)
/// </summary>
public string intercept_return_info { get; set; }
/// <summary>
/// 拦截改地址状态:0未处理,1修改成功,2修改失败(或其它业务码)
/// </summary>
public int? intercept_address_status { get; set; }
/// <summary>
/// 拦截改地址时间
/// </summary>
public DateTime? intercept_address_time { get; set; }
/// <summary>
/// 拦截改地址操作信息(回调/失败信息/备注等)
/// </summary>
public string intercept_address_info { get; set; }
/// <summary>
/// 是否有退货:0 无退货,1 有退货
/// </summary>
public int? has_return { get; set; }
} }
+33 -15
View File
@@ -69,23 +69,41 @@ namespace AllBase.Model.DBModel
public enum EnumOrderPaymentType public enum EnumOrderPaymentType
{ {
充值 = 1, //变动类型,1:充值,2:采购花费,3:产品退款到账,4:运费退款到账,5:采购收款,6:产品退款扣除,7:运费退款扣除, 16:礼物单话费,20:中转仓扣费支出,23:中转仓退款收入,24:中转仓超重扣费支出,26 退货包裹扣费支出30支付宝充值;31 云仓退货支出33 分销退货包裹超重花费32 分销退货包裹发货花费退款34 礼物单退费35 额外包裹创建36 额外包裹作废37 额外订单超重支出38 退货包裹作废返还55 同步物流支出
//采购花费 = 2,
//产品退款到账 = 3, 充值 = 1,
//运费退款到账 = 4, //采购花费 = 2,
//采购收款 = 5, //产品退款到账 = 3,
//产品退款扣除 = 6, //运费退款到账 = 4,
//运费退款扣除 = 7, //采购收款 = 5,
礼物单支出 = 16, //产品退款扣除 = 6,
中转仓扣费支出 = 20, //运费退款扣除 = 7,
中转仓作废收入 = 23, 礼物单支出 = 16,
中转仓超重支出 = 24,
发货包裹扣费支出 = 20,
发货包裹作废返还 = 23,
发货包裹超重支出 = 24,
退货包裹扣费支出 = 26, 退货包裹扣费支出 = 26,
支付宝在线充值 = 30, 退货包裹超重支出 = 28,
云仓退货支出 = 31, 退货包裹作废返还 = 38,
支付宝在线充值 = 30,
退货仓退货支出 = 31,
退货仓作废返还 = 32,
退货仓超重支出 = 33,
礼物单退费 = 34, 礼物单退费 = 34,
额外订单创建 = 35,
额外订单作废 = 36, 额外包裹创建支出 = 35,
额外包裹作废返还 = 36,
额外包裹超重支出 = 37,
额外包裹退货拦截创建支出 = 39,
额外包裹退货拦截作废返还 = 40,
额外包裹退货拦截超重支出 = 41,
同步物流 = 55, 同步物流 = 55,
} }
+18 -18
View File
@@ -185,13 +185,13 @@ namespace AllBase.Model.Result
get { return this.GetValue(x => x.thumbUrl); } get { return this.GetValue(x => x.thumbUrl); }
set { this.SetValue(x => x.thumbUrl, value); } set { this.SetValue(x => x.thumbUrl, value); }
} // "https://t00img.yangkeduo.com/t10img/images/2018-06-09/5c7746a3608e75a2b65926f4ed0f34cb.jpeg", } // "https://t00img.yangkeduo.com/t10img/images/2018-06-09/5c7746a3608e75a2b65926f4ed0f34cb.jpeg",
public int? initQuantity { get; set; } // 0, //public int? initQuantity { get; set; } // 0,
public int? quantity { get; set; } // 1000, //public int? quantity { get; set; } // 1000,
public int? limitQuantity { get; set; } // 999999, //public int? limitQuantity { get; set; } // 999999,
public int? soldQuantity { get; set; } // 0, //public int? soldQuantity { get; set; } // 0,
public int? hotSale { get; set; } // 1, //public int? hotSale { get; set; } // 1,
public int? defaultQuantity { get; set; } // 100, //public int? defaultQuantity { get; set; } // 100,
public int? isOnsale { get; set; } // 1, //public int? isOnsale { get; set; } // 1,
public string spec { get; set; } // "677094835", public string spec { get; set; } // "677094835",
[JsonIgnore] [JsonIgnore]
public string SpecNameStr public string SpecNameStr
@@ -216,17 +216,17 @@ namespace AllBase.Model.Result
public string normalPrice { get; set; } // "14.5", public string normalPrice { get; set; } // "14.5",
public string groupPrice { get; set; } // "13.5", public string groupPrice { get; set; } // "13.5",
public int? oldGroupPrice { get; set; } // 1350, public int? oldGroupPrice { get; set; } // 1350,
public int? marketPrice { get; set; } // 0, //public int? marketPrice { get; set; } // 0,
public int? weight { get; set; } // 2500, //public int? weight { get; set; } // 2500,
public List<yellowLabelListInfo> yellowLabelList { get; set; } //public List<yellowLabelListInfo> yellowLabelList { get; set; }
public int? previewPriority { get; set; } // 0, //public int? previewPriority { get; set; } // 0,
public int? startTime { get; set; } // 0, //public int? startTime { get; set; } // 0,
public int? endTime { get; set; } // 0, //public int? endTime { get; set; } // 0,
public int? staticLimitQuantity { get; set; } // 999999, //public int? staticLimitQuantity { get; set; } // 999999,
public string attribute { get; set; } // "{\"skuPreSaleTime\":0}", //public string attribute { get; set; } // "{\"skuPreSaleTime\":0}",
public string normalSavePrice { get; set; } // "1", //public string normalSavePrice { get; set; } // "1",
public long? skuID { get; set; } // 28790184768, //public long? skuID { get; set; } // 28790184768,
public string skuExpansionPrice { get; set; } // "0" //public string skuExpansionPrice { get; set; } // "0"
} }
public class yellowLabelListInfo public class yellowLabelListInfo
@@ -267,6 +267,7 @@ namespace AllBase.Model.Result
var detailPage = listItemExtraVO.navToDetailPageUrl; var detailPage = listItemExtraVO.navToDetailPageUrl;
return BaseRegex.GetStringQuery(ref detailPage, "order_sn"); return BaseRegex.GetStringQuery(ref detailPage, "order_sn");
} }
set { }
} }
public int? tbOrderDate { get; set; } public int? tbOrderDate { get; set; }
public int? orderDate { get { return tbOrderDate ?? orderSn.Split('-').FirstOrDefault().ParseToInt(); } } public int? orderDate { get { return tbOrderDate ?? orderSn.Split('-').FirstOrDefault().ParseToInt(); } }
+31
View File
@@ -0,0 +1,31 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Runtime.InteropServices;
using System.Text;
using System.Threading.Tasks;
namespace AllBase.Util;
public class ChineseStringConverter
{
private const int LCMAP_SIMPLIFIED_CHINESE = 0x02000000;
private const int LCMAP_TRADITIONAL_CHINESE = 0x04000000;
[DllImport("kernel32", CharSet = CharSet.Auto, SetLastError = true)]
private static extern int LCMapString(int Locale, int dwMapFlags, string lpSrcStr, int cchSrc, [Out] string lpDestStr, int cchDest);
public static string ToSimplified(string source)
{
string target = new string(' ', source.Length);
LCMapString(0x0800, LCMAP_SIMPLIFIED_CHINESE, source, source.Length, target, source.Length);
return target;
}
public static string ToTraditional(string source)
{
string target = new string(' ', source.Length);
LCMapString(0x0800, LCMAP_TRADITIONAL_CHINESE, source, source.Length, target, source.Length);
return target;
}
}
@@ -2,6 +2,7 @@
using System.Collections.Generic; using System.Collections.Generic;
using System.Net.Http; using System.Net.Http;
using System.Text; using System.Text;
using WxOrder.Framework.Helpers;
namespace LaunchDarkly.EventSource namespace LaunchDarkly.EventSource
{ {
@@ -114,6 +115,7 @@ namespace LaunchDarkly.EventSource
/// This is never null; if logging is not configured, it will be <c>LaunchDarkly.Logging.Logs.None</c>. /// This is never null; if logging is not configured, it will be <c>LaunchDarkly.Logging.Logs.None</c>.
/// </remarks> /// </remarks>
/// <seealso cref="ConfigurationBuilder.Logger(Logger)"/> /// <seealso cref="ConfigurationBuilder.Logger(Logger)"/>
public ILogger Logger { get; }
/// <summary> /// <summary>
/// The maximum amount of time to wait before attempting to reconnect. /// The maximum amount of time to wait before attempting to reconnect.
@@ -174,13 +176,14 @@ namespace LaunchDarkly.EventSource
{ {
Uri = builder._uri; Uri = builder._uri;
var logger = builder._logger;
BackoffResetThreshold = builder._backoffResetThreshold; BackoffResetThreshold = builder._backoffResetThreshold;
HttpClient = builder._httpClient; HttpClient = builder._httpClient;
HttpMessageHandler = (builder._httpClient != null) ? null : builder._httpMessageHandler; HttpMessageHandler = (builder._httpClient != null) ? null : builder._httpMessageHandler;
InitialRetryDelay = builder._initialRetryDelay; InitialRetryDelay = builder._initialRetryDelay;
LastEventId = builder._lastEventId; LastEventId = builder._lastEventId;
Logger = logger;
MaxRetryDelay = builder._maxRetryDelay; MaxRetryDelay = builder._maxRetryDelay;
Method = builder._method; Method = builder._method;
PreferDataAsUtf8Bytes = builder._preferDataAsUtf8Bytes; PreferDataAsUtf8Bytes = builder._preferDataAsUtf8Bytes;
@@ -3,6 +3,7 @@ using System.Collections.Generic;
using System.Net.Http; using System.Net.Http;
using System.Text; using System.Text;
using System.Threading; using System.Threading;
using WxOrder.Framework.Helpers;
namespace LaunchDarkly.EventSource namespace LaunchDarkly.EventSource
{ {
@@ -30,6 +31,7 @@ namespace LaunchDarkly.EventSource
internal TimeSpan _initialRetryDelay = Configuration.DefaultInitialRetryDelay; internal TimeSpan _initialRetryDelay = Configuration.DefaultInitialRetryDelay;
internal TimeSpan _backoffResetThreshold = Configuration.DefaultBackoffResetThreshold; internal TimeSpan _backoffResetThreshold = Configuration.DefaultBackoffResetThreshold;
internal string _lastEventId; internal string _lastEventId;
internal ILogger _logger;
internal IDictionary<string, string> _requestHeaders = new Dictionary<string, string>(); internal IDictionary<string, string> _requestHeaders = new Dictionary<string, string>();
internal HttpMessageHandler _httpMessageHandler; internal HttpMessageHandler _httpMessageHandler;
internal HttpClient _httpClient; internal HttpClient _httpClient;
@@ -230,45 +232,6 @@ namespace LaunchDarkly.EventSource
return this; return this;
} }
/// <summary>
/// Sets the logging implementation to be used for all EventSource log output.
/// </summary>
/// <remarks>
/// <para>
/// This uses the <c>ILogAdapter</c> abstraction from the <c>LaunchDarkly.Logging</c> library,
/// which provides several basic implementations such as <c>Logs.ToConsole</c> and an integration
/// with the .NET Core logging framework. For more about this and about adapters to other logging
/// frameworks, see <a href="https://github.com/launchdarkly/dotnet-logging"><c>LaunchDarkly.Logging</c></a>.
/// </para>
/// <para>
/// <c>LaunchDarkly.Logging</c> defines logging levels of Debug, Info, Warn, and Error. If you do not
/// want detailed Debug-level logging, use the <c>Level()</c> modifier to set a minimum level of Info
/// or above, as shown in the code example (unless you are using an adapter to another logging
/// framework that has its own way of doing log filtering).
/// </para>
/// <para>
/// Log messages will use <see cref="Configuration.DefaultLoggerName"/> as the logger name. If you
/// want to specify a different logger name, use <see cref="Logger(Logging.Logger)"/>.
/// </para>
/// <para>
/// If you don't specify <see cref="LogAdapter(ILogAdapter)"/> or <see cref="Logger(Logging.Logger)"/>,
/// EventSource will not do any logging.
/// </para>
/// </remarks>
/// <example>
/// using LaunchDarkly.Logging;
///
/// // Send log output to the console (standard error), suppressing Debug messages
/// var config = new ConfigurationBuilder(uri).
/// LogAdapter(Logs.ToConsole.Level(LogLevel.Info)).
/// Build();
/// </example>
/// <param name="logAdapter">a <c>LaunchDarkly.Logging.ILogAdapter</c></param>
/// <returns>the builder</returns>
public ConfigurationBuilder LogAdapter()
{
return this;
}
/// <summary> /// <summary>
/// Sets a custom logger to be used for all EventSource log output. /// Sets a custom logger to be used for all EventSource log output.
@@ -297,8 +260,9 @@ namespace LaunchDarkly.EventSource
/// </example> /// </example>
/// <param name="logger">a <c>LaunchDarkly.Logging.Logger</c> instance</param> /// <param name="logger">a <c>LaunchDarkly.Logging.Logger</c> instance</param>
/// <returns>the builder</returns> /// <returns>the builder</returns>
public ConfigurationBuilder Logger() public ConfigurationBuilder Logger(ILogger logger)
{ {
_logger = logger;
return this; return this;
} }
File diff suppressed because it is too large. Load diff
@@ -7,6 +7,7 @@ using System.Net.Http.Headers;
using System.Reflection; using System.Reflection;
using System.Threading; using System.Threading;
using System.Threading.Tasks; using System.Threading.Tasks;
using WxOrder.Framework.Helpers;
using static LaunchDarkly.EventSource.AsyncHelpers; using static LaunchDarkly.EventSource.AsyncHelpers;
@@ -23,6 +24,7 @@ namespace LaunchDarkly.EventSource
private readonly Configuration _configuration; private readonly Configuration _configuration;
private readonly HttpClient _httpClient; private readonly HttpClient _httpClient;
private readonly ILogger _logger;
private const string UserAgentProduct = "DotNetClient"; private const string UserAgentProduct = "DotNetClient";
internal static readonly string UserAgentVersion = ((AssemblyInformationalVersionAttribute)typeof(EventSource) internal static readonly string UserAgentVersion = ((AssemblyInformationalVersionAttribute)typeof(EventSource)
@@ -48,10 +50,11 @@ namespace LaunchDarkly.EventSource
#region Constructors #region Constructors
internal EventSourceService(Configuration configuration, HttpClient httpClient) internal EventSourceService(Configuration configuration, HttpClient httpClient, ILogger logger)
{ {
_configuration = configuration ?? throw new ArgumentNullException(nameof(configuration)); _configuration = configuration ?? throw new ArgumentNullException(nameof(configuration));
_httpClient = httpClient ?? throw new ArgumentNullException(nameof(httpClient)); _httpClient = httpClient ?? throw new ArgumentNullException(nameof(httpClient));
_logger = logger ?? throw new ArgumentNullException(nameof(logger));
} }
#endregion #endregion
@@ -85,16 +88,20 @@ namespace LaunchDarkly.EventSource
CancellationToken cancellationToken CancellationToken cancellationToken
) )
{ {
_logger.Debug(string.Format("Making {0} request to EventSource URI {1}",
_configuration.Method ?? HttpMethod.Get,
_configuration.Uri));
var request = CreateHttpRequestMessage(_configuration.Uri, lastEventId); var request = CreateHttpRequestMessage(_configuration.Uri, lastEventId);
this._configuration.HttpRequestModifier?.Invoke(request); this._configuration.HttpRequestModifier?.Invoke(request);
using (var response = await _httpClient.SendAsync(request, using (var response = await _httpClient.SendAsync(request,
HttpCompletionOption.ResponseHeadersRead, HttpCompletionOption.ResponseHeadersRead,
cancellationToken).ConfigureAwait(false)) cancellationToken).ConfigureAwait(false))
{ {
ValidateResponse(response); _logger.Debug(string.Format("Response status: {0}", (int)response.StatusCode));
ValidateResponse(response);
using (var stream = await response.Content.ReadAsStreamAsync().ConfigureAwait(false)) using (var stream = await response.Content.ReadAsStreamAsync().ConfigureAwait(false))
{ {
@@ -109,10 +116,12 @@ namespace LaunchDarkly.EventSource
if (_configuration.PreferDataAsUtf8Bytes) if (_configuration.PreferDataAsUtf8Bytes)
{ {
_logger.Debug("Reading UTF-8 stream without string conversion");
await ProcessResponseFromUtf8StreamAsync(processResponseLineUTF8, stream, cancellationToken); await ProcessResponseFromUtf8StreamAsync(processResponseLineUTF8, stream, cancellationToken);
} }
else else
{ {
_logger.Debug("Reading stream with string conversion");
using (var reader = new StreamReader(stream, Encoding.UTF8, using (var reader = new StreamReader(stream, Encoding.UTF8,
detectEncodingFromByteOrderMarks: true, bufferSize: ReadBufferSize)) detectEncodingFromByteOrderMarks: true, bufferSize: ReadBufferSize))
{ {
@@ -1,114 +0,0 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
// </auto-generated>
//------------------------------------------------------------------------------
namespace LaunchDarkly.EventSource {
using System;
/// <summary>
/// A strongly-typed resource class, for looking up localized strings, etc.
/// This class was generated by MSBuild using the GenerateResource task.
/// To add or remove a member, edit your .resx file then rerun MSBuild.
/// </summary>
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.Build.Tasks.StronglyTypedResourceBuilder", "15.1.0.0")]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
internal class Resources {
private static global::System.Resources.ResourceManager resourceMan;
private static global::System.Globalization.CultureInfo resourceCulture;
[global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
internal Resources() {
}
/// <summary>
/// Returns the cached ResourceManager instance used by this class.
/// </summary>
[global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
internal static global::System.Resources.ResourceManager ResourceManager {
get {
if (object.ReferenceEquals(resourceMan, null)) {
global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("LaunchDarkly.EventSource.Resources", typeof(Resources).Assembly);
resourceMan = temp;
}
return resourceMan;
}
}
/// <summary>
/// Overrides the current thread's CurrentUICulture property for all
/// resource lookups using this strongly typed resource class.
/// </summary>
[global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
internal static global::System.Globalization.CultureInfo Culture {
get {
return resourceCulture;
}
set {
resourceCulture = value;
}
}
/// <summary>
/// Looks up a localized string similar to Invalid attempt to call Start() while the connection state is {0}.
/// </summary>
internal static string ErrorAlreadyStarted {
get {
return ResourceManager.GetString("ErrorAlreadyStarted", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to HTTP response had no body.
/// </summary>
internal static string ErrorEmptyResponse {
get {
return ResourceManager.GetString("ErrorEmptyResponse", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to Unexpected HTTP status code {0} from server.
/// </summary>
internal static string ErrorHttpStatus {
get {
return ResourceManager.GetString("ErrorHttpStatus", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to Read timeout elapsed with no new data from server; connection may have been silently dropped.
/// </summary>
internal static string ErrorReadTimeout {
get {
return ResourceManager.GetString("ErrorReadTimeout", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to Unexpected HTTP content type &quot;{0}&quot;; should be &quot;text/event-stream&quot;.
/// </summary>
internal static string ErrorWrongContentType {
get {
return ResourceManager.GetString("ErrorWrongContentType", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to Unexpected character encoding {0}; should be UTF-8.
/// </summary>
internal static string ErrorWrongEncoding {
get {
return ResourceManager.GetString("ErrorWrongEncoding", resourceCulture);
}
}
}
}
@@ -0,0 +1,29 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
// </auto-generated>
//------------------------------------------------------------------------------
namespace LaunchDarkly.EventSource
{
using System;
internal class Resources
{
public static string ErrorAlreadyStarted => "Invalid attempt to call Start() while the connection state is {0}";
public static string ErrorEmptyResponse => "HTTP response had no body";
public static string ErrorHttpStatus => "Unexpected HTTP status code {0} from server\t";
public static string ErrorReadTimeout => "Read timeout elapsed with no new data from server; connection may have been silently dropped";
public static string ErrorWrongContentType => "Unexpected HTTP content type \"{0}\"; should be \"text/event-stream\"";
public static string ErrorWrongEncoding => "Unexpected character encoding {0}; should be UTF-8";
}
}
@@ -1,138 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<root>
<!--
Microsoft ResX Schema
Version 2.0
The primary goals of this format is to allow a simple XML format
that is mostly human readable. The generation and parsing of the
various data types are done through the TypeConverter classes
associated with the data types.
Example:
... ado.net/XML headers & schema ...
<resheader name="resmimetype">text/microsoft-resx</resheader>
<resheader name="version">2.0</resheader>
<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
<data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
<data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
<value>[base64 mime encoded serialized .NET Framework object]</value>
</data>
<data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
<comment>This is a comment</comment>
</data>
There are any number of "resheader" rows that contain simple
name/value pairs.
Each data row contains a name, and value. The row also contains a
type or mimetype. Type corresponds to a .NET class that support
text/value conversion through the TypeConverter architecture.
Classes that don't support this are serialized and stored with the
mimetype set.
The mimetype is used for serialized objects, and tells the
ResXResourceReader how to depersist the object. This is currently not
extensible. For a given mimetype the value must be set accordingly:
Note - application/x-microsoft.net.object.binary.base64 is the format
that the ResXResourceWriter will generate, however the reader can
read any of the formats listed below.
mimetype: application/x-microsoft.net.object.binary.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.soap.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.bytearray.base64
value : The object must be serialized into a byte array
: using a System.ComponentModel.TypeConverter
: and then encoded with base64 encoding.
-->
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
<xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
<xsd:element name="root" msdata:IsDataSet="true">
<xsd:complexType>
<xsd:choice maxOccurs="unbounded">
<xsd:element name="metadata">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" />
</xsd:sequence>
<xsd:attribute name="name" use="required" type="xsd:string" />
<xsd:attribute name="type" type="xsd:string" />
<xsd:attribute name="mimetype" type="xsd:string" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="assembly">
<xsd:complexType>
<xsd:attribute name="alias" type="xsd:string" />
<xsd:attribute name="name" type="xsd:string" />
</xsd:complexType>
</xsd:element>
<xsd:element name="data">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="resheader">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" />
</xsd:complexType>
</xsd:element>
</xsd:choice>
</xsd:complexType>
</xsd:element>
</xsd:schema>
<resheader name="resmimetype">
<value>text/microsoft-resx</value>
</resheader>
<resheader name="version">
<value>2.0</value>
</resheader>
<resheader name="reader">
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<data name="ErrorReadTimeout" xml:space="preserve">
<value>Read timeout elapsed with no new data from server; connection may have been silently dropped</value>
</data>
<data name="ErrorAlreadyStarted" xml:space="preserve">
<value>Invalid attempt to call Start() while the connection state is {0}</value>
</data>
<data name="ErrorHttpStatus" xml:space="preserve">
<value>Unexpected HTTP status code {0} from server</value>
</data>
<data name="ErrorWrongContentType" xml:space="preserve">
<value>Unexpected HTTP content type "{0}"; should be "text/event-stream"</value>
</data>
<data name="ErrorWrongEncoding" xml:space="preserve">
<value>Unexpected character encoding {0}; should be UTF-8</value>
</data>
<data name="ErrorEmptyResponse" xml:space="preserve">
<value>HTTP response had no body</value>
</data>
</root>
@@ -1,4 +1,4 @@
using System.Collections.Generic; using System.Collections.Generic;
using Newtonsoft.Json; using Newtonsoft.Json;
namespace OrderSupportTicket.Models.Api; namespace OrderSupportTicket.Models.Api;
@@ -139,10 +139,16 @@ internal sealed class SendMessageRequest
public string ClientMessageId { get; set; } public string ClientMessageId { get; set; }
/// <summary> /// <summary>
/// 留言正文,长度 1~4000 字。 /// 留言正文;有图片附件时可为空。
/// </summary> /// </summary>
////[JsonProperty("text")] ////[JsonProperty("text")]
public string Text { get; set; } public string Text { get; set; }
/// <summary>
/// 图片上传回执,最多 3 个;无图片时为 null,序列化时省略。
/// </summary>
////[JsonProperty("attachments")]
public IList<MessageAttachmentReceipt> Attachments { get; set; }
} }
/// <summary> /// <summary>
@@ -169,6 +175,176 @@ internal sealed class MarkReadRequest
public int ThroughSequenceNo { get; set; } public int ThroughSequenceNo { get; set; }
} }
/// <summary>
/// 申请图片直传凭证请求。
/// </summary>
internal sealed class CreateImageUploadTicketRequest
{
/// <summary>
/// 拍单账号。
/// </summary>
public string PurchaseAccount { get; set; }
/// <summary>
/// 订单所属店铺 APPID。
/// </summary>
public string AppId { get; set; }
/// <summary>
/// 原始文件名,1~180 字符。
/// </summary>
public string FileName { get; set; }
/// <summary>
/// 精确的图片 MIME 类型:image/jpeg、image/png 或 image/webp。
/// </summary>
public string MimeType { get; set; }
/// <summary>
/// 图片实际字节数,1~5,242,880。
/// </summary>
public long Size { get; set; }
/// <summary>
/// 可选的上传标识;省略时由服务端生成。
/// </summary>
public string RequestId { get; set; }
}
/// <summary>
/// 图片直传凭证响应。
/// </summary>
public sealed class ImageUploadTicketResponse
{
/// <summary>
/// 请求是否成功。
/// </summary>
public bool Success { get; set; }
/// <summary>
/// 本次上传的凭证信息。
/// </summary>
public ImageUploadTicketDto Upload { get; set; }
/// <summary>
/// 订单所属店铺 APPID。
/// </summary>
public string AppId { get; set; }
/// <summary>
/// 微信订单号。
/// </summary>
public string WechatOrderId { get; set; }
/// <summary>
/// 接口返回的身份校验标记,当前恒为 false。
/// </summary>
public bool IdentityVerified { get; set; }
/// <summary>
/// 本次 HTTP 请求的排查编号;不是 upload.requestId。
/// </summary>
public string RequestId { get; set; }
}
/// <summary>
/// 服务端签发的单次图片直传凭证。
/// </summary>
public sealed class ImageUploadTicketDto
{
/// <summary>
/// 上传模式,文档约定为 single。
/// </summary>
public string Mode { get; set; }
/// <summary>
/// 上传 HTTP 方法,文档约定为 PUT。
/// </summary>
public string Method { get; set; }
/// <summary>
/// 本次图片上传标识。
/// </summary>
public string RequestId { get; set; }
/// <summary>
/// 服务端签发的上传凭证,需原样提交留言接口。
/// </summary>
public string Ticket { get; set; }
/// <summary>
/// 带短时签名的 COS 上传地址。
/// </summary>
public string UploadUrl { get; set; }
/// <summary>
/// 直传时必须原样携带的请求头。
/// </summary>
public Dictionary<string, string> Headers { get; set; }
/// <summary>
/// 上传凭证过期时间。
/// </summary>
public string ExpiresAt { get; set; }
}
/// <summary>
/// 图片直传完成后提交给留言接口的回执。
/// </summary>
public sealed class MessageAttachmentReceipt
{
/// <summary>
/// 原样使用 upload.requestId。
/// </summary>
public string RequestId { get; set; }
/// <summary>
/// 原样使用 upload.ticket。
/// </summary>
public string Ticket { get; set; }
/// <summary>
/// 可选的 COS 响应 ETag。
/// </summary>
public string Etag { get; set; }
}
/// <summary>
/// 留言中的公开图片附件。
/// </summary>
public sealed class TicketAttachmentDto
{
/// <summary>
/// 附件唯一 ID。
/// </summary>
public string Id { get; set; }
/// <summary>
/// 原始文件名。
/// </summary>
public string OriginalName { get; set; }
/// <summary>
/// 图片 MIME 类型。
/// </summary>
public string ContentType { get; set; }
/// <summary>
/// 图片字节数。
/// </summary>
public long ByteSize { get; set; }
/// <summary>
/// 图片创建时间。
/// </summary>
public string CreatedAt { get; set; }
/// <summary>
/// 短时读取地址;暂不可用时为 null。
/// </summary>
public string ReadUrl { get; set; }
}
/// <summary> /// <summary>
/// 工单摘要分页响应。 /// 工单摘要分页响应。
/// </summary> /// </summary>
@@ -371,6 +547,12 @@ public sealed class TicketMessageDto
/// </summary> /// </summary>
////[JsonProperty("createdAt")] ////[JsonProperty("createdAt")]
public string CreatedAt { get; set; } public string CreatedAt { get; set; }
/// <summary>
/// 公开图片附件;无图片时为空数组。
/// </summary>
////[JsonProperty("attachments")]
public List<TicketAttachmentDto> Attachments { get; set; }
} }
/// <summary> /// <summary>
+156 -138
View File
@@ -1,4 +1,4 @@
using AllBase; using AllBase;
using AllBase.Model.DBModel; using AllBase.Model.DBModel;
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
@@ -13,63 +13,68 @@ namespace OrderSupportTicket.Models;
/// </summary> /// </summary>
public sealed class TicketClientOptions public sealed class TicketClientOptions
{ {
public TicketClientOptions() public TicketClientOptions()
{ {
AppIds = new List<string>(); AppIds = new List<string>();
Orders = new List<TicketOrderOption>(); Orders = new List<TicketOrderOption>();
} }
/// <summary> /// <summary>
/// 当前拍单账号,对应接口字段 purchaseAccount。 /// 当前拍单账号,对应接口字段 purchaseAccount。
/// </summary> /// </summary>
public string UserName { get; set; } public string UserName { get; set; }
/// <summary> /// <summary>会话数据来源:直接修改此处默认值切换 History / Realtime。</summary>
/// 当前账号需要订阅和查询的店铺 APPID 集合,最多 50 个。 public TicketConversationMode ConversationMode { get; set; } = TicketConversationMode.Realtime;
/// </summary>
public IList<string> AppIds { get; set; }
/// <summary> /// <summary>
/// 可关联到新工单的本地订单集合。 /// 当前账号需要订阅和查询的店铺 APPID 集合,最多 50 个。
/// </summary> /// </summary>
public IList<TicketOrderOption> Orders { get; set; } public IList<string> AppIds { get; set; }
/// <summary> /// <summary>
/// 创建参数副本,避免宿主与页面共享可变集合。 /// 可关联到新工单的本地订单集合。
/// </summary> /// </summary>
public TicketClientOptions Clone() public IList<TicketOrderOption> Orders { get; set; }
{
return new TicketClientOptions
{
UserName = UserName,
AppIds = (AppIds ?? Enumerable.Empty<string>())
.Where(appId => !string.IsNullOrWhiteSpace(appId))
.Select(appId => appId.Trim())
.Distinct(StringComparer.Ordinal)
.ToList(),
Orders = (Orders ?? Enumerable.Empty<TicketOrderOption>())
.Where(order => order != null)
.ToList()
};
}
public static TicketClientOptions FromApplicationSettings() /// <summary>
{ /// 创建参数副本,避免宿主与页面共享可变集合。
var purchaseAccount = /// </summary>
ConfigurationManager.AppSettings["CustomerWorkOrder.PurchaseAccount"]; public TicketClientOptions Clone()
var appIds = ConfigurationManager.AppSettings["CustomerWorkOrder.AppIds"]; {
return new TicketClientOptions
{
UserName = UserName,
ConversationMode = ConversationMode,
AppIds = (AppIds ?? Enumerable.Empty<string>())
.Where(appId => !string.IsNullOrWhiteSpace(appId))
.Select(appId => appId.Trim())
.Distinct(StringComparer.Ordinal)
.ToList(),
Orders = (Orders ?? Enumerable.Empty<TicketOrderOption>())
.Where(order => order != null)
.ToList()
};
}
return new TicketClientOptions public static TicketClientOptions FromApplicationSettings()
{ {
UserName = purchaseAccount, var purchaseAccount =
AppIds = (appIds ?? string.Empty) ConfigurationManager.AppSettings["CustomerWorkOrder.PurchaseAccount"];
.Split(new[] { ',', ';', ' ' }, StringSplitOptions.RemoveEmptyEntries) var appIds = ConfigurationManager.AppSettings["CustomerWorkOrder.AppIds"];
.Select(a => a.Trim())
.Where(a => a.Length > 0) return new TicketClientOptions
.Distinct(StringComparer.OrdinalIgnoreCase) {
.ToList() UserName = purchaseAccount,
}; AppIds = (appIds ?? string.Empty)
} .Split(new[] { ',', ';', ' ' }, StringSplitOptions.RemoveEmptyEntries)
.Select(a => a.Trim())
.Where(a => a.Length > 0)
.Distinct(StringComparer.OrdinalIgnoreCase)
.ToList(),
ConversationMode = TicketConversationMode.Realtime,
};
}
} }
/// <summary> /// <summary>
@@ -78,101 +83,114 @@ public sealed class TicketClientOptions
/// </summary> /// </summary>
public sealed class TicketOrderOption public sealed class TicketOrderOption
{ {
/// <summary> /// <summary>
/// 订单所属店铺的 APPID,格式为 wx 加 16 位小写十六进制字符。 /// 订单所属店铺的 APPID,格式为 wx 加 16 位小写十六进制字符。
/// </summary> /// </summary>
public string AppId { get; set; } public string AppId { get; set; }
/// <summary> /// <summary>
/// 微信订单号。接口要求保持为 10~64 位数字字符串,禁止转换为 Number。 /// 微信订单号。接口要求保持为 10~64 位数字字符串,禁止转换为 Number。
/// </summary> /// </summary>
public string OrderId { get; set; } public string OrderId { get; set; }
/// <summary> /// <summary>
/// 商品名称,用于订单筛选和页面展示。 /// 商品名称,用于订单筛选和页面展示。
/// </summary> /// </summary>
public string GoodsName { get; set; } public string GoodsName { get; set; }
/// <summary> /// <summary>
/// 商品缩略图地址,用于新建工单页展示关联商品。 /// 商品缩略图地址,用于新建工单页展示关联商品。
/// </summary> /// </summary>
public string ImageUrl { get; set; } public string ImageUrl { get; set; }
/// <summary> /// <summary>
/// 订单金额,单位元,使用 decimal 保存原始金额,不在模型中保存格式化文本。 /// 订单金额,单位元,使用 decimal 保存原始金额,不在模型中保存格式化文本。
/// </summary> /// </summary>
public decimal Amount { get; set; } public decimal Amount { get; set; }
/// <summary> /// <summary>
/// 订单下单时间。 /// 订单下单时间。
/// </summary> /// </summary>
public DateTime OrderedAt { get; set; } public DateTime OrderedAt { get; set; }
/// <summary> /// <summary>
/// 下拉列表显示文本,订单号在前、商品名在后,避免长商品名遮挡订单号。 /// 下拉列表显示文本,订单号在前、商品名在后,避免长商品名遮挡订单号。
/// </summary> /// </summary>
public string DisplayText public string DisplayText
{ {
get get
{ {
var product = string.IsNullOrWhiteSpace(GoodsName) var product = string.IsNullOrWhiteSpace(GoodsName)
? "未命名商品" ? "未命名商品"
: GoodsName; : GoodsName;
return $"{OrderId} · {product}"; return $"{OrderId} · {product}";
} }
} }
/// <summary> /// <summary>
/// 订单详情展示文本。商品名已包含在 <see cref="DisplayText"/> 中,这里只展示金额和下单时间。 /// 订单详情展示文本。商品名已包含在 <see cref="DisplayText"/> 中,这里只展示金额和下单时间。
/// </summary> /// </summary>
public string ProductDescription public string ProductDescription
{ {
get get
{ {
var amount = "¥ " + Amount.ToString("N2", CultureInfo.GetCultureInfo("zh-CN")); var amount = "¥ " + Amount.ToString("N2", CultureInfo.GetCultureInfo("zh-CN"));
var orderedAt = OrderedAt == default var orderedAt = OrderedAt == default
? "下单时间未知" ? "下单时间未知"
: OrderedAt.ToString("yyyy-MM-dd HH:mm", CultureInfo.CurrentCulture); : OrderedAt.ToString("yyyy-MM-dd HH:mm", CultureInfo.CurrentCulture);
return $"金额 {amount} · {orderedAt}"; return $"金额 {amount} · {orderedAt}";
} }
} }
/// <summary> /// <summary>
/// 从本地订单生成工单关联订单信息,统一商品名、缩略图、金额和下单时间的取值规则。 /// 从本地订单生成工单关联订单信息,统一商品名、缩略图、金额和下单时间的取值规则。
/// </summary> /// </summary>
public static TicketOrderOption FromWechatOrder( public static TicketOrderOption FromWechatOrder(
oms_wei_order_info order, oms_wei_order_info order,
string appId) string appId)
{ {
if (order == null) if (order == null)
return null; return null;
var goodsName = string.Join( var goodsName = string.Join(
"、", "、",
(order.orderItems ?? Enumerable.Empty<oms_wei_order_item_info>()) (order.OrderItems ?? Enumerable.Empty<oms_wei_order_item_info>())
.Select(item => item.title) .Select(item => item.title)
.Where(title => !string.IsNullOrWhiteSpace(title)) .Where(title => !string.IsNullOrWhiteSpace(title))
.Distinct()); .Distinct());
if (goodsName.Length > 200) if (goodsName.Length > 200)
goodsName = goodsName.Substring(0, 200) + "…"; goodsName = goodsName.Substring(0, 200) + "…";
return new TicketOrderOption return new TicketOrderOption
{ {
AppId = appId?.Trim(), AppId = appId?.Trim(),
OrderId = order.order_id, OrderId = order.order_id,
GoodsName = goodsName, GoodsName = goodsName,
ImageUrl = (order.orderItems ?? Enumerable.Empty<oms_wei_order_item_info>()) ImageUrl = (order.OrderItems ?? Enumerable.Empty<oms_wei_order_item_info>())
.Select(item => item.thumb_img) .Select(item => item.thumb_img)
.FirstOrDefault(url => !string.IsNullOrWhiteSpace(url)), .FirstOrDefault(url => !string.IsNullOrWhiteSpace(url)),
Amount = (order.order_price ?? 0) / 100m, Amount = (order.order_price ?? 0) / 100m,
OrderedAt = order.create_time > 0 OrderedAt = order.create_time > 0
? BaseClass.StampToDateTime(order.create_time) ? BaseClass.StampToDateTime(order.create_time)
: default : default
}; };
} }
/// <summary> /// <summary>
/// 当前工单的唯一订单键,由 APPID 和微信订单号共同组成。 /// 当前工单的唯一订单键,由 APPID 和微信订单号共同组成。
/// </summary> /// </summary>
public string OrderKey => $"{AppId}|{OrderId}"; public string OrderKey => $"{AppId}|{OrderId}";
}
/// <summary>History 点击加载历史;Realtime 仅使用推送和发送回执构建会话。</summary>
public enum TicketConversationMode
{
/// <summary>
/// 点击加载历史
/// </summary>
History,
/// <summary>
/// 仅使用推送和发送回执构建会话
/// </summary>
Realtime
} }
@@ -1,9 +1,10 @@
using Newtonsoft.Json; using Newtonsoft.Json;
using OrderSupportTicket.Models.Api;
namespace OrderSupportTicket.Models; namespace OrderSupportTicket.Models;
/// <summary> /// <summary>
/// SSE 实时通知。通知只包含摘要定位信息,收到后需要重新查询对应工单。 /// SSE 实时通知。包含工单摘要与完整消息,可直接增量构建会话。
/// </summary> /// </summary>
public sealed class TicketRealtimeNotification public sealed class TicketRealtimeNotification
{ {
@@ -49,6 +50,10 @@ public sealed class TicketRealtimeNotification
////[JsonProperty("occurredAt")] ////[JsonProperty("occurredAt")]
public string OccurredAt { get; set; } public string OccurredAt { get; set; }
public WorkOrderSummaryDto Ticket { get; set; }
public TicketMessageDto Message { get; set; }
/// <summary> /// <summary>
/// 是否要求客户端执行全量重新同步。 /// 是否要求客户端执行全量重新同步。
/// </summary> /// </summary>
+1 -1
View File
@@ -16,7 +16,7 @@
<ItemGroup> <ItemGroup>
<ProjectReference Include="..\AllBase\29WxOrderAllBase.csproj" /> <ProjectReference Include="..\AllBase\29WxOrderAllBase.csproj" />
<ProjectReference Include="..\WxOrder.Framework\WxOrder.Framework.csproj" /> <ProjectReference Include="..\Work\29WxOrderWork.csproj" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
@@ -4,7 +4,10 @@ using Newtonsoft.Json;
using OrderSupportTicket.Models; using OrderSupportTicket.Models;
using OrderSupportTicket.Models.Api; using OrderSupportTicket.Models.Api;
using System; using System;
using System.Diagnostics;
using System.Linq; using System.Linq;
using System.Net;
using System.Net.Http;
using System.Threading.Tasks; using System.Threading.Tasks;
using WxOrder.Framework.Helpers; using WxOrder.Framework.Helpers;
@@ -31,7 +34,7 @@ public sealed class EventSourceTicketRealtimeService
/// </summary> /// </summary>
public TicketRealtimeState State { get; private set; } = TicketRealtimeState.Disconnected; public TicketRealtimeState State { get; private set; } = TicketRealtimeState.Disconnected;
public void Start(TicketClientOptions options) public Task Start(TicketClientOptions options)
{ {
if (_disposed) if (_disposed)
throw new ObjectDisposedException(nameof(EventSourceTicketRealtimeService)); throw new ObjectDisposedException(nameof(EventSourceTicketRealtimeService));
@@ -40,9 +43,8 @@ public sealed class EventSourceTicketRealtimeService
TicketApiService.ValidateOptions(options); TicketApiService.ValidateOptions(options);
StopCore(); StopCore();
var config = BuildEventsUri(options);
var uri = BuildEventsUri(options); var source = new EventSource(config);
var source = new EventSource(uri);
source.Opened += OnOpened; source.Opened += OnOpened;
source.Closed += OnClosed; source.Closed += OnClosed;
source.MessageReceived += OnMessageReceived; source.MessageReceived += OnMessageReceived;
@@ -55,7 +57,8 @@ public sealed class EventSourceTicketRealtimeService
} }
SetState(TicketRealtimeState.Connecting, "连接中…"); SetState(TicketRealtimeState.Connecting, "连接中…");
_ = RunAsync(source); _= RunAsync(source);
return Task.FromResult(0);
} }
public Task StopAsync() public Task StopAsync()
@@ -77,7 +80,6 @@ public sealed class EventSourceTicketRealtimeService
{ {
try try
{ {
NLogger.Instance.Info("工单服务连接成");
await source.StartAsync(); await source.StartAsync();
lock (_sync) lock (_sync)
{ {
@@ -136,6 +138,7 @@ public sealed class EventSourceTicketRealtimeService
TicketRealtimeNotification notification; TicketRealtimeNotification notification;
try try
{ {
Debug.WriteLine(data);
notification = JsonConvert.DeserializeObject<TicketRealtimeNotification>(data, TicketApiService.JsonSettings); notification = JsonConvert.DeserializeObject<TicketRealtimeNotification>(data, TicketApiService.JsonSettings);
} }
catch (JsonException) catch (JsonException)
@@ -182,22 +185,54 @@ public sealed class EventSourceTicketRealtimeService
new TicketRealtimeStateChangedEventArgs(state, message)); new TicketRealtimeStateChangedEventArgs(state, message));
} }
private static Uri BuildEventsUri(TicketClientOptions options) //private static Uri BuildEventsUri(TicketClientOptions options)
//{
// var appIds = options.AppIds
// .Where(a => !string.IsNullOrWhiteSpace(a))
// .Distinct(StringComparer.Ordinal)
// .Select(a => "appId=" + Uri.EscapeDataString(a.Trim()));
// var query = new[]
// {
// "purchaseAccount=" + Uri.EscapeDataString(options.UserName)
// }.Concat(appIds);
// return new Uri(
// TicketApiService.ServerUrl
// + EventsPath
// + "?"
// + string.Join("&", query),
// UriKind.Absolute);
//}
private static Configuration BuildEventsUri(TicketClientOptions options)
{ {
var appIds = options.AppIds var appIds = options.AppIds
.Where(a => !string.IsNullOrWhiteSpace(a)) .Where(a => !string.IsNullOrWhiteSpace(a))
.Distinct(StringComparer.Ordinal) .Distinct(StringComparer.Ordinal)
.Select(a => "appId=" + Uri.EscapeDataString(a.Trim())); .Select(a => Uri.EscapeDataString(a.Trim()));
var query = new[] var query = new[]
{ {
"purchaseAccount=" + Uri.EscapeDataString(options.UserName) "purchaseAccount=" + Uri.EscapeDataString(options.UserName)
}.Concat(appIds); };
var uri = new Uri(
return new Uri(
TicketApiService.ServerUrl TicketApiService.ServerUrl
+ EventsPath + EventsPath
+ "?" + "?"
+ string.Join("&", query), + string.Join("&", query),
UriKind.Absolute); UriKind.Absolute);
ConfigurationBuilder builder = Configuration.Builder(uri);
builder.RequestHeader("X-AppIds", $"[\"{string.Join("\",\"", appIds)}\"]");
builder.Logger(NLogger.Instance);
//builder.LastEventId("");
//var proxy = new WebProxy("http://127.0.0.1:8081"); //
//var handler = new HttpClientHandler
//{
// Proxy = proxy,
// UseProxy = true
//};
//var client = new HttpClient(handler);
//builder.HttpClient(client);
builder._responseStartTimeout = TimeSpan.FromSeconds(30);
return builder.Build();
} }
} }
@@ -1,4 +1,4 @@
using System; using System;
namespace OrderSupportTicket.Services; namespace OrderSupportTicket.Services;
@@ -13,11 +13,13 @@ public sealed class TicketApiException : Exception
public TicketApiException( public TicketApiException(
int statusCode, int statusCode,
string message, string message,
string responseBody = null) string responseBody = null,
string errorCode = null)
: base(message) : base(message)
{ {
StatusCode = statusCode; StatusCode = statusCode;
ResponseBody = responseBody; ResponseBody = responseBody;
ErrorCode = errorCode;
} }
/// <summary> /// <summary>
@@ -29,4 +31,9 @@ public sealed class TicketApiException : Exception
/// 服务端返回的原始响应正文。 /// 服务端返回的原始响应正文。
/// </summary> /// </summary>
public string ResponseBody { get; } public string ResponseBody { get; }
/// <summary>
/// 服务端返回的错误码,例如 client_api_image_expired。
/// </summary>
public string ErrorCode { get; }
} }
+346 -23
View File
@@ -1,11 +1,15 @@
using AllBase; using AllBase;
using Newtonsoft.Json; using Newtonsoft.Json;
using Newtonsoft.Json.Serialization; using Newtonsoft.Json.Serialization;
using OrderSupportTicket.Models; using OrderSupportTicket.Models;
using OrderSupportTicket.Models.Api; using OrderSupportTicket.Models.Api;
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Diagnostics;
using System.IO;
using System.Linq; using System.Linq;
using System.Net;
using System.Net.Http;
using System.Text.RegularExpressions; using System.Text.RegularExpressions;
using System.Threading.Tasks; using System.Threading.Tasks;
using WxOrder.Framework.Commons; using WxOrder.Framework.Commons;
@@ -19,6 +23,16 @@ public sealed class TicketApiService
{ {
internal static string ServerUrl = "https://ai.e57.cn"; internal static string ServerUrl = "https://ai.e57.cn";
private const string ApiRoot = "/api/open/v2/customer-work-orders"; private const string ApiRoot = "/api/open/v2/customer-work-orders";
/// <summary>
/// 每条留言最多可携带的图片数量。
/// </summary>
public const int MaxImageCount = 3;
/// <summary>
/// 单张图片允许的最大字节数(5 MiB)。
/// </summary>
public const long MaxImageBytes = 5 * 1024 * 1024;
private static readonly Regex AppIdRegex = private static readonly Regex AppIdRegex =
new Regex(@"^wx[0-9a-f]{16}$", RegexOptions.Compiled | RegexOptions.CultureInvariant); new Regex(@"^wx[0-9a-f]{16}$", RegexOptions.Compiled | RegexOptions.CultureInvariant);
private static readonly Regex OrderIdRegex = private static readonly Regex OrderIdRegex =
@@ -27,6 +41,14 @@ public sealed class TicketApiService
new Regex(@"^[\p{L}\p{N}_.@-]{2,120}$", RegexOptions.Compiled); new Regex(@"^[\p{L}\p{N}_.@-]{2,120}$", RegexOptions.Compiled);
private static readonly Regex OperationIdRegex = private static readonly Regex OperationIdRegex =
new Regex(@"^[A-Za-z0-9_.:-]{1,128}$", RegexOptions.Compiled | RegexOptions.CultureInvariant); new Regex(@"^[A-Za-z0-9_.:-]{1,128}$", RegexOptions.Compiled | RegexOptions.CultureInvariant);
private static readonly HashSet<string> SupportedImageMimeTypes =
new HashSet<string>(StringComparer.OrdinalIgnoreCase)
{
"image/jpeg",
"image/png",
"image/webp"
};
private static readonly HttpClient ImageUploadClient = CreateImageUploadClient();
internal static readonly JsonSerializerSettings JsonSettings = new JsonSerializerSettings internal static readonly JsonSerializerSettings JsonSettings = new JsonSerializerSettings
{ {
NullValueHandling = NullValueHandling.Ignore, NullValueHandling = NullValueHandling.Ignore,
@@ -107,7 +129,7 @@ public sealed class TicketApiService
Limit = limit, Limit = limit,
Before = string.IsNullOrWhiteSpace(before) ? null : before Before = string.IsNullOrWhiteSpace(before) ? null : before
}; };
Debug.WriteLine($"{wechatOrderId}加载所有对话");
var path = ApiRoot var path = ApiRoot
+ "/messages"; + "/messages";
return await PostAsync<WorkOrderMessagesResponse>(path, request); return await PostAsync<WorkOrderMessagesResponse>(path, request);
@@ -158,22 +180,25 @@ public sealed class TicketApiService
TicketClientOptions options, TicketClientOptions options,
WorkOrderSummaryDto workOrder, WorkOrderSummaryDto workOrder,
string text, string text,
string clientMessageId) string clientMessageId,
IList<MessageAttachmentReceipt> attachments = null)
{ {
ValidateOptions(options); ValidateOptions(options);
if (workOrder == null) if (workOrder == null)
throw new ArgumentNullException(nameof(workOrder)); throw new ArgumentNullException(nameof(workOrder));
ValidateAppId(workOrder.AppId); ValidateAppId(workOrder.AppId);
ValidateWechatOrderId(workOrder.WechatOrderId); ValidateWechatOrderId(workOrder.WechatOrderId);
ValidateMessageText(text); ValidateMessageContent(text, attachments);
ValidateOperationId(clientMessageId, "clientMessageId", required: true); ValidateOperationId(clientMessageId, "clientMessageId", required: true);
var hasAttachments = attachments != null && attachments.Count > 0;
var request = new SendMessageRequest var request = new SendMessageRequest
{ {
PurchaseAccount = options.UserName, PurchaseAccount = options.UserName,
AppId = workOrder.AppId, AppId = workOrder.AppId,
ClientMessageId = clientMessageId, ClientMessageId = clientMessageId,
Text = text Text = string.IsNullOrWhiteSpace(text) ? null : text,
Attachments = hasAttachments ? attachments.ToList() : null
}; };
var path = ApiRoot var path = ApiRoot
+ "/orders/" + "/orders/"
@@ -182,6 +207,139 @@ public sealed class TicketApiService
return await PostAsync<SendMessageResponse>(path, request); return await PostAsync<SendMessageResponse>(path, request);
} }
/// <summary>
/// 申请单张图片的短时直传凭证。每张图片单独申请。
/// </summary>
public async Task<ImageUploadTicketResponse> CreateImageUploadTicketAsync(
TicketClientOptions options,
string appId,
string wechatOrderId,
string fileName,
string mimeType,
long size,
string requestId = null)
{
ValidateOptions(options);
ValidateAppId(appId);
ValidateWechatOrderId(wechatOrderId);
var normalizedFileName = ValidateImageFileName(fileName);
var normalizedMimeType = ValidateImageMimeType(mimeType);
ValidateImageSize(size);
ValidateOperationId(requestId, "requestId", required: false);
var request = new CreateImageUploadTicketRequest
{
PurchaseAccount = options.UserName,
AppId = appId,
FileName = normalizedFileName,
MimeType = normalizedMimeType,
Size = size,
RequestId = string.IsNullOrWhiteSpace(requestId) ? null : requestId
};
var path = ApiRoot
+ "/orders/"
+ Uri.EscapeDataString(wechatOrderId)
+ "/message-attachments/upload-ticket";
var response = await PostAsync<ImageUploadTicketResponse>(path, request);
ValidateImageUploadTicket(response?.Upload);
return response;
}
/// <summary>
/// 使用服务端签发的凭证把图片二进制直接 PUT 到 COS。
/// 返回的 requestId/ticket/etag 需原样提交到留言接口。
/// </summary>
public async Task<MessageAttachmentReceipt> UploadImageAsync(
ImageUploadTicketDto upload,
string filePath)
{
ValidateImageUploadTicket(upload);
if (string.IsNullOrWhiteSpace(filePath))
throw new ArgumentException("图片文件路径不能为空。", nameof(filePath));
byte[] bytes;
try
{
bytes = await Task.Run(() => File.ReadAllBytes(filePath)).ConfigureAwait(false);
}
catch (Exception ex) when (
ex is IOException
|| ex is UnauthorizedAccessException
|| ex is ArgumentException)
{
throw new ArgumentException("读取图片文件失败:" + ex.Message, nameof(filePath));
}
if (bytes.Length < 1 || bytes.Length > MaxImageBytes)
throw new ArgumentException("单张图片必须为 1 字节~5 MiB。", nameof(filePath));
var contentType = GetUploadHeader(upload.Headers, "Content-Type")
?? "application/octet-stream";
using (var request = new HttpRequestMessage(
new HttpMethod(upload.Method.ToUpperInvariant()),
upload.UploadUrl))
using (var content = new ByteArrayContent(bytes))
{
content.Headers.TryAddWithoutValidation("Content-Type", contentType);
foreach (var header in upload.Headers ?? new Dictionary<string, string>())
{
if (string.IsNullOrWhiteSpace(header.Key))
continue;
if (string.Equals(header.Key, "Content-Type", StringComparison.OrdinalIgnoreCase)
|| string.Equals(header.Key, "Content-Length", StringComparison.OrdinalIgnoreCase))
continue;
if (!request.Headers.TryAddWithoutValidation(header.Key, header.Value))
content.Headers.TryAddWithoutValidation(header.Key, header.Value);
}
request.Content = content;
HttpResponseMessage response;
try
{
response = await ImageUploadClient
.SendAsync(request)
.ConfigureAwait(false);
}
catch (Exception ex) when (
ex is HttpRequestException
|| ex is TaskCanceledException)
{
throw new TicketApiException(0, "图片直传网络异常,请稍后重试。");
}
using (response)
{
if (!response.IsSuccessStatusCode)
{
var statusCode = (int)response.StatusCode;
string body = null;
try
{
body = await response.Content
.ReadAsStringAsync()
.ConfigureAwait(false);
}
catch
{
// 存储端错误正文仅用于提取可读提示,失败时使用通用文案。
}
throw new TicketApiException(
statusCode,
ExtractUploadErrorMessage(body, statusCode));
}
var etag = response.Headers.TryGetValues("ETag", out var values)
? values.FirstOrDefault()
: null;
return new MessageAttachmentReceipt
{
RequestId = upload.RequestId,
Ticket = upload.Ticket,
Etag = string.IsNullOrWhiteSpace(etag) ? null : etag
};
}
}
}
public async Task MarkReadAsync( public async Task MarkReadAsync(
TicketClientOptions options, TicketClientOptions options,
string appId, string appId,
@@ -342,25 +500,52 @@ public sealed class TicketApiService
return new TicketApiException( return new TicketApiException(
ExtractStatusCode(responseBody), ExtractStatusCode(responseBody),
message, message,
responseBody); responseBody,
ExtractErrorCode(responseBody));
}
private static ApiErrorResponse ExtractErrorResponse(string responseBody)
{
if (string.IsNullOrWhiteSpace(responseBody))
return null;
try
{
return JsonConvert.DeserializeObject<ApiErrorResponse>(responseBody, JsonSettings);
}
catch (JsonException)
{
return null;
}
}
private static string ExtractErrorCode(string responseBody)
{
return ExtractErrorResponse(responseBody)?.Code;
} }
private static int ExtractStatusCode(string responseBody) private static int ExtractStatusCode(string responseBody)
{ {
if (string.IsNullOrWhiteSpace(responseBody)) var error = ExtractErrorResponse(responseBody);
if (error == null || string.IsNullOrWhiteSpace(error.Code))
return 0; return 0;
if (int.TryParse(error.Code, out var code))
return code;
try switch (error.Code.Trim().ToLowerInvariant())
{ {
var error = JsonConvert.DeserializeObject<ApiErrorResponse>(responseBody, JsonSettings); case "client_api_image_expired":
if (error != null && int.TryParse(error.Code, out var code)) return 410;
return code; case "client_api_image_already_used":
return 409;
case "client_api_image_invalid":
return 422;
case "client_api_image_upload_failed":
return 400;
case "client_api_images_unavailable":
return 503;
default:
return 0;
} }
catch (JsonException)
{
// GetHtml 在网络异常时会返回普通错误文本,此时没有 HTTP 状态码。
}
return 0;
} }
private static List<string> NormalizeAppIds(IEnumerable<string> appIds) private static List<string> NormalizeAppIds(IEnumerable<string> appIds)
@@ -372,8 +557,8 @@ public sealed class TicketApiService
.ToList(); .ToList();
if (normalized.Count == 0) if (normalized.Count == 0)
throw new ArgumentException("appIds 至少需要一个 APPID。", nameof(appIds)); throw new ArgumentException("appIds 至少需要一个 APPID。", nameof(appIds));
if (normalized.Count > 50) //if (normalized.Count > 5000)
throw new ArgumentException("appIds 最多支持 50 个 APPID。", nameof(appIds)); // throw new ArgumentException("appIds 最多支持 50 个 APPID。", nameof(appIds));
foreach (var appId in normalized) foreach (var appId in normalized)
ValidateAppId(appId); ValidateAppId(appId);
return normalized; return normalized;
@@ -389,14 +574,152 @@ public sealed class TicketApiService
} }
} }
private static void ValidateMessageText(string text)
private static void ValidateMessageContent(
string text,
IList<MessageAttachmentReceipt> attachments)
{ {
if (string.IsNullOrWhiteSpace(text) var attachmentCount = attachments?.Count ?? 0;
|| text.Length < 1 if (attachmentCount > MaxImageCount)
|| text.Length > 4000)
{ {
throw new ArgumentException("text 必须为 1~4000 字。", nameof(text)); throw new ArgumentException(
"每条留言最多提交 " + MaxImageCount + " 张图片。",
nameof(attachments));
} }
if (attachmentCount > 0)
ValidateAttachmentReceipts(attachments);
if (!string.IsNullOrWhiteSpace(text))
{
if (text.Length > 4000)
throw new ArgumentException("text 不能超过 4000 字。", nameof(text));
}
else if (attachmentCount == 0)
{
throw new ArgumentException("text 与图片附件不能同时为空。", nameof(text));
}
}
private static void ValidateAttachmentReceipts(
IList<MessageAttachmentReceipt> attachments)
{
var requestIds = new HashSet<string>(StringComparer.Ordinal);
foreach (var attachment in attachments)
{
if (attachment == null
|| string.IsNullOrWhiteSpace(attachment.RequestId)
|| !OperationIdRegex.IsMatch(attachment.RequestId)
|| string.IsNullOrWhiteSpace(attachment.Ticket))
{
throw new ArgumentException(
"图片上传回执不完整或 requestId 格式不正确。",
nameof(attachments));
}
if (!requestIds.Add(attachment.RequestId))
throw new ArgumentException("图片上传回执不能重复。", nameof(attachments));
}
}
private static string ValidateImageFileName(string fileName)
{
var normalized = (fileName ?? string.Empty).Trim();
if (normalized.Length < 1
|| normalized.Length > 180
|| normalized.Any(char.IsControl)
|| normalized.IndexOfAny(new[] { '/', '\\' }) >= 0)
{
throw new ArgumentException(
"fileName 必须为 1~180 字符且不能包含路径分隔符或控制字符。",
nameof(fileName));
}
return normalized;
}
private static string ValidateImageMimeType(string mimeType)
{
var normalized = (mimeType ?? string.Empty).Trim().ToLowerInvariant();
if (!SupportedImageMimeTypes.Contains(normalized))
{
throw new ArgumentException(
"mimeType 仅支持 image/jpeg、image/png 或 image/webp。",
nameof(mimeType));
}
return normalized;
}
private static void ValidateImageSize(long size)
{
if (size < 1 || size > MaxImageBytes)
{
throw new ArgumentException(
"单张图片必须为 1 字节~5 MiB。",
nameof(size));
}
}
private static void ValidateImageUploadTicket(ImageUploadTicketDto upload)
{
if (upload == null
|| string.IsNullOrWhiteSpace(upload.RequestId)
|| string.IsNullOrWhiteSpace(upload.Ticket)
|| string.IsNullOrWhiteSpace(upload.UploadUrl)
|| string.IsNullOrWhiteSpace(GetUploadHeader(upload.Headers, "Content-Type"))
|| !string.Equals(upload.Method, "PUT", StringComparison.OrdinalIgnoreCase))
{
throw new TicketApiException(0, "服务端返回的图片上传凭证不完整。");
}
if (!Uri.TryCreate(upload.UploadUrl, UriKind.Absolute, out var uri)
|| (uri.Scheme != Uri.UriSchemeHttps && uri.Scheme != Uri.UriSchemeHttp))
{
throw new TicketApiException(0, "服务端返回的图片上传地址无效。");
}
}
private static string GetUploadHeader(
IDictionary<string, string> headers,
string name)
{
if (headers == null)
return null;
foreach (var header in headers)
{
if (string.Equals(header.Key, name, StringComparison.OrdinalIgnoreCase))
return header.Value;
}
return null;
}
private static string ExtractUploadErrorMessage(
string body,
int statusCode)
{
var error = ExtractErrorResponse(body);
if (!string.IsNullOrWhiteSpace(error?.Message))
return error.Message;
if (!string.IsNullOrWhiteSpace(error?.Error))
return error.Error;
if (statusCode == 403)
return "图片上传地址已失效或无权访问,请重新选择图片后发送。";
return "图片直传失败(HTTP " + statusCode + "),请重试。";
}
private static HttpClient CreateImageUploadClient()
{
try
{
ServicePointManager.SecurityProtocol |= SecurityProtocolType.Tls12;
}
catch
{
// 旧系统不支持显式 TLS 1.2 时保留运行时默认值。
}
return new HttpClient(new HttpClientHandler
{
UseProxy = false
})
{
Timeout = TimeSpan.FromSeconds(120)
};
} }
private static void ValidateOperationId( private static void ValidateOperationId(
@@ -1,4 +1,4 @@
using OrderSupportTicket.Models; using OrderSupportTicket.Models;
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
@@ -91,7 +91,7 @@ public sealed class TicketRealtimeMonitor : IDisposable
/// <summary> /// <summary>
/// 启动或复用实时连接。相同账号和 APPID 重复调用不会重建连接。 /// 启动或复用实时连接。相同账号和 APPID 重复调用不会重建连接。
/// </summary> /// </summary>
public void Start(TicketClientOptions options) public async Task Start(TicketClientOptions options)
{ {
if (_disposed) if (_disposed)
throw new ObjectDisposedException(nameof(TicketRealtimeMonitor)); throw new ObjectDisposedException(nameof(TicketRealtimeMonitor));
@@ -109,11 +109,15 @@ public sealed class TicketRealtimeMonitor : IDisposable
return; return;
} }
if (!string.Equals(_optionsFingerprint, fingerprint, StringComparison.Ordinal))
{
_seenEventIds.Clear();
}
_options = options; _options = options;
_optionsFingerprint = fingerprint; _optionsFingerprint = fingerprint;
} }
RealtimeService.Start(options); await RealtimeService.Start(options);
} }
/// <summary> /// <summary>
+42 -6
View File
@@ -1,4 +1,4 @@
using OrderSupportTicket.Models; using OrderSupportTicket.Models;
using OrderSupportTicket.Models.Api; using OrderSupportTicket.Models.Api;
using System; using System;
using System.Threading.Tasks; using System.Threading.Tasks;
@@ -137,14 +137,50 @@ public sealed class TicketService : IDisposable
TicketClientOptions options, TicketClientOptions options,
WorkOrderSummaryDto workOrder, WorkOrderSummaryDto workOrder,
string text, string text,
string clientMessageId) string clientMessageId,
IList<MessageAttachmentReceipt> attachments = null)
{ {
ThrowIfDisposed(); ThrowIfDisposed();
return _api.SendMessageAsync( return _api.SendMessageAsync(
options, options,
workOrder, workOrder,
text, text,
clientMessageId); clientMessageId,
attachments);
}
/// <summary>
/// 申请单张图片的短时直传凭证。
/// </summary>
public Task<ImageUploadTicketResponse> CreateImageUploadTicketAsync(
TicketClientOptions options,
string appId,
string wechatOrderId,
string fileName,
string mimeType,
long size,
string requestId = null)
{
ThrowIfDisposed();
return _api.CreateImageUploadTicketAsync(
options,
appId,
wechatOrderId,
fileName,
mimeType,
size,
requestId);
}
/// <summary>
/// 将图片二进制直接上传到 COS,返回留言接口需要的回执。
/// </summary>
public Task<MessageAttachmentReceipt> UploadImageAsync(
ImageUploadTicketDto upload,
string filePath)
{
ThrowIfDisposed();
return _api.UploadImageAsync(upload, filePath);
} }
/// <summary> /// <summary>
@@ -167,11 +203,11 @@ public sealed class TicketService : IDisposable
/// <summary> /// <summary>
/// 使用指定工单参数建立 SSE 连接。 /// 使用指定工单参数建立 SSE 连接。
/// </summary> /// </summary>
public void StartRealtime(TicketClientOptions options) public async Task StartRealtime(TicketClientOptions options)
{ {
ThrowIfDisposed(); ThrowIfDisposed();
ValidateOptions(options); ValidateOptions(options);
_realtime.Start(options); await _realtime.Start(options);
} }
/// <summary> /// <summary>
@@ -191,7 +227,7 @@ public sealed class TicketService : IDisposable
ThrowIfDisposed(); ThrowIfDisposed();
await _realtime.StopAsync(); await _realtime.StopAsync();
ThrowIfDisposed(); ThrowIfDisposed();
StartRealtime(options); await StartRealtime(options);
} }
public void Dispose() public void Dispose()
@@ -0,0 +1,169 @@
using OrderSupportTicket.Models.Api;
using OrderSupportTicket.Services;
using System;
using System.Globalization;
using System.Threading.Tasks;
using System.Windows;
using System.Windows.Media;
using WPFCommon.Models;
namespace OrderSupportTicket.ViewModels;
/// <summary>
/// 留言气泡中的公开图片附件。
/// </summary>
public sealed class ChatAttachmentViewModel : BindableBaseEx
{
private bool _isLoading;
private bool _isLoadFailed;
private ImageSource _image;
public ChatAttachmentViewModel(TicketAttachmentDto dto)
{
if (dto == null)
throw new ArgumentNullException(nameof(dto));
Id = dto.Id;
OriginalName = dto.OriginalName;
ContentType = dto.ContentType;
ByteSize = dto.ByteSize;
ReadUrl = dto.ReadUrl;
}
/// <summary>
/// 附件唯一 ID。
/// </summary>
public string Id { get; }
/// <summary>
/// 原始文件名。
/// </summary>
public string OriginalName { get; }
/// <summary>
/// 图片 MIME 类型。
/// </summary>
public string ContentType { get; }
/// <summary>
/// 图片字节数。
/// </summary>
public long ByteSize { get; }
/// <summary>
/// 服务端生成的短时读取地址。
/// </summary>
public string ReadUrl { get; }
/// <summary>
/// 已下载并解码的图片;加载完成前为空。
/// </summary>
public ImageSource Image
{
get => _image;
private set
{
if (SetValue(ref _image, value))
RaisePropertyChanged(nameof(HasImage));
}
}
/// <summary>
/// 是否已成功显示图片。
/// </summary>
public bool HasImage => Image != null;
/// <summary>
/// 图片是否已经确认加载失败。加载完成前保持为 false。
/// </summary>
public bool IsLoadFailed
{
get => _isLoadFailed;
private set
{
if (SetValue(ref _isLoadFailed, value))
RaisePropertyChanged(nameof(ToolTipText));
}
}
/// <summary>
/// 附件名称、大小与加载状态提示。
/// </summary>
public string ToolTipText
{
get
{
var name = string.IsNullOrWhiteSpace(OriginalName) ? "图片" : OriginalName;
var size = FormatSize(ByteSize);
if (string.IsNullOrWhiteSpace(ReadUrl))
return name + "(" + size + ",暂不可用)";
if (_isLoading)
return name + "(" + size + ",加载中…)";
if (IsLoadFailed)
return name + "(" + size + ",加载失败)";
return name + "(" + size + ")";
}
}
/// <summary>
/// 下载并解码短时读取地址。失败时保留占位提示,不阻断文字留言展示。
/// </summary>
public async Task LoadAsync()
{
if (Image != null || _isLoading)
return;
if (string.IsNullOrWhiteSpace(ReadUrl))
{
IsLoadFailed = true;
return;
}
IsLoadFailed = false;
_isLoading = true;
RaisePropertyChanged(nameof(ToolTipText));
try
{
var image = await ProductImageLoader.LoadAsync(ReadUrl);
if (image == null)
IsLoadFailed = true;
else
await SetImageAsync(image);
}
catch
{
IsLoadFailed = true;
}
finally
{
_isLoading = false;
RaisePropertyChanged(nameof(ToolTipText));
}
}
private async Task SetImageAsync(ImageSource image)
{
if (image == null)
return;
var dispatcher = Application.Current?.Dispatcher;
if (dispatcher == null || dispatcher.CheckAccess())
{
Image = image;
IsLoadFailed = false;
return;
}
await dispatcher.InvokeAsync(() =>
{
Image = image;
IsLoadFailed = false;
});
}
private static string FormatSize(long byteSize)
{
if (byteSize >= 1024 * 1024)
return (byteSize / 1024d / 1024d).ToString("0.0", CultureInfo.CurrentCulture) + " MB";
if (byteSize >= 1024)
return (byteSize / 1024d).ToString("0.0", CultureInfo.CurrentCulture) + " KB";
return byteSize.ToString(CultureInfo.CurrentCulture) + " B";
}
}
@@ -1,6 +1,10 @@
using OrderSupportTicket.Models.Api; using OrderSupportTicket.Models.Api;
using System; using System;
using System.Collections.Generic;
using System.Collections.ObjectModel;
using System.Globalization; using System.Globalization;
using System.Linq;
using System.Threading.Tasks;
using WPFCommon.Models; using WPFCommon.Models;
namespace OrderSupportTicket.ViewModels; namespace OrderSupportTicket.ViewModels;
@@ -22,6 +26,7 @@ public sealed class ChatMessageViewModel : BindableBaseEx
{ {
if (dto == null) if (dto == null)
throw new ArgumentNullException(nameof(dto)); throw new ArgumentNullException(nameof(dto));
Attachments = new ObservableCollection<ChatAttachmentViewModel>();
MessageId = dto.MessageId; MessageId = dto.MessageId;
SequenceNo = dto.SequenceNo; SequenceNo = dto.SequenceNo;
SenderType = dto.SenderType; SenderType = dto.SenderType;
@@ -33,6 +38,7 @@ public sealed class ChatMessageViewModel : BindableBaseEx
? "该消息已撤回" ? "该消息已撤回"
: (dto.Text ?? string.Empty); : (dto.Text ?? string.Empty);
CreatedAt = ParseTimestamp(dto.CreatedAt); CreatedAt = ParseTimestamp(dto.CreatedAt);
ReplaceAttachments(dto.Attachments);
} }
/// <summary> /// <summary>
@@ -81,9 +87,18 @@ public sealed class ChatMessageViewModel : BindableBaseEx
public string Content public string Content
{ {
get => _content; get => _content;
private set => SetValue(ref _content, value); private set
{
if (SetValue(ref _content, value))
RaisePropertyChanged(nameof(HasText));
}
} }
/// <summary>
/// 是否有可展示的文字内容。
/// </summary>
public bool HasText => !string.IsNullOrWhiteSpace(Content);
/// <summary> /// <summary>
/// 消息是否已撤回。 /// 消息是否已撤回。
/// </summary> /// </summary>
@@ -106,6 +121,16 @@ public sealed class ChatMessageViewModel : BindableBaseEx
} }
} }
/// <summary>
/// 消息中的公开图片附件。
/// </summary>
public ObservableCollection<ChatAttachmentViewModel> Attachments { get; }
/// <summary>
/// 是否包含图片附件。
/// </summary>
public bool HasAttachments => Attachments.Count > 0;
/// <summary> /// <summary>
/// 当前消息是否由客户发送。 /// 当前消息是否由客户发送。
/// </summary> /// </summary>
@@ -120,6 +145,53 @@ public sealed class ChatMessageViewModel : BindableBaseEx
? string.Empty ? string.Empty
: CreatedAt.ToLocalTime().ToString("MM-dd HH:mm", CultureInfo.CurrentCulture); : CreatedAt.ToLocalTime().ToString("MM-dd HH:mm", CultureInfo.CurrentCulture);
/// <summary>
/// 使用服务端最新数据更新消息。短时图片地址会随每次查询变化,因此需要刷新附件。
/// </summary>
public void UpdateFrom(TicketMessageDto dto)
{
if (dto == null)
return;
SequenceNo = dto.SequenceNo;
SenderType = dto.SenderType;
SenderDisplayName = string.IsNullOrWhiteSpace(dto.SenderName)
? (IsCustomer ? "我" : "客服")
: dto.SenderName;
IsRecalled = dto.Recalled;
Content = dto.Recalled
? "该消息已撤回"
: (dto.Text ?? string.Empty);
CreatedAt = ParseTimestamp(dto.CreatedAt);
ReplaceAttachments(dto.Attachments);
}
private void ReplaceAttachments(IEnumerable<TicketAttachmentDto> attachments)
{
Attachments.Clear();
foreach (var dto in attachments ?? Enumerable.Empty<TicketAttachmentDto>())
{
if (dto == null)
continue;
Attachments.Add(new ChatAttachmentViewModel(dto));
}
RaisePropertyChanged(nameof(HasAttachments));
_ = LoadAttachmentsAsync();
}
private async Task LoadAttachmentsAsync()
{
try
{
await Task.WhenAll(Attachments.Select(item => item.LoadAsync()));
}
catch
{
// 单张图片加载失败时保留占位提示,不影响文字留言显示。
}
}
private static DateTimeOffset ParseTimestamp(string value) private static DateTimeOffset ParseTimestamp(string value)
{ {
if (DateTimeOffset.TryParse( if (DateTimeOffset.TryParse(
@@ -1,5 +1,6 @@
using AllBase.Helper; using AllBase.Helper;
using AllBase.Model.DBModel; using AllBase.Model.DBModel;
using Microsoft.Win32;
using OrderSupportTicket.Models; using OrderSupportTicket.Models;
using OrderSupportTicket.Models.Api; using OrderSupportTicket.Models.Api;
using OrderSupportTicket.Services; using OrderSupportTicket.Services;
@@ -8,8 +9,10 @@ using System.Collections.Generic;
using System.Collections.ObjectModel; using System.Collections.ObjectModel;
using System.ComponentModel; using System.ComponentModel;
using System.Globalization; using System.Globalization;
using System.IO;
using System.Linq; using System.Linq;
using System.Threading.Tasks; using System.Threading.Tasks;
using System.Windows;
using System.Windows.Input; using System.Windows.Input;
using System.Windows.Data; using System.Windows.Data;
using System.Windows.Media; using System.Windows.Media;
@@ -17,6 +20,7 @@ using System.Windows.Threading;
using WPFCommon.Models; using WPFCommon.Models;
using WxOrder.Framework.Commons; using WxOrder.Framework.Commons;
using WxOrder.Framework.Commons.Dialogs; using WxOrder.Framework.Commons.Dialogs;
using WxOrder.Framework.Controls;
namespace OrderSupportTicket.ViewModels; namespace OrderSupportTicket.ViewModels;
@@ -36,14 +40,23 @@ public sealed class OrderSupportTicketViewModel : BindableBaseEx, IDialogAware,
private readonly AsyncDelegateCommand<WorkOrderSummaryViewModel> _selectTicketCommand; private readonly AsyncDelegateCommand<WorkOrderSummaryViewModel> _selectTicketCommand;
private readonly AsyncDelegateCommand _createTicketCommand; private readonly AsyncDelegateCommand _createTicketCommand;
private readonly AsyncDelegateCommand _sendMessageCommand; private readonly AsyncDelegateCommand _sendMessageCommand;
private readonly AsyncDelegateCommand<PendingAttachmentViewModel> _removePendingAttachmentCommand;
private readonly AsyncDelegateCommand _loadEarlierMessagesCommand; private readonly AsyncDelegateCommand _loadEarlierMessagesCommand;
private readonly AsyncDelegateCommand _refreshMessagesCommand;
private readonly AsyncDelegateCommand _retryRealtimeCommand; private readonly AsyncDelegateCommand _retryRealtimeCommand;
private readonly DelegateCommand<FrameworkElement> _addImagesCommand;
private readonly HashSet<string> _seenEventIds = private readonly HashSet<string> _seenEventIds =
new HashSet<string>(StringComparer.Ordinal); new HashSet<string>(StringComparer.Ordinal);
private readonly Dictionary<string, int> _lastReadSequences = private readonly Dictionary<string, int> _lastReadSequences =
new Dictionary<string, int>(StringComparer.Ordinal); new Dictionary<string, int>(StringComparer.Ordinal);
private Dictionary<string, WorkOrderListCacheItem> _savedWorkOrders = private Dictionary<string, WorkOrderListCacheItem> _savedWorkOrders =
new Dictionary<string, WorkOrderListCacheItem>(StringComparer.Ordinal); new Dictionary<string, WorkOrderListCacheItem>(StringComparer.Ordinal);
// 按 APPID 和订单号隔离各工单消息,切换会话不丢失推送。
private readonly Dictionary<string, Dictionary<string, TicketMessageDto>> _conversationMessages =
new Dictionary<string, Dictionary<string, TicketMessageDto>>(StringComparer.Ordinal);
private readonly Dictionary<string, WorkOrderMessagesResponse> _conversationPages = new Dictionary<string, WorkOrderMessagesResponse>(StringComparer.Ordinal);
private readonly Dictionary<string, Task> _conversationLoads = new Dictionary<string, Task>(StringComparer.Ordinal);
private bool IsRealtimeConversation => _options?.ConversationMode == TicketConversationMode.Realtime;
private bool _hasSavedCache; private bool _hasSavedCache;
private TicketClientOptions _options; private TicketClientOptions _options;
private bool _configured; private bool _configured;
@@ -57,6 +70,7 @@ public sealed class OrderSupportTicketViewModel : BindableBaseEx, IDialogAware,
private string _chatText; private string _chatText;
private string _draftText; private string _draftText;
private string _ticketSearchText = string.Empty; private string _ticketSearchText = string.Empty;
private int _selectedTicketStatusIndex;
private bool _isDraft; private bool _isDraft;
private bool _isBusy; private bool _isBusy;
private bool _isLoading; private bool _isLoading;
@@ -88,6 +102,7 @@ public sealed class OrderSupportTicketViewModel : BindableBaseEx, IDialogAware,
Tickets = new ObservableCollection<WorkOrderSummaryViewModel>(); Tickets = new ObservableCollection<WorkOrderSummaryViewModel>();
Messages = new ObservableCollection<ChatMessageViewModel>(); Messages = new ObservableCollection<ChatMessageViewModel>();
PendingAttachments = new ObservableCollection<PendingAttachmentViewModel>();
TicketView = CollectionViewSource.GetDefaultView(Tickets); TicketView = CollectionViewSource.GetDefaultView(Tickets);
TicketView.Filter = FilterTicket; TicketView.Filter = FilterTicket;
_selectTicketCommand = new AsyncDelegateCommand<WorkOrderSummaryViewModel>( _selectTicketCommand = new AsyncDelegateCommand<WorkOrderSummaryViewModel>(
@@ -99,12 +114,22 @@ public sealed class OrderSupportTicketViewModel : BindableBaseEx, IDialogAware,
_sendMessageCommand = new AsyncDelegateCommand( _sendMessageCommand = new AsyncDelegateCommand(
SendMessageAsync, SendMessageAsync,
CanSendMessage); CanSendMessage);
_removePendingAttachmentCommand =
new AsyncDelegateCommand<PendingAttachmentViewModel>(
RemovePendingAttachmentAsync,
attachment => attachment != null && !IsBusy);
_loadEarlierMessagesCommand = new AsyncDelegateCommand( _loadEarlierMessagesCommand = new AsyncDelegateCommand(
LoadEarlierMessagesAsync, LoadEarlierMessagesAsync,
() => !IsBusy && SelectedTicket != null && HasMoreMessages); () => !IsBusy && SelectedTicket != null && HasMoreMessages);
_refreshMessagesCommand = new AsyncDelegateCommand(
RefreshMessagesAsync,
() => _configured && !IsBusy && !IsLoadingMessages && !IsDraft && SelectedTicket != null);
_retryRealtimeCommand = new AsyncDelegateCommand( _retryRealtimeCommand = new AsyncDelegateCommand(
RestartRealtimeAsync, RestartRealtimeAsync,
() => !IsBusy && _configured); () => _configured);
_addImagesCommand = new DelegateCommand<FrameworkElement>(
AddImages,
_ => CanAddImage);
_ticketService.NotificationReceived += OnNotificationReceived; _ticketService.NotificationReceived += OnNotificationReceived;
_ticketService.StateChanged += OnRealtimeStateChanged; _ticketService.StateChanged += OnRealtimeStateChanged;
SseState = _ticketService.RealtimeState; SseState = _ticketService.RealtimeState;
@@ -144,20 +169,70 @@ public sealed class OrderSupportTicketViewModel : BindableBaseEx, IDialogAware,
/// </summary> /// </summary>
public ICommand SendMessageCommand => _sendMessageCommand; public ICommand SendMessageCommand => _sendMessageCommand;
/// <summary>
/// 移除待发送图片的命令。
/// </summary>
public ICommand RemovePendingAttachmentCommand => _removePendingAttachmentCommand;
/// <summary>
/// 当前留言待发送的本地图片,最多 3 张。
/// </summary>
public ObservableCollection<PendingAttachmentViewModel> PendingAttachments { get; }
/// <summary>
/// 是否已选择待发送图片。
/// </summary>
public bool HasPendingAttachments => PendingAttachments.Count > 0;
/// <summary>
/// 是否还可以继续选择图片。
/// </summary>
public bool CanAddImage =>
!IsBusy
&& SelectedTicket != null
&& PendingAttachments.Count < TicketApiService.MaxImageCount;
/// <summary>
/// 选择本地图片并加入当前留言的待发送列表。
/// </summary>
public ICommand AddImagesCommand => _addImagesCommand;
/// <summary>
/// 待发送图片数量展示文本。
/// </summary>
public string AttachmentCountText =>
PendingAttachments.Count + " / " + TicketApiService.MaxImageCount;
/// <summary> /// <summary>
/// 加载当前工单更早留言的命令。 /// 加载当前工单更早留言的命令。
/// </summary> /// </summary>
public ICommand LoadEarlierMessagesCommand => _loadEarlierMessagesCommand; public ICommand LoadEarlierMessagesCommand => _loadEarlierMessagesCommand;
/// <summary>强制重新获取当前工单消息,两种会话模式均不使用缓存代替请求。</summary>
public ICommand RefreshMessagesCommand => _refreshMessagesCommand;
/// <summary> /// <summary>
/// 手动重新连接 SSE 的命令。 /// 手动重新连接 SSE 的命令。
/// </summary> /// </summary>
public ICommand RetryRealtimeCommand => _retryRealtimeCommand; public ICommand RetryRealtimeCommand => _retryRealtimeCommand;
/// <summary> /// <summary>
/// 当前正在查看的历史工单。 /// 显示图片
/// </summary> /// </summary>
public WorkOrderSummaryViewModel SelectedTicket public ICommand ShowImageWindowCommand => new DelegateCommand<ChatAttachmentViewModel>(ShowImageWindow);
/// <summary>
/// 显示图片
/// </summary>
/// <param name="chatAttachment"></param>
private void ShowImageWindow(ChatAttachmentViewModel chatAttachment)
{
ImageViewerWindow.OpenDialog(chatAttachment.Image);
}
/// <summary>
/// 当前正在查看的历史工单。
/// </summary>
public WorkOrderSummaryViewModel SelectedTicket
{ {
get => _selectedTicket; get => _selectedTicket;
private set private set
@@ -167,6 +242,8 @@ public sealed class OrderSupportTicketViewModel : BindableBaseEx, IDialogAware,
RaisePropertyChanged(nameof(IsChatVisible)); RaisePropertyChanged(nameof(IsChatVisible));
RaisePropertyChanged(nameof(IsEmptyVisible)); RaisePropertyChanged(nameof(IsEmptyVisible));
RaisePropertyChanged(nameof(ComposerPlaceholder)); RaisePropertyChanged(nameof(ComposerPlaceholder));
RaisePropertyChanged(nameof(CanAddImage));
_addImagesCommand.RaiseCanExecuteChanged();
RaiseSendCanExecuteChanged(); RaiseSendCanExecuteChanged();
RaiseLoadEarlierCanExecuteChanged(); RaiseLoadEarlierCanExecuteChanged();
} }
@@ -240,6 +317,19 @@ public sealed class OrderSupportTicketViewModel : BindableBaseEx, IDialogAware,
} }
} }
/// <summary>
/// 历史工单状态页签索引:0 全部、1 待客服回复、2 客服已回复、3 已完结。
/// </summary>
public int SelectedTicketStatusIndex
{
get => _selectedTicketStatusIndex;
set
{
if (SetValue(ref _selectedTicketStatusIndex, value))
TicketView?.Refresh();
}
}
/// <summary> /// <summary>
/// 当前是否处于新建工单草稿状态。 /// 当前是否处于新建工单草稿状态。
/// </summary> /// </summary>
@@ -253,6 +343,8 @@ public sealed class OrderSupportTicketViewModel : BindableBaseEx, IDialogAware,
RaisePropertyChanged(nameof(IsChatVisible)); RaisePropertyChanged(nameof(IsChatVisible));
RaisePropertyChanged(nameof(IsEmptyVisible)); RaisePropertyChanged(nameof(IsEmptyVisible));
RaisePropertyChanged(nameof(IsDraftVisible)); RaisePropertyChanged(nameof(IsDraftVisible));
RaisePropertyChanged(nameof(CanAddImage));
_addImagesCommand.RaiseCanExecuteChanged();
RaiseCreateCanExecuteChanged(); RaiseCreateCanExecuteChanged();
} }
} }
@@ -269,11 +361,14 @@ public sealed class OrderSupportTicketViewModel : BindableBaseEx, IDialogAware,
if (SetValue(ref _isBusy, value)) if (SetValue(ref _isBusy, value))
{ {
RaisePropertyChanged(nameof(IsNotBusy)); RaisePropertyChanged(nameof(IsNotBusy));
RaisePropertyChanged(nameof(CanAddImage));
RaiseSendCanExecuteChanged(); RaiseSendCanExecuteChanged();
RaiseCreateCanExecuteChanged(); RaiseCreateCanExecuteChanged();
_removePendingAttachmentCommand.RaiseCanExecuteChanged();
RaiseLoadEarlierCanExecuteChanged(); RaiseLoadEarlierCanExecuteChanged();
_retryRealtimeCommand.RaiseCanExecuteChanged(); _retryRealtimeCommand.RaiseCanExecuteChanged();
_selectTicketCommand.RaiseCanExecuteChanged(); _selectTicketCommand.RaiseCanExecuteChanged();
_addImagesCommand.RaiseCanExecuteChanged();
if (!value && !string.IsNullOrWhiteSpace(_pendingOpenKey)) if (!value && !string.IsNullOrWhiteSpace(_pendingOpenKey))
_ = SelectPendingTicketAsync(); _ = SelectPendingTicketAsync();
} }
@@ -295,7 +390,11 @@ public sealed class OrderSupportTicketViewModel : BindableBaseEx, IDialogAware,
public bool IsLoadingMessages public bool IsLoadingMessages
{ {
get => _isLoadingMessages; get => _isLoadingMessages;
private set => SetValue(ref _isLoadingMessages, value); private set
{
if (SetValue(ref _isLoadingMessages, value))
_refreshMessagesCommand.RaiseCanExecuteChanged();
}
} }
/// <summary> /// <summary>
@@ -624,6 +723,146 @@ public sealed class OrderSupportTicketViewModel : BindableBaseEx, IDialogAware,
CancelDraft(); CancelDraft();
} }
/// <summary>
/// 把文件选择器返回的本地图片加入待发送列表。
/// 每次留言最多 3 张,单张不超过 5 MiB。
/// </summary>
public void AddPendingImages(IEnumerable<string> filePaths)
{
if (filePaths == null || IsBusy || IsDraft || SelectedTicket == null)
return;
var errors = new List<string>();
var added = 0;
foreach (var filePath in filePaths)
{
if (PendingAttachments.Count >= TicketApiService.MaxImageCount)
{
errors.Add("每次留言最多上传 3 张图片。");
break;
}
if (string.IsNullOrWhiteSpace(filePath))
continue;
string fullPath;
try
{
fullPath = Path.GetFullPath(filePath);
}
catch
{
errors.Add("图片路径无效:" + filePath);
continue;
}
if (PendingAttachments.Any(item =>
string.Equals(item.FilePath, fullPath, StringComparison.OrdinalIgnoreCase)))
{
continue;
}
if (!PendingAttachmentViewModel.TryCreate(
fullPath,
out var attachment,
out var error))
{
errors.Add(error);
continue;
}
PendingAttachments.Add(attachment);
added++;
}
OnPendingAttachmentsChanged();
if (errors.Count > 0)
{
SetNotice(
string.Join(" ", errors.Distinct(StringComparer.Ordinal)),
true);
}
else if (added > 0)
{
ClearNotice();
}
}
/// <summary>
/// 将剪贴板中的位图加入待发送列表。
/// </summary>
public void AddPendingImage(System.Windows.Media.Imaging.BitmapSource bitmap)
{
if (IsBusy || IsDraft || SelectedTicket == null)
return;
if (PendingAttachments.Count >= TicketApiService.MaxImageCount)
{
SetNotice("每次留言最多上传 3 张图片。", true);
return;
}
if (!PendingAttachmentViewModel.TryCreateTemporary(
bitmap, out var attachment, out var error))
{
SetNotice(error, true);
return;
}
PendingAttachments.Add(attachment);
OnPendingAttachmentsChanged();
ClearNotice();
}
private void AddImages(FrameworkElement commandSource)
{
var dialog = new OpenFileDialog
{
Title = "选择图片",
Filter = "图片文件 (*.jpg;*.jpeg;*.png;*.webp)|*.jpg;*.jpeg;*.png;*.webp",
CheckFileExists = true,
Multiselect = true
};
var owner = commandSource == null ? null : Window.GetWindow(commandSource);
var selected = owner == null
? dialog.ShowDialog()
: dialog.ShowDialog(owner);
if (selected == true)
AddPendingImages(dialog.FileNames);
}
private Task RemovePendingAttachmentAsync(
PendingAttachmentViewModel attachment)
{
if (attachment == null)
return Task.CompletedTask;
if (PendingAttachments.Remove(attachment))
attachment.Dispose();
OnPendingAttachmentsChanged();
ClearNotice();
return Task.CompletedTask;
}
private void ClearPendingAttachments()
{
foreach (var attachment in PendingAttachments)
attachment.Dispose();
if (PendingAttachments.Count > 0)
PendingAttachments.Clear();
_pendingMessageFingerprint = null;
_pendingMessageId = null;
OnPendingAttachmentsChanged();
}
private void OnPendingAttachmentsChanged()
{
RaisePropertyChanged(nameof(HasPendingAttachments));
RaisePropertyChanged(nameof(CanAddImage));
RaisePropertyChanged(nameof(AttachmentCountText));
RaiseSendCanExecuteChanged();
_removePendingAttachmentCommand.RaiseCanExecuteChanged();
_addImagesCommand.RaiseCanExecuteChanged();
}
public void Configure(TicketClientOptions options) public void Configure(TicketClientOptions options)
{ {
if (_disposed) if (_disposed)
@@ -643,6 +882,11 @@ public sealed class OrderSupportTicketViewModel : BindableBaseEx, IDialogAware,
_initialized = false; _initialized = false;
_pendingOpenKey = null; _pendingOpenKey = null;
_options = CloneOptions(options); _options = CloneOptions(options);
_conversationMessages.Clear();
_conversationPages.Clear();
_conversationLoads.Clear();
_seenEventIds.Clear();
_lastReadSequences.Clear();
HasNewData = false; HasNewData = false;
NewDataText = string.Empty; NewDataText = string.Empty;
@@ -652,6 +896,7 @@ public sealed class OrderSupportTicketViewModel : BindableBaseEx, IDialogAware,
DraftText = string.Empty; DraftText = string.Empty;
Tickets.Clear(); Tickets.Clear();
Messages.Clear(); Messages.Clear();
ClearPendingAttachments();
if (_options.AppIds == null || _options.AppIds.Count == 0) if (_options.AppIds == null || _options.AppIds.Count == 0)
{ {
@@ -714,12 +959,13 @@ public sealed class OrderSupportTicketViewModel : BindableBaseEx, IDialogAware,
|| (_ticketService.OwnsRealtime && !_initialized); || (_ticketService.OwnsRealtime && !_initialized);
if (shouldStartRealtime) if (shouldStartRealtime)
{ {
_ticketService.StartRealtime(_options); await _ticketService.StartRealtime(_options);
started = true; started = true;
} }
if (!_initialized || started) if (!_initialized || started)
{ {
// 会话模式不改变初始化列表和历史对话加载流程。
await RefreshAllWorkOrdersAsync(loadSelectedMessages: true); await RefreshAllWorkOrdersAsync(loadSelectedMessages: true);
_initialized = true; _initialized = true;
} }
@@ -826,6 +1072,7 @@ public sealed class OrderSupportTicketViewModel : BindableBaseEx, IDialogAware,
return; return;
SaveWorkOrderList(); SaveWorkOrderList();
_disposed = true; _disposed = true;
ClearPendingAttachments();
_ticketService.NotificationReceived -= OnNotificationReceived; _ticketService.NotificationReceived -= OnNotificationReceived;
_ticketService.StateChanged -= OnRealtimeStateChanged; _ticketService.StateChanged -= OnRealtimeStateChanged;
_ticketService.Dispose(); _ticketService.Dispose();
@@ -842,6 +1089,7 @@ public sealed class OrderSupportTicketViewModel : BindableBaseEx, IDialogAware,
IsDraft = true; IsDraft = true;
SelectedTicket = null; SelectedTicket = null;
Messages.Clear(); Messages.Clear();
ClearPendingAttachments();
HasMoreMessages = false; HasMoreMessages = false;
_nextBefore = null; _nextBefore = null;
DraftText = string.Empty; DraftText = string.Empty;
@@ -861,6 +1109,7 @@ public sealed class OrderSupportTicketViewModel : BindableBaseEx, IDialogAware,
IsDraft = false; IsDraft = false;
SelectedOrder = null; SelectedOrder = null;
DraftText = string.Empty; DraftText = string.Empty;
ClearPendingAttachments();
_pendingCreateFingerprint = null; _pendingCreateFingerprint = null;
_pendingCreateRequestId = null; _pendingCreateRequestId = null;
ClearNotice(); ClearNotice();
@@ -904,6 +1153,7 @@ public sealed class OrderSupportTicketViewModel : BindableBaseEx, IDialogAware,
TicketSearchText = string.Empty; TicketSearchText = string.Empty;
CancelDraft(); CancelDraft();
ClearPendingAttachments();
ApplyKnownProductInfo(ticket); ApplyKnownProductInfo(ticket);
SelectedTicket = ticket; SelectedTicket = ticket;
await LoadMessagesAsync(ticket, replace: true); await LoadMessagesAsync(ticket, replace: true);
@@ -987,7 +1237,11 @@ public sealed class OrderSupportTicketViewModel : BindableBaseEx, IDialogAware,
var ticket = SelectedTicket; var ticket = SelectedTicket;
var text = (ChatText ?? string.Empty).Trim(); var text = (ChatText ?? string.Empty).Trim();
var fingerprint = ticket.Key + "|" + text; var pendingAttachments = PendingAttachments.ToList();
var attachmentFingerprint = string.Join(
"|",
pendingAttachments.Select(item => item.Fingerprint));
var fingerprint = ticket.Key + "|" + text + "|" + attachmentFingerprint;
if (!string.Equals( if (!string.Equals(
fingerprint, fingerprint,
_pendingMessageFingerprint, _pendingMessageFingerprint,
@@ -1001,32 +1255,91 @@ public sealed class OrderSupportTicketViewModel : BindableBaseEx, IDialogAware,
ClearNotice(); ClearNotice();
try try
{ {
var receipts = new List<MessageAttachmentReceipt>();
for (var index = 0; index < pendingAttachments.Count; index++)
{
var attachment = pendingAttachments[index];
if (!attachment.HasReceipt)
{
SetNotice(
"正在上传图片 "
+ (index + 1)
+ "/"
+ pendingAttachments.Count
+ "…",
false);
var uploadTicket =
await _ticketService.CreateImageUploadTicketAsync(
_options,
ticket.AppId,
ticket.WechatOrderId,
attachment.FileName,
attachment.MimeType,
attachment.ByteSize);
var receipt = await _ticketService.UploadImageAsync(
uploadTicket.Upload,
attachment.FilePath);
attachment.SetReceipt(receipt);
}
receipts.Add(attachment.Receipt);
}
if (pendingAttachments.Count > 0)
SetNotice("正在发送留言…", false);
var result = await _ticketService.SendMessageAsync( var result = await _ticketService.SendMessageAsync(
_options, _options,
ToSummaryDto(ticket), ToSummaryDto(ticket),
text, string.IsNullOrWhiteSpace(text) ? null : text,
_pendingMessageId); _pendingMessageId,
receipts);
if (result.Message != null) if (result.Message != null)
AppendMessage(result.Message); {
RememberMessage(ticket.Key, result.Message);
MergeMessages(new[] { result.Message });
}
ticket.ApplySendResult(result.Status, result.Version); ticket.ApplySendResult(result.Status, result.Version);
MoveTicketToTop(ticket); MoveTicketToTop(ticket);
TicketView.Refresh();
ChatText = string.Empty; ChatText = string.Empty;
_pendingMessageFingerprint = null; ClearPendingAttachments();
_pendingMessageId = null;
SetNotice( SetNotice(
result.Reopened result.Reopened
? "留言已发送,已完结工单已重新开启。" ? "留言已发送,已完结工单已重新开启。"
: "留言已发送。", : (pendingAttachments.Count > 0
? "图片已发送。"
: "留言已发送。"),
false); false);
await MarkReadBestEffortAsync(ticket); await MarkReadBestEffortAsync(ticket);
SaveWorkOrderList(); SaveWorkOrderList();
MessageScrollVersion++; MessageScrollVersion++;
} }
catch (TicketApiException ex) catch (TicketApiException ex)
when (ex.StatusCode == 409) when (ex.StatusCode == 410
|| string.Equals(
ex.ErrorCode,
"client_api_image_expired",
StringComparison.OrdinalIgnoreCase))
{ {
SetNotice("工单状态或数据版本发生冲突,正在刷新最新内容。", true); foreach (var attachment in PendingAttachments)
attachment.ClearReceipt();
_pendingMessageFingerprint = null;
_pendingMessageId = null;
SetNotice(
"图片上传凭证已过期,已重置上传状态,请重新点击发送。",
true);
}
catch (TicketApiException ex)
when (ex.StatusCode == 409
|| string.Equals(
ex.ErrorCode,
"client_api_image_already_used",
StringComparison.OrdinalIgnoreCase))
{
foreach (var attachment in PendingAttachments)
attachment.ClearReceipt();
SetNotice("工单状态或图片回执发生冲突,正在刷新最新内容。", true);
_pendingMessageFingerprint = null; _pendingMessageFingerprint = null;
_pendingMessageId = null; _pendingMessageId = null;
await RefreshAllWorkOrdersAsync( await RefreshAllWorkOrdersAsync(
@@ -1050,6 +1363,36 @@ public sealed class OrderSupportTicketViewModel : BindableBaseEx, IDialogAware,
} }
} }
private async Task RefreshMessagesAsync()
{
var ticket = SelectedTicket;
if (!_configured || IsBusy || IsLoadingMessages || IsDraft || ticket == null)
return;
var options = _options;
IsBusy = true;
IsLoadingMessages = true;
ClearNotice();
try
{
await FetchConversationAsync(ticket.AppId, ticket.WechatOrderId, force: true);
if (_disposed || !ReferenceEquals(options, _options)
|| IsDraft || SelectedTicket?.Key != ticket.Key)
return;
ShowCachedConversation(SelectedTicket);
await MarkReadBestEffortAsync(SelectedTicket);
}
catch (Exception ex)
{
SetNotice("刷新工单消息失败:" + DescribeException(ex), true);
}
finally
{
IsLoadingMessages = false;
IsBusy = false;
}
}
private async Task LoadEarlierMessagesAsync() private async Task LoadEarlierMessagesAsync()
{ {
var ticket = SelectedTicket; var ticket = SelectedTicket;
@@ -1065,6 +1408,9 @@ public sealed class OrderSupportTicketViewModel : BindableBaseEx, IDialogAware,
ticket.WechatOrderId, ticket.WechatOrderId,
_nextBefore, _nextBefore,
50); 50);
foreach (var message in response.Items ?? new List<TicketMessageDto>())
RememberMessage(ticket.Key, message);
_conversationPages[ticket.Key] = response;
MergeMessages(response.Items ?? new List<TicketMessageDto>()); MergeMessages(response.Items ?? new List<TicketMessageDto>());
HasMoreMessages = response.HasMore; HasMoreMessages = response.HasMore;
_nextBefore = response.NextBefore; _nextBefore = response.NextBefore;
@@ -1111,41 +1457,82 @@ public sealed class OrderSupportTicketViewModel : BindableBaseEx, IDialogAware,
IsLoadingMessages = true; IsLoadingMessages = true;
try try
{ {
var response = await _ticketService.GetMessagesAsync( // 点击工单始终可读取历史,Realtime 模式复用已加载的会话。
_options, if (!IsRealtimeConversation || !_conversationMessages.ContainsKey(ticket.Key))
ticket.AppId, await FetchConversationAsync(ticket.AppId, ticket.WechatOrderId, force: !IsRealtimeConversation);
ticket.WechatOrderId, if (version != _selectionVersion || SelectedTicket?.Key != ticket.Key || IsDraft)
null,
50);
if (version != _selectionVersion
|| SelectedTicket == null
|| !string.Equals(ticket.Key, SelectedTicket.Key, StringComparison.Ordinal))
{
return; return;
} ShowCachedConversation(ticket);
if (replace)
Messages.Clear();
MergeMessages(response.Items ?? new List<TicketMessageDto>());
HasMoreMessages = response.HasMore;
_nextBefore = response.NextBefore;
await MarkReadBestEffortAsync(ticket); await MarkReadBestEffortAsync(ticket);
MessageScrollVersion++;
} }
catch (Exception ex) catch (Exception ex)
{ {
if (replace) if (version == _selectionVersion)
Messages.Clear(); {
HasMoreMessages = false; if (replace) Messages.Clear();
_nextBefore = null; HasMoreMessages = false;
SetNotice(DescribeException(ex), true); _nextBefore = null;
SetNotice(DescribeException(ex), true);
}
} }
finally finally
{ {
IsLoadingMessages = false; if (version == _selectionVersion)
IsLoadingMessages = false;
} }
} }
private async Task FetchConversationAsync(string appId, string orderId, bool force = false)
{
var key = appId + "|" + orderId;
if (_conversationLoads.TryGetValue(key, out var loading))
{
await loading;
if (!force) return;
}
var task = FetchConversationCoreAsync(appId, orderId);
_conversationLoads[key] = task;
try { await task; }
finally
{
if (_conversationLoads.TryGetValue(key, out var current) && ReferenceEquals(current, task))
_conversationLoads.Remove(key);
}
}
private async Task FetchConversationCoreAsync(string appId, string orderId)
{
var options = _options;
var key = appId + "|" + orderId;
var before = _conversationMessages.TryGetValue(key, out var existing)
? new Dictionary<string, TicketMessageDto>(existing, StringComparer.Ordinal) : null;
var response = await _ticketService.GetMessagesAsync(options, appId, orderId, null, 50);
if (_disposed || !ReferenceEquals(options, _options)) return;
// 刷新历史期间收到的增量不能被较早的接口快照覆盖。
var addedDuringLoad = before != null && _conversationMessages.TryGetValue(key, out var latest)
? latest.Where(pair => !before.TryGetValue(pair.Key, out var old)
|| !ReferenceEquals(old, pair.Value)).Select(pair => pair.Value).ToList()
: new List<TicketMessageDto>();
// 只在历史请求成功后建立缓存;首次推送触发的历史已包含该消息,不再追加。
_conversationMessages[key] = new Dictionary<string, TicketMessageDto>(StringComparer.Ordinal);
foreach (var message in response.Items ?? new List<TicketMessageDto>())
RememberMessage(key, message);
foreach (var message in addedDuringLoad)
RememberMessage(key, message);
_conversationPages[key] = response;
}
private void ShowCachedConversation(WorkOrderSummaryViewModel ticket)
{
Messages.Clear();
if (_conversationMessages.TryGetValue(ticket.Key, out var cached))
MergeMessages(cached.Values);
_conversationPages.TryGetValue(ticket.Key, out var page);
HasMoreMessages = page?.HasMore ?? false;
_nextBefore = page?.NextBefore;
MessageScrollVersion++;
}
private async Task RefreshAllWorkOrdersAsync( private async Task RefreshAllWorkOrdersAsync(
bool loadSelectedMessages, bool loadSelectedMessages,
string preferredKey = null) string preferredKey = null)
@@ -1184,8 +1571,8 @@ public sealed class OrderSupportTicketViewModel : BindableBaseEx, IDialogAware,
var hasNewMessage = HasNewMessage(dto); var hasNewMessage = HasNewMessage(dto);
if (existing.TryGetValue(key, out var item)) if (existing.TryGetValue(key, out var item))
{ {
if (!item.TryApply(dto)) // 查询期间可能先收到更新的 SSE,保留较新摘要,不能丢掉该工单。
continue; item.TryApply(dto);
} }
else else
{ {
@@ -1211,7 +1598,15 @@ public sealed class OrderSupportTicketViewModel : BindableBaseEx, IDialogAware,
SaveWorkOrderList(); SaveWorkOrderList();
if (loadSelectedMessages && SelectedTicket != null && !IsDraft) if (loadSelectedMessages && SelectedTicket != null && !IsDraft)
await LoadMessagesAsync(SelectedTicket, replace: true); {
var selected = SelectedTicket;
await FetchConversationAsync(selected.AppId, selected.WechatOrderId, force: true);
if (!IsDraft && SelectedTicket?.Key == selected.Key)
{
ShowCachedConversation(selected);
await MarkReadBestEffortAsync(selected);
}
}
} }
catch (Exception ex) catch (Exception ex)
{ {
@@ -1256,6 +1651,7 @@ public sealed class OrderSupportTicketViewModel : BindableBaseEx, IDialogAware,
ApplyKnownProductInfo(existing); ApplyKnownProductInfo(existing);
SaveWorkOrderList(); SaveWorkOrderList();
ReorderTickets(); ReorderTickets();
TicketView.Refresh();
if (SelectedTicket != null if (SelectedTicket != null
&& string.Equals(SelectedTicket.Key, key, StringComparison.Ordinal) && string.Equals(SelectedTicket.Key, key, StringComparison.Ordinal)
&& !IsDraft) && !IsDraft)
@@ -1276,7 +1672,9 @@ public sealed class OrderSupportTicketViewModel : BindableBaseEx, IDialogAware,
var id = dto.MessageId; var id = dto.MessageId;
if (string.IsNullOrWhiteSpace(id)) if (string.IsNullOrWhiteSpace(id))
id = "sequence:" + dto.SequenceNo; id = "sequence:" + dto.SequenceNo;
if (!byId.ContainsKey(id)) if (byId.TryGetValue(id, out var existing))
existing.UpdateFrom(dto);
else
byId[id] = new ChatMessageViewModel(dto); byId[id] = new ChatMessageViewModel(dto);
} }
@@ -1289,26 +1687,6 @@ public sealed class OrderSupportTicketViewModel : BindableBaseEx, IDialogAware,
Messages.Add(message); Messages.Add(message);
} }
private void AppendMessage(TicketMessageDto dto)
{
if (dto == null)
return;
var id = string.IsNullOrWhiteSpace(dto.MessageId)
? "sequence:" + dto.SequenceNo
: dto.MessageId;
if (Messages.Any(m => string.Equals(m.MessageId, id, StringComparison.Ordinal)))
return;
var incoming = new ChatMessageViewModel(dto);
var index = 0;
while (index < Messages.Count
&& Messages[index].SequenceNo <= incoming.SequenceNo)
{
index++;
}
Messages.Insert(index, incoming);
}
private async Task MarkReadBestEffortAsync(WorkOrderSummaryViewModel ticket) private async Task MarkReadBestEffortAsync(WorkOrderSummaryViewModel ticket)
{ {
if (!_isWindowActive || ticket == null) if (!_isWindowActive || ticket == null)
@@ -1390,21 +1768,33 @@ public sealed class OrderSupportTicketViewModel : BindableBaseEx, IDialogAware,
try try
{ {
if (notification.IsResyncRequired) if (notification.IsResyncRequired
|| string.Equals(notification.Type, "relay.ticket.created", StringComparison.OrdinalIgnoreCase))
{ {
await RefreshAllWorkOrdersAsync( // 刷新后仍恢复当前工单,不能自动切换到新工单。
loadSelectedMessages: SelectedTicket != null && !IsDraft); await RefreshAllWorkOrdersAsync(loadSelectedMessages: true);
var created = FindTicket(notification.AppId + "|" + notification.WechatOrderId);
if (created != null && !notification.IsResyncRequired) MoveTicketToTop(created);
return; return;
} }
if (string.IsNullOrWhiteSpace(notification.AppId) if (string.IsNullOrWhiteSpace(notification.AppId)
|| string.IsNullOrWhiteSpace(notification.WechatOrderId)) || string.IsNullOrWhiteSpace(notification.WechatOrderId)
|| !_options.AppIds.Contains(notification.AppId)) return;
if (IsRealtimeConversation)
await ApplyRealtimeNotificationAsync(notification);
else
{ {
return; // History 保持原有查询摘要、刷新当前对话的流程。
var ticket = FindTicket(notification.AppId + "|" + notification.WechatOrderId);
var unreadCount = (ticket?.UnreadCount ?? 0) + 1;
ticket?.EnsureUnreadCount(unreadCount);
await RefreshSingleWorkOrderAsync(notification.AppId, notification.WechatOrderId);
ticket = FindTicket(notification.AppId + "|" + notification.WechatOrderId);
if (ticket != null && (SelectedTicket?.Key != ticket.Key || !_isWindowActive))
ticket.EnsureUnreadCount(unreadCount);
SaveWorkOrderList();
} }
await RefreshSingleWorkOrderAsync(
notification.AppId,
notification.WechatOrderId);
} }
catch (Exception ex) catch (Exception ex)
{ {
@@ -1412,6 +1802,64 @@ public sealed class OrderSupportTicketViewModel : BindableBaseEx, IDialogAware,
} }
} }
private void RememberMessage(string key, TicketMessageDto message, bool preserveExisting = false)
{
if (message == null)
return;
if (!_conversationMessages.TryGetValue(key, out var messages))
_conversationMessages[key] = messages = new Dictionary<string, TicketMessageDto>(StringComparer.Ordinal);
var id = string.IsNullOrWhiteSpace(message.MessageId)
? "sequence:" + message.SequenceNo : message.MessageId;
if (!preserveExisting || !messages.ContainsKey(id))
messages[id] = message;
}
private async Task ApplyRealtimeNotificationAsync(TicketRealtimeNotification notification)
{
var key = notification.AppId + "|" + notification.WechatOrderId;
var ticket = FindTicket(key);
// 未加载过会话:获取历史,推送消息不再额外插入。
if (!_conversationMessages.TryGetValue(key, out var cached))
{
await FetchConversationAsync(notification.AppId, notification.WechatOrderId);
ticket?.MarkHasNewMessage();
if (!IsDraft && SelectedTicket?.Key == key)
{
ShowCachedConversation(SelectedTicket);
await MarkReadBestEffortAsync(SelectedTicket);
}
SaveWorkOrderList();
return;
}
var message = notification.Message;
if (message == null) return;
var id = string.IsNullOrWhiteSpace(message.MessageId) ? "sequence:" + message.SequenceNo : message.MessageId;
var isNew = !cached.ContainsKey(id);
RememberMessage(key, message);
if (notification.Ticket != null && ticket != null)
{
var dto = notification.Ticket;
dto.AppId = notification.AppId;
dto.WechatOrderId = notification.WechatOrderId;
dto.Version = dto.Version ?? notification.Version;
dto.LastMessageAt = message.CreatedAt;
dto.LastSenderType = message.SenderType;
dto.UnreadCount = ticket.UnreadCount;
ticket.TryApply(dto);
}
if (isNew) ticket?.IncrementUnreadCount();
if (!IsDraft && SelectedTicket?.Key == key)
{
var existing = Messages.FirstOrDefault(m => m.MessageId == id);
if (existing != null) existing.UpdateFrom(message);
else Messages.Add(new ChatMessageViewModel(message));
MessageScrollVersion++;
await MarkReadBestEffortAsync(SelectedTicket);
}
TicketView.Refresh();
SaveWorkOrderList();
}
private void OnRealtimeStateChanged( private void OnRealtimeStateChanged(
object sender, object sender,
TicketRealtimeStateChangedEventArgs args) TicketRealtimeStateChangedEventArgs args)
@@ -1450,6 +1898,13 @@ public sealed class OrderSupportTicketViewModel : BindableBaseEx, IDialogAware,
if (!(item is WorkOrderSummaryViewModel ticket)) if (!(item is WorkOrderSummaryViewModel ticket))
return false; return false;
var expectedStatus = GetStatusFilter(SelectedTicketStatusIndex);
if (expectedStatus != null
&& !string.Equals(ticket.Status, expectedStatus, StringComparison.OrdinalIgnoreCase))
{
return false;
}
var keyword = (TicketSearchText ?? string.Empty).Trim(); var keyword = (TicketSearchText ?? string.Empty).Trim();
if (keyword.Length == 0) if (keyword.Length == 0)
return true; return true;
@@ -1461,6 +1916,21 @@ public sealed class OrderSupportTicketViewModel : BindableBaseEx, IDialogAware,
|| ContainsIgnoreCase(ticket.PreviewText, keyword); || ContainsIgnoreCase(ticket.PreviewText, keyword);
} }
private static string GetStatusFilter(int selectedIndex)
{
switch (selectedIndex)
{
case 1:
return "waiting_reply";
case 2:
return "replied";
case 3:
return "completed";
default:
return null;
}
}
private static bool ContainsIgnoreCase(string source, string keyword) private static bool ContainsIgnoreCase(string source, string keyword)
{ {
return !string.IsNullOrWhiteSpace(source) return !string.IsNullOrWhiteSpace(source)
@@ -1469,10 +1939,11 @@ public sealed class OrderSupportTicketViewModel : BindableBaseEx, IDialogAware,
private bool CanSendMessage() private bool CanSendMessage()
{ {
var text = (ChatText ?? string.Empty).Trim();
return !IsBusy return !IsBusy
&& SelectedTicket != null && SelectedTicket != null
&& !string.IsNullOrWhiteSpace(ChatText) && (!string.IsNullOrWhiteSpace(text) || PendingAttachments.Count > 0)
&& ChatText.Trim().Length <= 4000; && text.Length <= 4000;
} }
private void RaiseSendCanExecuteChanged() private void RaiseSendCanExecuteChanged()
@@ -1488,6 +1959,7 @@ public sealed class OrderSupportTicketViewModel : BindableBaseEx, IDialogAware,
private void RaiseLoadEarlierCanExecuteChanged() private void RaiseLoadEarlierCanExecuteChanged()
{ {
_loadEarlierMessagesCommand.RaiseCanExecuteChanged(); _loadEarlierMessagesCommand.RaiseCanExecuteChanged();
_refreshMessagesCommand.RaiseCanExecuteChanged();
} }
private void SetNotice(string text, bool isError) private void SetNotice(string text, bool isError)
@@ -1768,9 +2240,10 @@ public sealed class OrderSupportTicketViewModel : BindableBaseEx, IDialogAware,
{ {
400 => "请求格式错误。", 400 => "请求格式错误。",
404 => "该 APPID 和订单下尚无工单。", 404 => "该 APPID 和订单下尚无工单。",
409 => "数据版本或幂等编号冲突。", 409 => "数据版本、幂等编号或图片回执冲突。",
410 => "图片上传凭证已过期。",
413 => "请求内容超过大小限制。", 413 => "请求内容超过大小限制。",
422 => "参数或订单归属校验失败。", 422 => "参数、图片格式或订单归属校验失败。",
429 => "请求过于频繁,请稍后重试。", 429 => "请求过于频繁,请稍后重试。",
503 => "工单服务暂未开启或数据库繁忙。", 503 => "工单服务暂未开启或数据库繁忙。",
_ => null _ => null
@@ -0,0 +1,342 @@
using OrderSupportTicket.Models.Api;
using OrderSupportTicket.Services;
using System;
using System.Globalization;
using System.IO;
using System.Windows.Media;
using System.Windows.Media.Imaging;
using WPFCommon.Models;
namespace OrderSupportTicket.ViewModels;
/// <summary>
/// 发送留言前已选择、待上传的本地图片。
/// </summary>
public sealed class PendingAttachmentViewModel : BindableBaseEx, IDisposable
{
private const long MaxImageBytes = TicketApiService.MaxImageBytes;
private ImageSource _preview;
private MessageAttachmentReceipt _receipt;
private string _receiptFingerprint;
private readonly bool _deleteFileOnDispose;
private bool _disposed;
private PendingAttachmentViewModel(
string filePath,
string fileName,
string mimeType,
long byteSize,
DateTime lastWriteTimeUtc,
bool deleteFileOnDispose = false)
{
FilePath = filePath;
FileName = fileName;
MimeType = mimeType;
ByteSize = byteSize;
_deleteFileOnDispose = deleteFileOnDispose;
Fingerprint = filePath.ToLowerInvariant()
+ "|"
+ byteSize.ToString(CultureInfo.InvariantCulture)
+ "|"
+ lastWriteTimeUtc.Ticks.ToString(CultureInfo.InvariantCulture);
Preview = LoadPreview(filePath);
}
/// <summary>
/// 本地绝对路径,仅用于读取并直传,不提交给业务接口。
/// </summary>
public string FilePath { get; }
/// <summary>
/// 原始文件名。
/// </summary>
public string FileName { get; }
/// <summary>
/// 图片 MIME 类型。
/// </summary>
public string MimeType { get; }
/// <summary>
/// 图片字节数。
/// </summary>
public long ByteSize { get; }
/// <summary>
/// 本地文件内容标识,用于判断是否需要重新上传。
/// </summary>
public string Fingerprint { get; }
/// <summary>
/// 本地缩略图;WebP 等当前 WPF 解码器不支持时为空。
/// </summary>
public ImageSource Preview
{
get => _preview;
private set
{
if (SetValue(ref _preview, value))
RaisePropertyChanged(nameof(HasPreview));
}
}
/// <summary>
/// 是否已加载本地缩略图。
/// </summary>
public bool HasPreview => Preview != null;
/// <summary>
/// 当前文件是否已有可复用的上传回执。
/// </summary>
public bool HasReceipt =>
Receipt != null
&& string.Equals(_receiptFingerprint, Fingerprint, StringComparison.Ordinal);
/// <summary>
/// 上传回执;仅在本类内部更新。
/// </summary>
public MessageAttachmentReceipt Receipt
{
get => _receipt;
private set
{
if (SetValue(ref _receipt, value))
RaisePropertyChanged(nameof(HasReceipt));
}
}
/// <summary>
/// 图片大小展示文本。
/// </summary>
public string SizeText => FormatSize(ByteSize);
/// <summary>
/// 保存本次上传成功的回执,后续网络重试可直接复用。
/// </summary>
public void SetReceipt(MessageAttachmentReceipt receipt)
{
if (receipt == null)
throw new ArgumentNullException(nameof(receipt));
_receiptFingerprint = Fingerprint;
Receipt = receipt;
}
/// <summary>
/// 清除已失效的上传回执,下次发送时重新申请凭证。
/// </summary>
public void ClearReceipt()
{
_receiptFingerprint = null;
Receipt = null;
}
/// <summary>
/// 校验并创建本地待发送图片。
/// </summary>
public static bool TryCreate(
string filePath,
out PendingAttachmentViewModel attachment,
out string error)
{
attachment = null;
error = null;
if (string.IsNullOrWhiteSpace(filePath))
{
error = "图片路径为空。";
return false;
}
string fullPath;
FileInfo file;
try
{
fullPath = Path.GetFullPath(filePath);
file = new FileInfo(fullPath);
if (!file.Exists)
{
error = "图片文件不存在:" + Path.GetFileName(filePath);
return false;
}
}
catch (Exception ex)
{
error = "无法读取图片文件:" + ex.Message;
return false;
}
if (!TryGetMimeType(file.Extension, out var mimeType))
{
error = "仅支持 JPG、PNG、WebP 图片:" + file.Name;
return false;
}
if (file.Length < 1 || file.Length > MaxImageBytes)
{
error = "单张图片必须大于 0 且不超过 5 MiB:" + file.Name;
return false;
}
attachment = new PendingAttachmentViewModel(
fullPath,
file.Name,
mimeType,
file.Length,
file.LastWriteTimeUtc);
return true;
}
/// <summary>
/// 将剪贴板位图保存为临时 PNG,并创建可上传的附件。
/// </summary>
public static bool TryCreateTemporary(
BitmapSource bitmap,
out PendingAttachmentViewModel attachment,
out string error)
{
attachment = null;
error = null;
if (bitmap == null)
{
error = "剪贴板中没有可用的图片。";
return false;
}
string filePath = null;
try
{
filePath = Path.Combine(
Path.GetTempPath(),
"WxOrder-Clipboard-" + Guid.NewGuid().ToString("N") + ".png");
var encoder = new PngBitmapEncoder();
encoder.Frames.Add(BitmapFrame.Create(NormalizeClipboardBitmap(bitmap)));
using (var stream = File.Create(filePath))
encoder.Save(stream);
var file = new FileInfo(filePath);
if (file.Length < 1 || file.Length > MaxImageBytes)
{
error = "粘贴的图片必须大于 0 且不超过 5 MiB。";
TryDelete(filePath);
return false;
}
attachment = new PendingAttachmentViewModel(
file.FullName,
"粘贴图片.png",
"image/png",
file.Length,
file.LastWriteTimeUtc,
deleteFileOnDispose: true);
return true;
}
catch (Exception ex)
{
TryDelete(filePath);
error = "无法读取剪贴板图片:" + ex.Message;
return false;
}
}
private static BitmapSource NormalizeClipboardBitmap(BitmapSource bitmap)
{
if (bitmap.Format != PixelFormats.Bgra32 && bitmap.Format != PixelFormats.Pbgra32)
return bitmap;
var stride = checked(bitmap.PixelWidth * 4);
var pixels = new byte[checked(stride * bitmap.PixelHeight)];
bitmap.CopyPixels(pixels, stride, 0);
for (var i = 3; i < pixels.Length; i += 4)
{
if (pixels[i] != 0)
return bitmap;
}
// 微信等截图工具可能将 DIB 的保留字节全部置零,WPF 将其解释为 Alpha。
// 直接按 Bgr32 使用原始颜色,避免预乘 Alpha 转换时丢失 RGB;正常透明图保持原样。
var normalized = BitmapSource.Create(
bitmap.PixelWidth, bitmap.PixelHeight, bitmap.DpiX, bitmap.DpiY,
PixelFormats.Bgr32, null, pixels, stride);
normalized.Freeze();
return normalized;
}
public void Dispose()
{
if (_disposed)
return;
_disposed = true;
if (_deleteFileOnDispose)
TryDelete(FilePath);
}
/// <summary>
/// 根据扩展名映射文档要求的精确 MIME 类型。
/// </summary>
public static bool TryGetMimeType(string extension, out string mimeType)
{
switch ((extension ?? string.Empty).Trim().ToLowerInvariant())
{
case ".jpg":
case ".jpeg":
mimeType = "image/jpeg";
return true;
case ".png":
mimeType = "image/png";
return true;
case ".webp":
mimeType = "image/webp";
return true;
default:
mimeType = null;
return false;
}
}
private static ImageSource LoadPreview(string filePath)
{
try
{
var image = new BitmapImage();
using (var stream = File.OpenRead(filePath))
{
image.BeginInit();
image.CacheOption = BitmapCacheOption.OnLoad;
image.CreateOptions = BitmapCreateOptions.IgnoreColorProfile;
image.DecodePixelWidth = 160;
image.StreamSource = stream;
image.EndInit();
}
image.Freeze();
return image;
}
catch
{
return null;
}
}
private static void TryDelete(string filePath)
{
if (string.IsNullOrWhiteSpace(filePath))
return;
try
{
if (File.Exists(filePath))
File.Delete(filePath);
}
catch
{
// 临时文件清理失败不影响留言发送流程。
}
}
private static string FormatSize(long byteSize)
{
if (byteSize >= 1024 * 1024)
return (byteSize / 1024d / 1024d).ToString("0.0", CultureInfo.CurrentCulture) + " MB";
if (byteSize >= 1024)
return (byteSize / 1024d).ToString("0.0", CultureInfo.CurrentCulture) + " KB";
return byteSize.ToString(CultureInfo.CurrentCulture) + " B";
}
}
@@ -1,4 +1,4 @@
using AllBase.Helper; using AllBase.Helper;
using OrderSupportTicket.Models.Api; using OrderSupportTicket.Models.Api;
using OrderSupportTicket.Services; using OrderSupportTicket.Services;
using System; using System;
@@ -296,6 +296,8 @@ public sealed class WorkOrderSummaryViewModel : BindableBaseEx
public void ApplySendResult(string status, string version) public void ApplySendResult(string status, string version)
{ {
if (!IsAtLeastCurrentVersion(version))
return;
if (!string.IsNullOrWhiteSpace(status)) if (!string.IsNullOrWhiteSpace(status))
{ {
Status = status; Status = status;
@@ -309,6 +311,18 @@ public sealed class WorkOrderSummaryViewModel : BindableBaseEx
HasNewMessage = false; HasNewMessage = false;
} }
public void EnsureUnreadCount(int count)
{
UnreadCount = Math.Max(UnreadCount, count);
if (UnreadCount > 0) HasNewMessage = true;
}
public void IncrementUnreadCount()
{
UnreadCount++;
HasNewMessage = true;
}
public void MarkRead() public void MarkRead()
{ {
UnreadCount = 0; UnreadCount = 0;
@@ -0,0 +1,290 @@
<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
<BooleanToVisibilityConverter x:Key="BoolToVisibility" />
<SolidColorBrush x:Key="BrandBrush" Color="#98638F" />
<SolidColorBrush x:Key="BrandSoftBrush" Color="#F3EAF2" />
<SolidColorBrush x:Key="LineBrush" Color="#DDE2E8" />
<SolidColorBrush x:Key="TextBrush" Color="#1F2933" />
<SolidColorBrush x:Key="SubTextBrush" Color="#6B7785" />
<SolidColorBrush x:Key="PriceBrush" Color="#C2410C" />
<SolidColorBrush x:Key="BackgroundBrush" Color="#EEF1F4" />
<SolidColorBrush x:Key="PanelBrush" Color="#FFFFFF" />
<SolidColorBrush x:Key="OtherBubbleBrush" Color="#F1F3F6" />
<SolidColorBrush x:Key="WaitingBrush" Color="#B45309" />
<SolidColorBrush x:Key="WaitingBackgroundBrush" Color="#FDF0DA" />
<SolidColorBrush x:Key="RepliedBrush" Color="#1D5FA8" />
<SolidColorBrush x:Key="RepliedBackgroundBrush" Color="#E2EDF9" />
<SolidColorBrush x:Key="DoneBrush" Color="#5B6673" />
<SolidColorBrush x:Key="DoneBackgroundBrush" Color="#E9ECF0" />
<Style x:Key="CopyableOrderIdStyle" TargetType="TextBlock">
<Setter Property="Background" Value="Transparent" />
<Setter Property="Cursor" Value="Hand" />
<Setter Property="FontWeight" Value="SemiBold" />
<Setter Property="Foreground" Value="{StaticResource TextBrush}" />
<Setter Property="ToolTip" Value="点击复制订单号" />
<Style.Triggers>
<Trigger Property="IsMouseOver" Value="True">
<Setter Property="Foreground" Value="{StaticResource BrandBrush}" />
<Setter Property="TextDecorations" Value="Underline" />
</Trigger>
</Style.Triggers>
</Style>
<Style x:Key="PrimaryButtonStyle" TargetType="Button">
<Setter Property="Foreground" Value="White" />
<Setter Property="Background" Value="{StaticResource BrandBrush}" />
<Setter Property="BorderBrush" Value="{StaticResource BrandBrush}" />
<Setter Property="BorderThickness" Value="1" />
<Setter Property="Padding" Value="14,6" />
<Setter Property="Cursor" Value="Hand" />
<Setter Property="Template">
<Setter.Value>
<ControlTemplate TargetType="Button">
<Border
x:Name="Root"
Background="{TemplateBinding Background}"
BorderBrush="{TemplateBinding BorderBrush}"
BorderThickness="{TemplateBinding BorderThickness}"
CornerRadius="4">
<ContentPresenter
Margin="{TemplateBinding Padding}"
HorizontalAlignment="Center"
VerticalAlignment="Center" />
</Border>
<ControlTemplate.Triggers>
<Trigger Property="IsMouseOver" Value="True">
<Setter TargetName="Root" Property="Opacity" Value="0.88" />
</Trigger>
<Trigger Property="IsPressed" Value="True">
<Setter TargetName="Root" Property="Opacity" Value="0.72" />
</Trigger>
<Trigger Property="IsEnabled" Value="False">
<Setter TargetName="Root" Property="Opacity" Value="0.45" />
</Trigger>
</ControlTemplate.Triggers>
</ControlTemplate>
</Setter.Value>
</Setter>
</Style>
<Style x:Key="GhostButtonStyle" TargetType="Button">
<Setter Property="Foreground" Value="{StaticResource BrandBrush}" />
<Setter Property="Background" Value="Transparent" />
<Setter Property="BorderBrush" Value="{StaticResource BrandBrush}" />
<Setter Property="BorderThickness" Value="1" />
<Setter Property="Padding" Value="12,5" />
<Setter Property="Cursor" Value="Hand" />
<Setter Property="Template">
<Setter.Value>
<ControlTemplate TargetType="Button">
<Border
x:Name="Root"
Background="{TemplateBinding Background}"
BorderBrush="{TemplateBinding BorderBrush}"
BorderThickness="{TemplateBinding BorderThickness}"
CornerRadius="4">
<ContentPresenter
Margin="{TemplateBinding Padding}"
HorizontalAlignment="Center"
VerticalAlignment="Center" />
</Border>
<ControlTemplate.Triggers>
<Trigger Property="IsMouseOver" Value="True">
<Setter TargetName="Root" Property="Background" Value="{StaticResource BrandSoftBrush}" />
</Trigger>
<Trigger Property="IsEnabled" Value="False">
<Setter TargetName="Root" Property="Opacity" Value="0.42" />
</Trigger>
</ControlTemplate.Triggers>
</ControlTemplate>
</Setter.Value>
</Setter>
</Style>
<Style x:Key="StatusTagStyle" TargetType="Border">
<Setter Property="Background" Value="{StaticResource DoneBackgroundBrush}" />
<Setter Property="CornerRadius" Value="10" />
<Setter Property="Padding" Value="8,2" />
<Style.Triggers>
<DataTrigger Binding="{Binding Status}" Value="waiting_reply">
<Setter Property="Background" Value="{StaticResource WaitingBackgroundBrush}" />
</DataTrigger>
<DataTrigger Binding="{Binding Status}" Value="replied">
<Setter Property="Background" Value="{StaticResource RepliedBackgroundBrush}" />
</DataTrigger>
</Style.Triggers>
</Style>
<Style x:Key="StatusTextStyle" TargetType="TextBlock">
<Setter Property="Foreground" Value="{StaticResource DoneBrush}" />
<Setter Property="FontSize" Value="12" />
<Style.Triggers>
<DataTrigger Binding="{Binding Status}" Value="waiting_reply">
<Setter Property="Foreground" Value="{StaticResource WaitingBrush}" />
</DataTrigger>
<DataTrigger Binding="{Binding Status}" Value="replied">
<Setter Property="Foreground" Value="{StaticResource RepliedBrush}" />
</DataTrigger>
</Style.Triggers>
</Style>
<Style x:Key="TicketListItemStyle" TargetType="ListBoxItem">
<Setter Property="Padding" Value="0" />
<Setter Property="Margin" Value="0" />
<Setter Property="HorizontalContentAlignment" Value="Stretch" />
<Setter Property="Background" Value="Transparent" />
<Setter Property="Cursor" Value="Hand" />
<Setter Property="Template">
<Setter.Value>
<ControlTemplate TargetType="ListBoxItem">
<Border
x:Name="Root"
Background="{TemplateBinding Background}"
BorderBrush="Transparent"
BorderThickness="3,0,0,0">
<ContentPresenter />
</Border>
<ControlTemplate.Triggers>
<Trigger Property="IsMouseOver" Value="True">
<Setter TargetName="Root" Property="Background" Value="{StaticResource BackgroundBrush}" />
</Trigger>
<Trigger Property="IsSelected" Value="True">
<Setter TargetName="Root" Property="Background" Value="{StaticResource BrandSoftBrush}" />
<Setter TargetName="Root" Property="BorderBrush" Value="{StaticResource BrandBrush}" />
</Trigger>
</ControlTemplate.Triggers>
</ControlTemplate>
</Setter.Value>
</Setter>
</Style>
<Style x:Key="ChatListItemStyle" TargetType="ListBoxItem">
<Setter Property="Padding" Value="0" />
<Setter Property="Margin" Value="0" />
<Setter Property="HorizontalContentAlignment" Value="Stretch" />
<Setter Property="Background" Value="Transparent" />
<Setter Property="Focusable" Value="False" />
<Setter Property="IsTabStop" Value="False" />
<Setter Property="Template">
<Setter.Value>
<ControlTemplate TargetType="ListBoxItem">
<ContentPresenter />
</ControlTemplate>
</Setter.Value>
</Setter>
</Style>
<Style x:Key="AttachmentRemoveButtonStyle" TargetType="Button">
<Setter Property="Width" Value="20" />
<Setter Property="Height" Value="20" />
<Setter Property="Padding" Value="0" />
<Setter Property="Foreground" Value="White" />
<Setter Property="Background" Value="#CC1F2933" />
<Setter Property="BorderThickness" Value="0" />
<Setter Property="Cursor" Value="Hand" />
<Setter Property="Template">
<Setter.Value>
<ControlTemplate TargetType="Button">
<Border
x:Name="Root"
Background="{TemplateBinding Background}"
CornerRadius="10">
<ContentPresenter HorizontalAlignment="Center" VerticalAlignment="Center" />
</Border>
<ControlTemplate.Triggers>
<Trigger Property="IsMouseOver" Value="True">
<Setter TargetName="Root" Property="Background" Value="#E61F2933" />
</Trigger>
</ControlTemplate.Triggers>
</ControlTemplate>
</Setter.Value>
</Setter>
</Style>
<Style x:Key="StatusTabItemStyle" TargetType="TabItem">
<Setter Property="Padding" Value="6,6" />
<Setter Property="FontSize" Value="12" />
<Setter Property="Foreground" Value="{StaticResource SubTextBrush}" />
<Setter Property="Cursor" Value="Hand" />
<Setter Property="Template">
<Setter.Value>
<ControlTemplate TargetType="TabItem">
<Border
x:Name="Root"
Padding="{TemplateBinding Padding}"
Background="Transparent"
BorderBrush="{StaticResource BrandBrush}"
BorderThickness="0,0,0,2">
<ContentPresenter
HorizontalAlignment="Center"
VerticalAlignment="Center"
ContentSource="Header"
RecognizesAccessKey="True" />
</Border>
<ControlTemplate.Triggers>
<Trigger Property="IsSelected" Value="True">
<Setter Property="Foreground" Value="{StaticResource BrandBrush}" />
<Setter Property="FontWeight" Value="SemiBold" />
</Trigger>
<Trigger Property="IsSelected" Value="False">
<Setter TargetName="Root" Property="BorderBrush" Value="Transparent" />
</Trigger>
<Trigger Property="IsMouseOver" Value="True">
<Setter TargetName="Root" Property="Background" Value="{StaticResource BrandSoftBrush}" />
</Trigger>
</ControlTemplate.Triggers>
</ControlTemplate>
</Setter.Value>
</Setter>
</Style>
<Style x:Key="ChatScrollBarStyle" TargetType="ScrollBar">
<Setter Property="Width" Value="8" />
<Setter Property="MinWidth" Value="8" />
<Setter Property="MaxWidth" Value="8" />
<Setter Property="Margin" Value="0,4,2,4" />
<Setter Property="Opacity" Value="0.65" />
<Setter Property="Template">
<Setter.Value>
<ControlTemplate TargetType="ScrollBar">
<Grid Background="Transparent">
<Track
x:Name="PART_Track"
Focusable="False"
IsDirectionReversed="True">
<Track.DecreaseRepeatButton>
<RepeatButton
Command="ScrollBar.PageUpCommand"
Focusable="False"
Opacity="0" />
</Track.DecreaseRepeatButton>
<Track.Thumb>
<Thumb MinHeight="32">
<Thumb.Template>
<ControlTemplate TargetType="Thumb">
<Border
x:Name="ThumbBorder"
Margin="1,0"
Background="#AAB4C0"
CornerRadius="3" />
<ControlTemplate.Triggers>
<Trigger Property="IsMouseOver" Value="True">
<Setter TargetName="ThumbBorder" Property="Background" Value="{StaticResource BrandBrush}" />
</Trigger>
<Trigger Property="IsDragging" Value="True">
<Setter TargetName="ThumbBorder" Property="Background" Value="#7F4F77" />
</Trigger>
</ControlTemplate.Triggers>
</ControlTemplate>
</Thumb.Template>
</Thumb>
</Track.Thumb>
<Track.IncreaseRepeatButton>
<RepeatButton
Command="ScrollBar.PageDownCommand"
Focusable="False"
Opacity="0" />
</Track.IncreaseRepeatButton>
</Track>
</Grid>
<ControlTemplate.Triggers>
<Trigger Property="IsMouseOver" Value="True">
<Setter Property="Opacity" Value="1" />
</Trigger>
</ControlTemplate.Triggers>
</ControlTemplate>
</Setter.Value>
</Setter>
</Style>
</ResourceDictionary>
File diff suppressed because it is too large. Load diff
@@ -1,234 +1,106 @@
using _29WxOrderWpf.ToolCtrls; using OrderSupportTicket.Models;
using OrderSupportTicket.Models;
using OrderSupportTicket.Services; using OrderSupportTicket.Services;
using OrderSupportTicket.ViewModels; using OrderSupportTicket.ViewModels;
using System.Runtime.InteropServices; using System;
using System.Windows; using System.Windows;
using System.Windows.Controls; using System.Windows.Controls;
using System.Windows.Input;
namespace OrderSupportTicket.Views; namespace OrderSupportTicket.Views;
/// <summary> /// <summary>
/// 工单对话页面。页面生命周期只负责激活/停用 ViewModel,业务交互均在 ViewModel 中。 /// 工单页面外壳,只负责组合子视图以及管理页面生命周期。
/// </summary> /// </summary>
public partial class OrderSupportTicketView : UserControl public partial class OrderSupportTicketView : UserControl
{ {
private bool _active; private bool _active;
private Window _hostWindow; private Window _hostWindow;
public OrderSupportTicketView() public OrderSupportTicketView() : this(new TicketService(), CreateDefaultOptions()) { }
: this(new TicketService(), CreateDefaultOptions())
{
}
/// <summary> public OrderSupportTicketView(TicketService ticketService, TicketClientOptions options = null)
/// 使用工单业务服务创建工单页。 {
/// </summary> InitializeComponent();
public OrderSupportTicketView( ViewModel = new OrderSupportTicketViewModel(ticketService, options ?? CreateDefaultOptions());
TicketService ticketService, DataContext = ViewModel;
TicketClientOptions options = null) Loaded += OnLoaded;
{ Unloaded += OnUnloaded;
InitializeComponent();
ViewModel = new OrderSupportTicketViewModel(
ticketService,
options ?? CreateDefaultOptions());
DataContext = ViewModel;
Loaded += OnLoaded;
Unloaded += OnUnloaded;
}
/// <summary>
/// 当前联调使用的默认参数。正式接入时可由宿主替换为登录账号和店铺 APPID。
/// </summary>
public static TicketClientOptions CreateDefaultOptions(string fallbackUserName = null)
{
var configured = TicketClientOptions.FromApplicationSettings();
var userName = !string.IsNullOrWhiteSpace(configured.UserName)
? configured.UserName
: (!string.IsNullOrWhiteSpace(fallbackUserName)
? fallbackUserName.Trim()
: "18990991234");
var appIds = configured.AppIds != null && configured.AppIds.Count > 0
? configured.AppIds
: new List<string>
{
"wx316b1291351558aa",
"wx7999743c3d64c05c"
};
return new TicketClientOptions
{
UserName = userName,
AppIds = appIds,
Orders =
[
new TicketOrderOption
{
Amount = 109m,
AppId = "wx316b1291351558aa",
GoodsName = "梵客隆收腹内裤女新款高腰无痕磨毛暖融收小肚子提臀塑身平角裤",
OrderId = "9000000000000000001",
OrderedAt = new DateTime(2020, 1, 1),
},
new TicketOrderOption
{
Amount = 109m,
AppId = "wx7999743c3d64c05c",
GoodsName = "洁柔抽纸粉Face家用实惠装批发纸巾大包面纸餐巾纸抽整箱可湿水纸",
OrderId = "9000000000000000002",
OrderedAt = new DateTime(2020, 1, 1),
}
]
};
}
/// <summary>
/// 当前页面对应的工单 ViewModel。
/// </summary>
public OrderSupportTicketViewModel ViewModel { get; }
/// <summary>
/// 宿主可在页面加载前注入账号、APPID 与本地订单数据。
/// </summary>
public void Configure(TicketClientOptions options)
{
ViewModel.Configure(options);
}
/// <summary>
/// 从订单页直接打开新工单草稿。
/// </summary>
public void OpenNewTicket(TicketOrderOption order)
{
ViewModel.OpenNewTicket(order);
}
/// <summary>
/// 打开并定位到指定工单。
/// </summary>
public void OpenTicket(string appId, string wechatOrderId)
{
ViewModel.OpenTicket(appId, wechatOrderId);
}
private void TicketSearchBox_GotFocus(object sender, RoutedEventArgs e)
{
ViewModel.CancelNewTicketDraft();
}
/// <summary>
/// 点击订单号复制到剪贴板,并使用宿主窗口的 Toast 提示结果。
/// </summary>
private void CopyOrderId_MouseLeftButtonUp(object sender, MouseButtonEventArgs e)
{
if (sender is not FrameworkElement element)
return;
var orderId = element.Tag as string;
if (string.IsNullOrWhiteSpace(orderId)
&& element.DataContext is WorkOrderSummaryViewModel ticket)
{
orderId = ticket.WechatOrderId;
}
if (string.IsNullOrWhiteSpace(orderId))
return;
var window = Window.GetWindow(this) ?? _hostWindow;
if (window == null)
return;
if (ClipboardHelper.TrySetText(orderId))
{
ToastHelper.Show(window, "订单号已复制");
}
else
{
ToastHelper.Show(window, "复制失败");
}
} }
private async void OnLoaded(object sender, System.Windows.RoutedEventArgs e) public static TicketClientOptions CreateDefaultOptions(string fallbackUserName = null)
{ {
if (_active) var configured = TicketClientOptions.FromApplicationSettings();
return; var userName = !string.IsNullOrWhiteSpace(configured.UserName)
_active = true; ? configured.UserName
AttachHostWindow(Window.GetWindow(this)); : (!string.IsNullOrWhiteSpace(fallbackUserName) ? fallbackUserName.Trim() : "18990991234");
UpdateWindowActiveState(); var appIds = configured.AppIds != null && configured.AppIds.Count > 0
await ViewModel.InitializeAsync(); ? configured.AppIds
} : new List<string> { "wx316b1291351558aa", "wx7999743c3d64c05c" };
private async void OnUnloaded(object sender, System.Windows.RoutedEventArgs e) return new TicketClientOptions
{ {
if (!_active) UserName = userName,
return; ConversationMode = configured.ConversationMode,
_active = false; AppIds = appIds,
ViewModel.IsWindowActive = false; Orders =
DetachHostWindow(); [
await ViewModel.DeactivateAsync(); new TicketOrderOption { Amount = 109m, AppId = "wx316b1291351558aa", GoodsName = "梵客隆收腹内裤女新款高腰无痕磨毛暖融收小肚子提臀塑身平角裤", OrderId = "9000000000000000001", OrderedAt = new DateTime(2020, 1, 1) },
} new TicketOrderOption { Amount = 109m, AppId = "wx7999743c3d64c05c", GoodsName = "洁柔抽纸粉Face家用实惠装批发纸巾大包面纸餐巾纸抽整箱可湿水纸", OrderId = "9000000000000000002", OrderedAt = new DateTime(2020, 1, 1) }
]
};
}
private void AttachHostWindow(Window window) public OrderSupportTicketViewModel ViewModel { get; }
{ public void Configure(TicketClientOptions options) => ViewModel.Configure(options);
DetachHostWindow(); public void OpenNewTicket(TicketOrderOption order) => ViewModel.OpenNewTicket(order);
_hostWindow = window; public void OpenTicket(string appId, string wechatOrderId) => ViewModel.OpenTicket(appId, wechatOrderId);
if (_hostWindow == null)
return;
_hostWindow.Activated += OnHostWindowActivated; private async void OnLoaded(object sender, RoutedEventArgs e)
_hostWindow.Deactivated += OnHostWindowDeactivated; {
_hostWindow.IsVisibleChanged += OnHostWindowIsVisibleChanged; if (_active) return;
_hostWindow.StateChanged += OnHostWindowStateChanged; _active = true;
_hostWindow.Closed += OnHostWindowClosed; AttachHostWindow(Window.GetWindow(this));
} UpdateWindowActiveState();
await ViewModel.InitializeAsync();
}
private void DetachHostWindow() private async void OnUnloaded(object sender, RoutedEventArgs e)
{ {
if (_hostWindow == null) if (!_active) return;
return; _active = false;
ViewModel.IsWindowActive = false;
DetachHostWindow();
await ViewModel.DeactivateAsync();
}
_hostWindow.Activated -= OnHostWindowActivated; private void AttachHostWindow(Window window)
_hostWindow.Deactivated -= OnHostWindowDeactivated; {
_hostWindow.IsVisibleChanged -= OnHostWindowIsVisibleChanged; DetachHostWindow();
_hostWindow.StateChanged -= OnHostWindowStateChanged; _hostWindow = window;
_hostWindow.Closed -= OnHostWindowClosed; if (_hostWindow == null) return;
_hostWindow = null; _hostWindow.Activated += OnHostWindowStateChanged;
} _hostWindow.Deactivated += OnHostWindowStateChanged;
_hostWindow.IsVisibleChanged += OnHostWindowIsVisibleChanged;
_hostWindow.StateChanged += OnHostWindowStateChanged;
_hostWindow.Closed += OnHostWindowClosed;
}
private void UpdateWindowActiveState() private void DetachHostWindow()
{ {
var window = _hostWindow; if (_hostWindow == null) return;
ViewModel.IsWindowActive = window != null _hostWindow.Activated -= OnHostWindowStateChanged;
&& window.IsVisible _hostWindow.Deactivated -= OnHostWindowStateChanged;
&& window.IsActive _hostWindow.IsVisibleChanged -= OnHostWindowIsVisibleChanged;
&& window.WindowState != WindowState.Minimized; _hostWindow.StateChanged -= OnHostWindowStateChanged;
} _hostWindow.Closed -= OnHostWindowClosed;
_hostWindow = null;
}
private void OnHostWindowActivated(object sender, EventArgs e) private void UpdateWindowActiveState()
{ {
UpdateWindowActiveState(); ViewModel.IsWindowActive = _hostWindow != null && _hostWindow.IsVisible && _hostWindow.IsActive && _hostWindow.WindowState != WindowState.Minimized;
} }
private void OnHostWindowDeactivated(object sender, EventArgs e) private void OnHostWindowStateChanged(object sender, EventArgs e) => UpdateWindowActiveState();
{ private void OnHostWindowIsVisibleChanged(object sender, DependencyPropertyChangedEventArgs e) => UpdateWindowActiveState();
UpdateWindowActiveState(); private void OnHostWindowClosed(object sender, EventArgs e) { ViewModel.IsWindowActive = false; DetachHostWindow(); }
}
private void OnHostWindowIsVisibleChanged(
object sender,
DependencyPropertyChangedEventArgs e)
{
UpdateWindowActiveState();
}
private void OnHostWindowStateChanged(object sender, EventArgs e)
{
UpdateWindowActiveState();
}
private void OnHostWindowClosed(object sender, EventArgs e)
{
ViewModel.IsWindowActive = false;
DetachHostWindow();
}
} }
Loaded 100 of 124 files, more files were not shown because too many files have changed in this diff. Show more