etrade / zr-report · Commits

Commit 41f3fec52b04ccd13bc5d1ba3b8c52229b6b9bf3

Authored by zhangmeiyang
1 parent 662ffd5a
build: skipped

feature商品修改

Inline Side-by-side
Showing 2 changed files with 17 additions and 1 deletions
ereport-core/src/main/java/com/diligrp/etrade/report/domain/vo/BusinessFlowVO.java
  View file @41f3fec
1 1 package com.diligrp.etrade.report.domain.vo;
2 2  
3   -import com.diligrp.etrade.core.jackson.serializer.*;
  3 +import com.diligrp.etrade.core.jackson.serializer.MoneyF2YJsonSerializer;
  4 +import com.diligrp.etrade.core.jackson.serializer.PieceSerializer;
4 5 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
5 6  
6 7 import java.io.Serializable;
... ... @@ -122,6 +123,10 @@ public class BusinessFlowVO implements Serializable {
122 123 * 创建者
123 124 */
124 125 private String creater;
  126 + /**
  127 + *商品单位
  128 + */
  129 + private String productUnit;
125 130  
126 131 public Long getId() {
127 132 return id;
... ... @@ -306,4 +311,12 @@ public class BusinessFlowVO implements Serializable {
306 311 public void setCreater(String creater) {
307 312 this.creater = creater;
308 313 }
  314 +
  315 + public String getProductUnit() {
  316 + return productUnit;
  317 + }
  318 +
  319 + public void setProductUnit(String productUnit) {
  320 + this.productUnit = productUnit;
  321 + }
309 322 }
... ...
ereport-core/src/main/resources/com/diligrp/etrade/dao/mapper/StatMapper.xml
  View file @41f3fec
... ... @@ -25,6 +25,7 @@
25 25 ,productSellerFee
26 26 ,payeeCardNo
27 27 ,creater
  28 + ,productUnit
28 29 FROM (
29 30 SELECT
30 31 o.code AS code
... ... @@ -49,6 +50,7 @@
49 50 , og.product_seller_fee AS productSellerFee
50 51 , se.card_no AS payeeCardNo
51 52 , se.name AS creater
  53 + , og.product_unit AS productUnit
52 54 FROM
53 55 `zr_etrade`.`order_goods` og
54 56 LEFT JOIN `zr_etrade`.`order` o ON o.id = og.order_id
... ... @@ -116,6 +118,7 @@
116 118 , og.product_seller_fee AS productSellerFee
117 119 , se.card_no AS payeeCardNo
118 120 , se.name AS creater
  121 + , og.product_unit AS productUnit
119 122 FROM
120 123 `zr_etrade`.`order_goods` og
121 124 LEFT JOIN `zr_etrade`.`order` o ON o.id = og.order_id
... ...