yuanye
/
puhui-go-web
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

提交代码

Browse Source
master
胡锐 6 months ago
parent d05f9b1452
commit 3ae5c7b874
4 changed files with 40 additions and 26 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 8
      src/app/pages/system/menu/menu.component.ts
  2. 35
      src/app/pages/trade/comp-order/comp-order.component.html
  3. 17
      src/app/pages/trade/comp-order/comp-order.component.ts
  4. 6
      src/app/services/trade/order-coupon.service.ts

8
src/app/pages/system/menu/menu.component.ts
Unescape View File

@ -147,7 +147,7 @@ export class MenuComponent {
this.editMenuTitle = '添加菜单';
this.editMenuForm.reset();
let menu = {
menuPSid: "",
menuPSid: '',
menuType: '1'
};
@ -184,7 +184,11 @@ export class MenuComponent {
submitEditMenuForm() {
if (this.editMenuForm.valid) {
this.treeView = false;
this.editMenuForm.value['menuPSid']!=null?this.editMenuForm.value['menuPSid']:null;
console.log(this.editMenuForm.controls['menuPSid'].value);
if (this.editMenuForm.controls['menuPSid'].value == 'undefined') {
this.editMenuForm.controls['menuPSid'].setValue(null);
}
console.log(this.editMenuForm.value);
this.menuService.editMenu(this.editMenuForm.value, (data: any) => {
if (data['return_code'] == '000000') {
// 刷新数据

35
src/app/pages/trade/comp-order/comp-order.component.html
Unescape View File

@ -179,25 +179,28 @@
<nz-tabset nzType="card" nzSize="small">
<nz-tab nzTitle="交易详情">
<nz-descriptions nzBordered [nzColumn]="{ xxl: 2, xl: 2, lg: 2, md: 2, sm: 2, xs: 1 }">
<nz-descriptions-item nzTitle="交易单号">Zhou Maomao</nz-descriptions-item>
<nz-descriptions-item nzTitle="子订单号">18100000000</nz-descriptions-item>
<nz-descriptions-item nzTitle="交易金额"></nz-descriptions-item>
<nz-descriptions-item nzTitle="总优惠金额"></nz-descriptions-item>
<nz-descriptions-item nzTitle="优惠券优惠"></nz-descriptions-item>
<nz-descriptions-item nzTitle="积分抵扣"></nz-descriptions-item>
<nz-descriptions-item nzTitle="实付金额"></nz-descriptions-item>
<nz-descriptions-item nzTitle="用户手机号"></nz-descriptions-item>
<nz-descriptions-item nzTitle="创建时间">Empty</nz-descriptions-item>
<nz-descriptions-item nzTitle="支付时间">Empty</nz-descriptions-item>
<nz-descriptions-item nzTitle="完成时间">Empty</nz-descriptions-item>
<nz-descriptions-item nzTitle="取消时间">Empty</nz-descriptions-item>
<nz-descriptions-item nzTitle="退款时间">Empty</nz-descriptions-item>
<nz-descriptions-item nzTitle="用户手机号">{{orderDetail.order.userPhone}}</nz-descriptions-item>
<nz-descriptions-item nzTitle="交易单号">{{orderDetail.order.orderNo}}</nz-descriptions-item>
<nz-descriptions-item nzTitle="子订单号">{{orderDetail.order.childOrderNo}}</nz-descriptions-item>
<nz-descriptions-item nzTitle="交易金额">{{orderDetail.order.totalPrice}}</nz-descriptions-item>
<nz-descriptions-item nzTitle="总优惠金额">{{orderDetail.order.totalDeductionPrice}}</nz-descriptions-item>
<nz-descriptions-item nzTitle="优惠券优惠">{{orderDetail.order.couponDiscountPrice}}</nz-descriptions-item>
<nz-descriptions-item nzTitle="积分抵扣">{{orderDetail.order.integralDiscountPrice}}</nz-descriptions-item>
<nz-descriptions-item nzTitle="实付金额">{{orderDetail.order.payRealPrice}}</nz-descriptions-item>
<nz-descriptions-item nzTitle="支付渠道">{{orderDetail.order.payChannel | dictionary: 'ORDER_PAY_CHANNEL'}}</nz-descriptions-item>
<nz-descriptions-item nzTitle="支付方式">{{orderDetail.order.payType | dictionary: 'ORDER_PAY_TYPE'}}</nz-descriptions-item>
<nz-descriptions-item nzTitle="支付流水号">{{orderDetail.order.paySerialNo}}</nz-descriptions-item>
<nz-descriptions-item nzTitle="创建时间">{{orderDetail.order.createTime | date: 'yyyy-MM-dd HH:mm:ss'}}</nz-descriptions-item>
<nz-descriptions-item nzTitle="支付时间" *ngIf="orderDetail.order.payTime != null">{{orderDetail.order.payTime | date: 'yyyy-MM-dd HH:mm:ss'}}</nz-descriptions-item>
<nz-descriptions-item nzTitle="完成时间" *ngIf="orderDetail.order.finishTime != null">{{orderDetail.order.finishTime | date: 'yyyy-MM-dd HH:mm:ss'}}</nz-descriptions-item>
<nz-descriptions-item nzTitle="取消时间" *ngIf="orderDetail.order.cancelTime != null">{{orderDetail.order.cancelTime | date: 'yyyy-MM-dd HH:mm:ss'}}</nz-descriptions-item>
<nz-descriptions-item nzTitle="退款时间" *ngIf="orderDetail.order.refundTime != null">{{orderDetail.order.refundTime | date: 'yyyy-MM-dd HH:mm:ss'}}</nz-descriptions-item>
</nz-descriptions>
</nz-tab>
<nz-tab nzTitle="商品详情">
<nz-table #orderDetailTable
[nzData]="tableData.list"
[nzTotal]="tableData.list.length"
[nzData]="orderDetail.goods"
[nzTotal]="orderDetail.goods.length"
[nzScroll]="{ x: '2000px' }"
[nzPaginationType]="'small'"
[nzSize]="'small'"
@ -213,7 +216,6 @@
<th>状态</th>
<th>过期时间</th>
<th>派发时间</th>
<th>过期时间</th>
<th>完成时间</th>
</tr>
</thead>
@ -227,7 +229,6 @@
<td nzEllipsis nz-tooltip nzTooltipTitle="{{data.couNo}}">{{ data.couNo }}</td>
<td>{{ data.couStatus | dictionary: 'ORDER_COUPON_NO_STATUS'}}</td>
<td>{{ data.expireTime | date: 'yyyy-MM-dd HH:mm'}}</td>
<td>{{ data.createTime | date: 'yyyy-MM-dd HH:mm:ss'}}</td>
<td>{{ data.deliverTime | date: 'yyyy-MM-dd HH:mm:ss' }}</td>
<td>{{ data.finishTime | date: 'yyyy-MM-dd HH:mm:ss' }}</td>
</tr>

17
src/app/pages/trade/comp-order/comp-order.component.ts
Unescape View File

@ -24,7 +24,7 @@ import {NzOptionComponent, NzSelectComponent} from "ng-zorro-antd/select";
import {SysAccountService} from "../../../services/account/sys-account.service";
import {RoleService} from "../../../services/role/role.service";
import {NzMessageService} from "ng-zorro-antd/message";
import {OrderService} from "../../../services/trade/order.service";
import {OrderCouponService} from "../../../services/trade/order-coupon.service";
import {NzDatePickerComponent, NzDatePickerModule, NzRangePickerComponent} from "ng-zorro-antd/date-picker";
import {NzRadioButtonDirective, NzRadioComponent, NzRadioGroupComponent} from "ng-zorro-antd/radio";
import {NzTooltipDirective} from "ng-zorro-antd/tooltip";
@ -111,9 +111,12 @@ export class CompOrderComponent {
// 订单详情模态框
orderDetailVisible = false;
// 订单详情数据
orderDetail: any = {};
orderDetail: any = {
order: {},
goods: [],
};
constructor(private fb: NonNullableFormBuilder,
private orderService : OrderService,
private orderService : OrderCouponService,
private message: NzMessageService,
private modal: NzModalService) {
// 初始化搜索框
@ -186,9 +189,15 @@ export class CompOrderComponent {
/**
* 展示详情
* @param orderNo
* @param childOrderNo
*/
showDetail(childOrderNo: string) {
this.orderService.queryDetail(childOrderNo,(data: any) => {
if (data['return_code'] == '000000') {
this.orderDetail = data['return_data'];
console.log(this.orderDetail);
}
});
this.orderDetailVisible = true;
}

6
src/app/services/trade/order.service.ts → src/app/services/trade/order-coupon.service.ts
Unescape View File

@ -6,7 +6,7 @@ import {ObjectData} from "../../utils/objectData.service";
@Injectable({
providedIn: 'root'
})
export class OrderService {
export class OrderCouponService {
constructor(private http: HttpClient) { }
@ -26,8 +26,8 @@ export class OrderService {
* @param param
* @param callBack
*/
public queryOrder(orderNo: string, callBack:any) {
this.http.get(environment.orderUrl + 'queryOrder?orderNo='+orderNo).subscribe(data => {
public queryDetail(orderChildNo: string, callBack:any) {
this.http.get(environment.orderUrl + 'coupon/queryDetail?orderChildNo='+orderChildNo).subscribe(data => {
callBack(data);
});
}
Write Preview
Loading…
Cancel
Save