etrade / zr-etrade · Commits

Commit 25c981b73a00a61728f1d0acc3cf2ba6603eaf24

Authored by fengliang
1 parent 44e9e743
build: skipped

update:修正下单以及查询中重量转换sql

Inline Side-by-side
Showing 6 changed files with 20 additions and 12 deletions
etrade-order/src/main/java/com/diligrp/etrade/order/domain/ProductDto.java
  View file @25c981b
... ... @@ -193,4 +193,12 @@ public class ProductDto {
193 193 public void setSalesMode(Integer salesMode) {
194 194 this.salesMode = salesMode;
195 195 }
  196 +
  197 + public String getProductUnit() {
  198 + return productUnit;
  199 + }
  200 +
  201 + public void setProductUnit(String productUnit) {
  202 + this.productUnit = productUnit;
  203 + }
196 204 }
... ...
etrade-order/src/main/resources/com/diligrp/etrade/dao/mapper/order/OrderGoodsMapper.xml
  View file @25c981b
... ... @@ -67,11 +67,11 @@
67 67 product_code,
68 68 product_category_id,
69 69 product_name,
70   - convert(product_price, decimal(20,2))/200 as product_price,
  70 + convert(product_price, decimal(20,2))/100 as product_price,
71 71 convert(product_total_price, decimal(20,2))/100 as product_total_price,
72   - convert(product_weight, decimal(20,2))/500 as product_weight,
  72 + convert(product_weight, decimal(20,2))/100 as product_weight,
73 73 convert(product_pieces, decimal(20,2))/100 as product_pieces,
74   - convert(product_piece_weight, decimal(20,2))/500 as product_piece_weight,
  74 + convert(product_piece_weight, decimal(20,2))/100 as product_piece_weight,
75 75 convert(product_piece_price, decimal(20,2))/100 as product_piece_price,
76 76 convert(product_coupon_amount, decimal(20,2))/100 as coupon_amount,
77 77 product_trade_type,
... ... @@ -110,9 +110,9 @@
110 110 product_name,
111 111 convert(product_price, decimal(20,2))/100 as product_price,
112 112 convert(product_total_price, decimal(20,2))/100 as product_total_price,
113   - convert(product_weight, decimal(20,2))/1000 as product_weight,
  113 + convert(product_weight, decimal(20,2))/100 as product_weight,
114 114 convert(product_pieces, decimal(20,2))/100 as product_pieces,
115   - convert(product_piece_weight, decimal(20,2))/1000 as product_piece_weight,
  115 + convert(product_piece_weight, decimal(20,2))/100 as product_piece_weight,
116 116 convert(product_piece_price, decimal(20,2))/100 as product_piece_price,
117 117 convert(product_coupon_amount, decimal(20,2))/100 as coupon_amount,
118 118 product_trade_type,
... ... @@ -139,9 +139,9 @@
139 139 product_name,
140 140 convert(product_price, decimal(20,2))/100 as product_price,
141 141 convert(product_total_price, decimal(20,2))/100 as product_total_price,
142   - convert(product_weight, decimal(20,2))/1000 as product_weight,
  142 + convert(product_weight, decimal(20,2))/100 as product_weight,
143 143 convert(product_pieces, decimal(20,2))/100 as product_pieces,
144   - convert(product_piece_weight, decimal(20,2))/1000 as product_piece_weight,
  144 + convert(product_piece_weight, decimal(20,2))/100 as product_piece_weight,
145 145 convert(product_piece_price, decimal(20,2))/100 as product_piece_price,
146 146 convert(product_coupon_amount, decimal(20,2))/100 as coupon_amount,
147 147 product_trade_type,
... ...
etrade-order/src/main/resources/com/diligrp/etrade/dao/mapper/order/OrderMapper.xml
  View file @25c981b
... ... @@ -94,7 +94,7 @@
94 94 convert(totle_pay_amount, decimal(20,2))/100 as totle_pay_amount,
95 95 convert(totle_paid_amount, decimal(20,2))/100 as totle_paid_amount,
96 96 convert(totle_discount, decimal(20,2))/100 as totle_discount,
97   - convert(totle_weight, decimal(20,2))/500 as totle_weight,
  97 + convert(totle_weight, decimal(20,2))/100 as totle_weight,
98 98 order_type,
99 99 pay_state,
100 100 pay_time,
... ...
etrade-order/src/main/resources/com/diligrp/etrade/dao/mapper/order/OrderQueryBuyerMapper.xml
  View file @25c981b
... ... @@ -107,7 +107,7 @@
107 107 convert(ord.totle_pay_amount, decimal(20,2))/100 as totle_pay_amount,
108 108 convert(ord.totle_paid_amount, decimal(20,2))/100 as totle_paid_amount,
109 109 convert(ord.totle_discount, decimal(20,2))/100 as totle_discount,
110   - convert(ord.totle_weight, decimal(20,2))/500 as totle_weight,
  110 + convert(ord.totle_weight, decimal(20,2))/100 as totle_weight,
111 111 ord.order_type as order_type,
112 112 ord.pay_state as pay_state,
113 113 ord.pay_time as pay_time,
... ...
etrade-order/src/main/resources/com/diligrp/etrade/dao/mapper/order/OrderQueryMapper.xml
  View file @25c981b
... ... @@ -89,7 +89,7 @@
89 89 convert(totle_pay_amount, decimal(20,2))/100 as totle_pay_amount,
90 90 convert(totle_paid_amount, decimal(20,2))/100 as totle_paid_amount,
91 91 convert(totle_discount, decimal(20,2))/100 as totle_discount,
92   - convert(totle_weight, decimal(20,2))/1000 as totle_weight,
  92 + convert(totle_weight, decimal(20,2))/100 as totle_weight,
93 93 order_type,
94 94 pay_state,
95 95 pay_time,
... ... @@ -182,7 +182,7 @@
182 182 convert(ord.totle_pay_amount, decimal(20,2))/100 as totle_pay_amount,
183 183 convert(ord.totle_paid_amount, decimal(20,2))/100 as totle_paid_amount,
184 184 convert(ord.totle_discount, decimal(20,2))/100 as totle_discount,
185   - convert(ord.totle_weight, decimal(20,2))/1000 as totle_weight,
  185 + convert(ord.totle_weight, decimal(20,2))/100 as totle_weight,
186 186 convert(ord.totle_seller_fee, decimal(20,2))/100 as totle_seller_fee,
187 187 ord.order_type as order_type,
188 188 ord.pay_state as pay_state,
... ...
etrade-order/src/main/resources/com/diligrp/etrade/dao/mapper/order/OrderQuerySellerMapper.xml
  View file @25c981b
... ... @@ -89,7 +89,7 @@
89 89 convert(ord.totle_pay_amount, decimal(20,2))/100 as totle_pay_amount,
90 90 convert(ord.totle_paid_amount, decimal(20,2))/100 as totle_paid_amount,
91 91 convert(ord.totle_discount, decimal(20,2))/100 as totle_discount,
92   - convert(ord.totle_weight, decimal(20,2))/500 as totle_weight,
  92 + convert(ord.totle_weight, decimal(20,2))/100 as totle_weight,
93 93 ord.order_type,
94 94 ord.pay_state,
95 95 ord.pay_time,
... ...