Merge remote-tracking branch 'origin/master_doubo' into master_doubo

@@ -34,7 +34,9 @@ import org.springframework.stereotype.Service;
 
 
 import javax.annotation.Resource;
 import javax.annotation.Resource;
 import javax.xml.bind.ValidationException;
 import javax.xml.bind.ValidationException;
+import java.math.BigDecimal;
 import java.text.MessageFormat;
 import java.text.MessageFormat;
+import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.HashMap;
 import java.util.List;
 import java.util.List;
@@ -79,7 +81,7 @@ public class GetOrderBizServiceImpl extends AbstractBizService<GetOrderRequest>
         List<Orders> ordersList = pineappleDao.getOrdersList(params);
         List<Orders> ordersList = pineappleDao.getOrdersList(params);
         GetOrderResponse response = new GetOrderResponse();
         GetOrderResponse response = new GetOrderResponse();
         response.setNumTotalOrder(ordersList.size());
         response.setNumTotalOrder(ordersList.size());
-        response.setOrders(null);
+        response.setOrders(findOrders(ordersList));
         response.setCode(PineAppleConst.SUCCESS_CODE);
         response.setCode(PineAppleConst.SUCCESS_CODE);
         return response;
         return response;
     }
     }
@@ -121,9 +123,8 @@ public class GetOrderBizServiceImpl extends AbstractBizService<GetOrderRequest>
         orderResponse.setTradeStatus(orderStatusEnum.getCode());
         orderResponse.setTradeStatus(orderStatusEnum.getCode());
         orderResponse.setTradeStatusDescription(orderStatusEnum.getMsg());
         orderResponse.setTradeStatusDescription(orderStatusEnum.getMsg());
         orderResponse.setPlatOrderNo(orders.getOrderSn());
         orderResponse.setPlatOrderNo(orders.getOrderSn());
-        orderResponse.setTradeStatus(orders.getOrderState().toString());
         orderResponse.setTradeStatusDescription(orders.getRemark());
         orderResponse.setTradeStatusDescription(orders.getRemark());
-        orderResponse.setTradeTime(orders.getCreateTime());
+        orderResponse.setTradeTime(this.buildDefaultSimpleDateFormat().format(orders.getCreateTime()));
         orderResponse.setCountry("中国");
         orderResponse.setCountry("中国");
         orderResponse.setProvince(orders.getRegionName1());
         orderResponse.setProvince(orders.getRegionName1());
         orderResponse.setCity(orders.getRegionName2());
         orderResponse.setCity(orders.getRegionName2());
@@ -131,11 +132,28 @@ public class GetOrderBizServiceImpl extends AbstractBizService<GetOrderRequest>
         orderResponse.setAddress(orders.getAddressInfo());
         orderResponse.setAddress(orders.getAddressInfo());
         orderResponse.setPhone(orders.getMobile());
         orderResponse.setPhone(orders.getMobile());
         orderResponse.setMobile(orders.getMobile());
         orderResponse.setMobile(orders.getMobile());
-        orderResponse.setPostFee(orders.getMoneyLogistics().toString());
-        orderResponse.setGoodsFee(orders.getMoneyProduct().toString());
-        orderResponse.setTotalMoney(orders.getMoneyOrder().toString());
-        orderResponse.setPayTime(orders.getPayTime());
+        orderResponse.setPostFee(this.convertAndCheckFreight(orders.getMoneyLogistics()));
+        orderResponse.setGoodsFee(this.convertAndCheckFreight(orders.getMoneyProduct()));
+        orderResponse.setTotalMoney(this.convertAndCheckFreight(orders.getMoneyOrder()));
+        orderResponse.setPayTime(this.buildDefaultSimpleDateFormat().format(orders.getPayTime()));
         orderResponse.setShouldPayType("银行收款");
         orderResponse.setShouldPayType("银行收款");
+        orderResponse.setTown("");
+        orderResponse.setTaxAmount("");
+        orderResponse.setCommissionValue("");
+        orderResponse.setTariffAmount("");
+        orderResponse.setAddedValueAmount("");
+        orderResponse.setConsumptionDutyAmount("");
+        orderResponse.setSendStyle("");
+        orderResponse.setQq("");
+        orderResponse.setEmail("");
+        orderResponse.setInvoiceTitle("");
+        orderResponse.setTaxPayerIdent("");
+        orderResponse.setCodServiceFee("");
+        orderResponse.setCurrencyCode("");
+        orderResponse.setIdCard("");
+        orderResponse.setIdCardTrueName("");
+        orderResponse.setWhseCode("");
+        orderResponse.setIsHwgFlag("");
         return orderResponse;
         return orderResponse;
     }
     }
 
 
@@ -152,8 +170,12 @@ public class GetOrderBizServiceImpl extends AbstractBizService<GetOrderRequest>
         orderGoodResponse.setTradeGoodsName(ordersProduct.getProductName());
         orderGoodResponse.setTradeGoodsName(ordersProduct.getProductName());
         orderGoodResponse.setTradeGoodsSpec(ordersProduct.getSpecInfo());
         orderGoodResponse.setTradeGoodsSpec(ordersProduct.getSpecInfo());
         orderGoodResponse.setGoodsCount(String.valueOf(ordersProduct.getNumber()));
         orderGoodResponse.setGoodsCount(String.valueOf(ordersProduct.getNumber()));
-        orderGoodResponse.setPrice(String.valueOf(ordersProduct.getMoneyPrice()));
-        orderGoodResponse.setDiscountMoney(String.valueOf(ordersProduct.getMoneyActSingle()));
+        orderGoodResponse.setPrice(this.convertAndCheckFreight(ordersProduct.getMoneyPrice()));
+        orderGoodResponse.setDiscountMoney(this.convertAndCheckFreight(ordersProduct.getMoneyActSingle()));
+        orderGoodResponse.setTaxAmount("");
+        orderGoodResponse.setRefundStatus("");
+        orderGoodResponse.setStatus("");
+        orderGoodResponse.setRemark("");
         return null;
         return null;
     }
     }
 
 
@@ -166,6 +188,15 @@ public class GetOrderBizServiceImpl extends AbstractBizService<GetOrderRequest>
         return orderStatusEnum;
         return orderStatusEnum;
     }
     }
 
 
+    private SimpleDateFormat buildDefaultSimpleDateFormat() {
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        return sdf;
+    }
+
+    private String convertAndCheckFreight(BigDecimal money) {
+        return money.setScale(2, BigDecimal.ROUND_HALF_UP).toPlainString();
+    }
+
     @Override
     @Override
     public String getHandleMethodName() {
     public String getHandleMethodName() {
         return "Differ.JH.Business.GetOrder";
         return "Differ.JH.Business.GetOrder";