ecshop/OMS
1
0
Fork 0
mirror of https://gitee.com/ShopeX/OMS synced 2026-05-05 22:35:45 +08:00
Code Issues Packages Projects Releases Wiki Activity

【优化】实收退导入界面

Browse Source 
【新增】快捷菜单功能入口

【新增】爱库存电子面单获取
This commit is contained in:
chenping
2026-04-21 22:36:45 +08:00
parent 8b4b4cc49f
commit b20d422532
45 changed files with 2367 additions and 191 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
app/ome/controller/admin/dly/corp.php
View File

@@ -117,7 +117,7 @@ class ome_ctl_admin_dly_corp extends desktop_controller
//新版控件打印
$templateObj = app::get("logisticsmanager")->model('express_template');
$templates = $templateObj->getList("template_id,template_name,template_type");
$normalTmpl = $cainiaoTmpl = $electronTmpl = $kuaishouTmpl = $wphvipTmpl = $huaweiTmpl = $xhsTmpl = $wxshipinTmpl = $meituan4bulkpurchasingTmpl = array();
$normalTmpl = $cainiaoTmpl = $electronTmpl = $kuaishouTmpl = $wphvipTmpl = $huaweiTmpl = $xhsTmpl = $wxshipinTmpl = $meituan4bulkpurchasingTmpl = $akcTmpl = array();
foreach ($templates as $val) {
if ($val['template_type'] == 'normal') {
$normalTmpl[] = $val;
@@ -139,6 +139,8 @@ class ome_ctl_admin_dly_corp extends desktop_controller
$sfTmpl[] = $val;
}elseif(in_array($val['template_type'], array('xhs_standard','xhs_user'))){
$xhsTmpl[] = $val;
}elseif(in_array($val['template_type'], array('aikucun_standard','aikucun_user'))){
$akcTmpl[] = $val;
}elseif(in_array($val['template_type'], array('wxshipin_standard','wxshipin_user'))){
$wxshipinTmpl[] = $val;
}elseif(in_array($val['template_type'], array('youzan_standard'))){
@@ -161,6 +163,7 @@ class ome_ctl_admin_dly_corp extends desktop_controller
$this->pagedata['youzanTmpl'] = $youzanTmpl;
$this->pagedata['electronTmpl'] = $electronTmpl;
$this->pagedata['xhsTmpl'] = $xhsTmpl;
$this->pagedata['akcTmpl'] = $akcTmpl;
$this->pagedata['wxshipinTmpl'] = $wxshipinTmpl;
$this->pagedata['dewuTmpl'] = $dewuTmpl;
$this->pagedata['meituan4bulkpurchasingTmpl'] = $meituan4bulkpurchasingTmpl;
@@ -190,7 +193,7 @@ class ome_ctl_admin_dly_corp extends desktop_controller
if ($val['channel_type'] == '360buy') {
$channelType[$val['channel_id']] = 'JDCOD';
} elseif (in_array($val['channel_type'], array('taobao', 'unionpay', 'pinjun', 'pdd','douyin','kuaishou','xhs','wxshipin', 'meituan4bulkpurchasing','dewu')) || ($val['channel_type']=='jdalpha' && in_array($val['logistics_code'], ['JDDJ']))) {
} elseif (in_array($val['channel_type'], array('taobao', 'unionpay', 'pinjun', 'pdd','douyin','kuaishou','xhs','wxshipin', 'meituan4bulkpurchasing','dewu','aikucun')) || ($val['channel_type']=='jdalpha' && in_array($val['logistics_code'], ['JDDJ']))) {
$channelType[$val['channel_id']] = $val['logistics_code'];
} else {
@@ -267,7 +270,7 @@ class ome_ctl_admin_dly_corp extends desktop_controller
//新版控件打印
$templateObj = app::get("logisticsmanager")->model('express_template');
$templates = $templateObj->getList("template_id,template_name,template_type");
$canniaoId = $kuaishouTmpl = $wphvipTmpl = $xhsTmpl = $wxshipinTmpl = array();
$canniaoId = $kuaishouTmpl = $wphvipTmpl = $xhsTmpl = $wxshipinTmpl = $akcTmpl = array();
foreach ($templates as $val) {
if ($val['template_type'] == 'normal') {
$normalTmpl[] = $val;
@@ -290,6 +293,8 @@ class ome_ctl_admin_dly_corp extends desktop_controller
$sfTmpl[] = $val;
}elseif(in_array($val['template_type'], array('xhs_standard','xhs_user'))){
$xhsTmpl[] = $val;
}elseif(in_array($val['template_type'], array('aikucun_standard','aikucun_user'))){
$akcTmpl[] = $val;
}elseif(in_array($val['template_type'], array('wxshipin_standard','wxshipin_user'))){
$wxshipinTmpl[] = $val;
}elseif(in_array($val['template_type'], array('youzan_standard'))){
@@ -313,6 +318,7 @@ class ome_ctl_admin_dly_corp extends desktop_controller
$this->pagedata['electronTmpl'] = $electronTmpl;
$this->pagedata['canniaoId'] = $canniaoId;
$this->pagedata['xhsTmpl'] = $xhsTmpl;
$this->pagedata['akcTmpl'] = $akcTmpl;
$this->pagedata['wxshipinTmpl'] = $wxshipinTmpl;
$this->pagedata['youzanTmpl'] = $youzanTmpl;
$this->pagedata['meituan4bulkpurchasingTmpl'] = $meituan4bulkpurchasingTmpl;
@@ -338,7 +344,7 @@ class ome_ctl_admin_dly_corp extends desktop_controller
$channelShop[$val['channel_id']]['name'] = $shopList[$val['shop_id']];
$channelShop[$val['channel_id']]['logistics_code'] = $val['logistics_code'];
if (in_array($val['channel_type'], array('taobao','pdd','unionpay','pinjun','jdalpha','hqepay','douyin','kuaishou','xhs','wxshipin'))) {
if (in_array($val['channel_type'], array('taobao','pdd','unionpay','pinjun','jdalpha','hqepay','douyin','kuaishou','xhs','wxshipin','aikucun'))) {
if ($val['logistics_code'] == 'JTSD' && !in_array($val['channel_type'],['wxshipin'])) {
$val['logistics_code'] = 'jitu';
}
@@ -436,6 +442,8 @@ class ome_ctl_admin_dly_corp extends desktop_controller
$dlycorp['prt_tmpl_id'] = $dlycorp['sf_tmpl_id'];
} elseif ($dlycorp['electron_type'] == 'xhs') {
$dlycorp['prt_tmpl_id'] = $dlycorp['xhs_tmpl_id'];
} elseif ($dlycorp['electron_type'] == 'aikucun') {
$dlycorp['prt_tmpl_id'] = $dlycorp['akc_tmpl_id'];
} elseif ($dlycorp['electron_type'] == 'wxshipin') {
$dlycorp['prt_tmpl_id'] = $dlycorp['wxshipin_tmpl_id'];
} elseif ($dlycorp['electron_type'] == 'meituan4bulkpurchasing') {

2
app/ome/controller/admin/shop.php
View File

@@ -592,6 +592,8 @@ class ome_ctl_admin_shop extends desktop_controller {
$this->pagedata['ent_email'] = $entEmail;
$this->pagedata['is_certified'] = $is_certified;
$this->pagedata['need_enterprise_auth'] = $need_enterprise_auth; // 是否需要系统节点注册步骤（openapi 不强制）
// 绑定完成页：订单流量购买入口
$this->pagedata['order_traffic_purchase_url'] = 'https://open-console.shopex.cn/organization/list';
// 渲染模板
$this->display('admin/shop/bind_guide.html');

11
app/ome/lib/auth/config.php
View File

@@ -117,6 +117,17 @@ class ome_auth_config
'node_id' => '节点',
),
),
'b2b' =>
array(
'label' => 'B2B',
'desc' => 'B2B平台对接',
'params' =>
array(
'b2b_url' => 'API地址',
'b2b_response_secret' => 'RESPONSE SECRET',
'node_id' => '节点',
),
),
);
foreach (ome_shop_type::get_shop_type() as $key => $value) {

4
app/ome/lib/autotask/timer/autoconfirmorderstockinc.php
View File

@@ -28,6 +28,10 @@ class ome_autotask_timer_autoconfirmorderstockinc
public function process($params, &$error_msg = '')
{
// 标品Saas线不开启此项功能
return true;
set_time_limit(0);
ignore_user_abort(1);
@ini_set('memory_limit', '512M');

4
app/ome/lib/autotask/timer/hour.php
View File

@@ -60,8 +60,8 @@ class ome_autotask_timer_hour
//kernel::single('erpapi_misc_task')->hour();
// 每小时触发：库存增加自动审核订单
kernel::single('ome_autotask_timer_autoconfirmorderstockinc')->process($params, $error_msg);
//kernel::single('ome_autotask_timer_autoconfirmorderstockinc')->process($params, $error_msg);
return true;
}
}
}

7
app/ome/lib/event/receive/delivery.php
View File

@@ -1004,13 +1004,6 @@ class ome_event_receive_delivery extends ome_event_response
$service->after_consign($this->__currDlyId);
}
}
// 订单发货完成后，service扩展触发其他服务
foreach(kernel::servicelist('ome.service.order.finish.after') as $service) {
if(method_exists($service, 'after_order_finish')) {
$service->after_order_finish($orderIds);
}
}
}
//自动开蓝票处理

9
app/ome/lib/order.php
View File

@@ -33,8 +33,7 @@ class ome_order {
$instance = kernel::service('service.order');
return $instance->update_iframe($order_id,$is_request,$ext);
}
/**
* 更新订单同步状态
* @access public
@@ -83,7 +82,7 @@ class ome_order {
if (empty($oid)) return NULL;
if ($this->order_is_exists($oid,$node_id)){
return $oid;#子订单与订单号相同,直接返回
return $oid; //子订单与订单号相同,直接返回
}
$objModel = app::get('ome')->model('order_objects');
@@ -234,8 +233,8 @@ class ome_order {
$orderItemMdl = app::get('ome')->model('order_items');
$branchMdl = app::get('ome')->model('branch');
$branchProductMdl = app::get('ome')->model('branch_product');
// order
$order = $orderMdl->db_dump($order_id, 'auto_status,abnormal_status');
if (!$order) return array(false,'订单不存在');

2
app/ome/lib/order/import.php
View File

@@ -374,6 +374,8 @@ class ome_order_import implements omecsv_data_split_interface
$orderSdf['consignee']['mobile'] = trim($orderSdf['consignee']['mobile']);
$orderSdf['shipping']['is_cod'] = $is_code;
$orderSdf['shipping']['cost_shipping'] = $orderSdf['shipping']['cost_shipping'] ? $orderSdf['shipping']['cost_shipping'] : '0';
$orderSdf['shipping']['cost_shipping'] = (float)$orderSdf['shipping']['cost_shipping'];
$orderSdf['is_tax'] = $is_tax;
$orderSdf['cost_tax'] = $orderSdf['cost_tax'] ? $orderSdf['cost_tax'] : '0';
$orderSdf['discount'] = $orderSdf['discount'] ? $orderSdf['discount'] : '0';

2
app/ome/lib/order/importV2.php
View File

@@ -696,6 +696,8 @@ class ome_order_importV2 implements omecsv_data_split_interface
$orderSdf['consignee']['mobile'] = trim($orderSdf['ship_mobile']);
$orderSdf['shipping'] = [];
$orderSdf['shipping']['cost_shipping'] = $orderSdf['cost_freight'] ? $orderSdf['cost_freight'] : '0';
$orderSdf['shipping']['cost_shipping'] = (float)$orderSdf['shipping']['cost_shipping'];
$orderSdf['shipping']['is_cod'] = $is_code;
$orderSdf['is_tax'] = $is_tax;
$orderSdf['cost_tax'] = $orderSdf['invoice_amount'] ? $orderSdf['invoice_amount'] : '0';

21
app/ome/lib/print/tmpl/express.php
View File

@@ -14,7 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
class ome_print_tmpl_express{
public $smarty = null;
@@ -24,7 +23,7 @@ class ome_print_tmpl_express{
static $logi_list = array('amazon','dangdang');//需要根据物流公司自定义快递单输入信息列表
/**
*
*
* @param String $logi
* @param Object $controller
* @return ome_print_tmpl_express
@@ -105,6 +104,10 @@ class ome_print_tmpl_express{
$this->smarty->singlepage("admin/delivery/express_xhs.html", 'wms');
}elseif(in_array($template_type, array('aikucun_standard','aikucun_user'))) {
$this->smarty->singlepage("admin/delivery/express_aikucun.html", 'wms');
}elseif(in_array($template_type, array('wxshipin_standard','wxshipin_user'))) {
$this->smarty->singlepage("admin/delivery/express_wxshipin.html", 'wms');
@@ -163,11 +166,6 @@ class ome_print_tmpl_express{
return $brower;
}
/**
* 获取ExpressTpl
* @param mixed $corp corp
* @return mixed 返回结果
*/
public function getExpressTpl($corp) {
$prtTmplId = $corp['prt_tmpl_id'];
$templateObj = app::get("logisticsmanager")->model('express_template');
@@ -182,7 +180,7 @@ class ome_print_tmpl_express{
$printTmpl['template_select'] = json_encode(unserialize($printTmpl['template_select']));
}
$this->printTpl = $printTmpl;
if(in_array($printTmpl['template_type'], array('cainiao', 'cainiao_standard', 'cainiao_user','pdd_standard','pdd_user','jd_standard','jd_user', 'douyin_standard', 'douyin_user','kuaishou_standard','kuaishou_user','sf','xhs_standard','xhs_user','meituan4bulkpurchasing_user','youzan_standard'))) {
if(in_array($printTmpl['template_type'], array('cainiao', 'cainiao_standard', 'cainiao_user','pdd_standard','pdd_user','jd_standard','jd_user', 'douyin_standard', 'douyin_user','kuaishou_standard','kuaishou_user','sf','xhs_standard','xhs_user','aikucun_standard','aikucun_user','meituan4bulkpurchasing_user','youzan_standard'))) {
$rs = $this->_dealUnShopexWidgetField($corp['channel_id']);
if(!$rs) {
return false;
@@ -352,6 +350,11 @@ class ome_print_tmpl_express{
// 获取自定义模板url和自定义模板内容
$this->_xhs_custom();
break;
case 'aikucun_standard':
case 'aikucun_user':
$this->printField = array('batch_logi_no','logi_no','print_config','channel_id','delivery_id','json_packet','user_id');
$this->_xhs_custom();
break;
default : break;
}
return true;
@@ -424,4 +427,4 @@ class ome_print_tmpl_express{
$this->printField = $field;
}
}
}

37
app/ome/model/reship.php
View File

@@ -1168,6 +1168,39 @@ class ome_mdl_reship extends dbeav_model{
$order_sdf['mark_text'] = $mark_text;
$tostr=array();
list($actually_amount, $settlement_amount) = $this->getActuallyAmount($reshipinfo['reship_id']);
// 按各行 sale_price（num*price）均摊实付与结算金额，与 ome_order::calculate_part_porth 一致
$orderLib = kernel::single('ome_order');
$divideRows = array();
foreach ($reship_items as $objKey => $row) {
$divideRows[$objKey] = array(
'sale_price' => bcmul(strval($row['num']), strval($row['price']), 10),
);
}
$porth_total = '0';
foreach ($divideRows as $r) {
if (floatval($r['sale_price']) > 0) {
$porth_total = bcadd($porth_total, $r['sale_price'], 10);
}
}
if (floatval($porth_total) > 0) {
$divideRows = $orderLib->calculate_part_porth($divideRows, array(
'part_total' => $actually_amount,
'part_field' => 'actually_amount',
'porth_field' => 'sale_price',
'minuend_field' => null,
));
$divideRows = $orderLib->calculate_part_porth($divideRows, array(
'part_total' => $settlement_amount,
'part_field' => 'settlement_amount',
'porth_field' => 'sale_price',
'minuend_field' => null,
));
} else {
foreach ($divideRows as $k => $_) {
$divideRows[$k]['actually_amount'] = '0.00';
$divideRows[$k]['settlement_amount'] = '0.00';
}
}
//[销售物料层]格式化订单明细
$item_cost = 0;
foreach ( $reship_items as $objKey => &$items )
@@ -1185,8 +1218,8 @@ class ome_mdl_reship extends dbeav_model{
$items['name'] = $items['product_name'];
$items['quantity'] = $items['num'];
$items['amount'] = $items['sale_price'] = $items['num'] * $items['price'];
$items['actually_amount'] = $actually_amount;
$items['settlement_amount'] = $settlement_amount;
$items['actually_amount'] = $divideRows[$objKey]['actually_amount'];
$items['settlement_amount'] = $divideRows[$objKey]['settlement_amount'];
if($order_sdf['order_type'] == 'platform') {
$items['is_sh_ship'] = 'true';
}

5
app/ome/view/admin/order/order_edit.html
View File

@@ -226,7 +226,6 @@
</tbody></table>
<{/capture}>
<script>
if ($defined($E('.order-sensitive-btn'))) {
$E('.order-sensitive-btn').addEvent('click',function(e){
@@ -234,7 +233,6 @@ if ($defined($E('.order-sensitive-btn'))) {
new Security({url:'index.php?app=ome&ctl=admin_order&act=showSensitiveData&p[0]=<{$order.order_id}>',clickElement:$(e.target)}).desHtml($E('.delivery-info'));
});
});
}
if($defined($('consignee-edit'))){
@@ -747,9 +745,10 @@ function do_refund()
var height=550;
ome_order_refund_dialog(id, newtotal, total, is_cod, pay_status, width, height);
}
function ome_order_refund_dialog(id, newtotal, total, is_cod, pay_status,width,height)
{
var url = 'index.php?app=ome&ctl=admin_order&act=do_check&finder_id=<{$env.get.finder_id}>&p[0]='+id+'&p[1]='+newtotal+'&p[2]='+total+'&is_cod='+is_cod+'&pay_status='+pay_status;
var url = 'index.php?app=ome&ctl=admin_order&act=do_check&finder_id=<{$env.get.finder_id}>&p[0]='+id+'&p[1]='+newtotal+'&p[2]='+total+'&is_cod='+is_cod+'&pay_status='+pay_status;
new Dialog(url,{
title:'生成退款单',
width:width,

10
app/ome/view/admin/order/products/pkg_view.html
View File

@@ -47,25 +47,17 @@
/* 为每列设置固定宽度 */
.pkg_head_div th.width_100px,
.pkg_main_div td.width_100px { width: 100px; }
.pkg_head_div th.width_120px,
.pkg_main_div td.width_120px { width: 120px; }
.pkg_head_div th.width_160px,
.pkg_main_div td.width_160px { width: 160px; }
.pkg_head_div th.width_180px,
.pkg_main_div td.width_180px { width: 180px; }
.pkg_head_div th.width_200px,
.pkg_main_div td.width_200px { width: 200px; }
.pkg_head_div th.width_230px,
.pkg_main_div td.width_230px { width: 230px; }
.pkg_main_div table {
cursor: pointer;
}
.pkg_main_div table { cursor: pointer; }
</style>
<div class="division">

20
app/ome/view/admin/shop/bind_guide.html
View File

@@ -457,6 +457,9 @@
</svg>
</div>
</div>
<p class="complete-order-traffic-entry">
<a href="<{$order_traffic_purchase_url}>" target="_blank" rel="noopener noreferrer" class="order-traffic-purchase-link">订单流量购买</a>
</p>
<{/if}>
<{if $is_node_binded}>
@@ -994,6 +997,23 @@
color: #8c8c8c;
}
.complete-order-traffic-entry {
margin: 0 0 8px 0;
font-size: 14px;
color: #595959;
}
.order-traffic-purchase-link {
color: #1890ff;
font-weight: 500;
text-decoration: none;
}
.order-traffic-purchase-link:hover {
color: #40a9ff;
text-decoration: underline;
}
/* 未完成步骤列表 */
.incomplete-steps-list {
margin: 24px 0;

8
app/ome/view/admin/system/dly_corp.html
View File

@@ -326,6 +326,7 @@
<input id='electron_type_youzan' type="radio" value="youzan" name="electron_type" onchange="electronTypeChange()" <{if $electronType!='electron'}>checked<{/if}>/><{t}>有赞控件（菜鸟）<{/t}>
<input id='electron_type_dewu' type="radio" value="dewu" name="electron_type" onchange="electronTypeChange()" <{if $electronType!='electron'}>checked<{/if}>/><{t}>得物品牌直发控件<{/t}>
<input id='electron_type_meituan4bulkpurchasing' type="radio" value="meituan4bulkpurchasing" name="electron_type" onchange="electronTypeChange()" <{if $electronType!='electron'}>checked<{/if}>/><{t}>美团电商控件<{/t}>
<input id='electron_type_aikucun' type="radio" value="aikucun" name="electron_type" onchange="electronTypeChange()" <{if $electronType!='electron'}>checked<{/if}>/><{t}>爱库存控件<{/t}>
</td>
</tr>
<tr id="electronTmplName">
@@ -343,6 +344,7 @@
<td id='youzanTmpl'><{input type="select" name='youzan_tmpl_id' rows=$youzanTmpl valueColumn="template_id" labelColumn="template_name" value=$dt_info.prt_tmpl_id vtype="required" style="width:100px;"}> <em><font color='red'>*</font></em></td>
<td id='dewuTmpl'><{input type="select" name='dewu_tmpl_id' rows=$dewuTmpl valueColumn="template_id" labelColumn="template_name" value=$dt_info.prt_tmpl_id vtype="required" style="width:100px;"}> <em><font color='red'>*</font></em></td>
<td id='meituan4bulkpurchasingTmpl'><{input type="select" name='meituan4bulkpurchasing_tmpl_id' rows=$meituan4bulkpurchasingTmpl valueColumn="template_id" labelColumn="template_name" value=$dt_info.prt_tmpl_id vtype="required" style="width:100px;"}> <em><font color='red'>*</font></em></td>
<td id='akcTmpl'><{input type="select" name='akc_tmpl_id' rows=$akcTmpl valueColumn="template_id" labelColumn="template_name" value=$dt_info.prt_tmpl_id vtype="required" style="width:100px;"}> <em><font color='red'>*</font></em></td>
</tr>
<{else}>
<{if $prttpl}>
@@ -426,6 +428,7 @@
$('youzanTmpl').hide();
$('dewuTmpl').hide();
$('meituan4bulkpurchasingTmpl').hide();
$('akcTmpl').hide();
if(jsonelectronchannel[channel_id]['channel_type']=='taobao'){
if($$('input[name=electron_type]:checked').get('value') == 'electron'){
$('electronTmpl').show();
@@ -507,6 +510,10 @@
$('electronTmpl').hide();
$('meituan4bulkpurchasingTmpl').show();
}
}else if(jsonelectronchannel[channel_id]['channel_type']=='aikucun'){
$('electron_type_aikucun').set('checked','checked');
$('electronTmpl').hide();
$('akcTmpl').show();
}else if(jsonelectronchannel[channel_id]['channel_type']=='360buy' || jsonelectronchannel[channel_id]['channel_type']=='jdalpha' || jsonelectronchannel[channel_id]['channel_type']=='jdgxd'){
if($$('input[name=electron_type]:checked').get('value') == 'electron'){
$('electronTmpl').show();
@@ -552,6 +559,7 @@
$('dewuTmpl').hide();
$('meituan4bulkpurchasingTmpl').hide();
$('youzanTmpl').hide();
$('akcTmpl').hide();
}
}