clunt
/
ghy-all
1
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

Merge branch 'master' of https://gitee.com/op-souls/ghy-all

This commit is contained in:
kuang.yifei@iwhalecloud.com 2022-07-11 11:33:24 +08:00
parent 44d8ccd016 46541296bf
commit d6d824d5c6
3 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ghy-admin/src/main/java/com/ghy/web/controller/order/OrderDetailController.java
View File

@ -25,6 +25,8 @@ import com.ghy.order.service.OrderMasterService;
import com.ghy.payment.domain.FinancialDetail; import com.ghy.payment.domain.FinancialDetail;
import com.ghy.payment.domain.FinancialMaster; import com.ghy.payment.domain.FinancialMaster;
import com.ghy.payment.service.FinancialDetailService; import com.ghy.payment.service.FinancialDetailService;
import com.ghy.system.domain.SysArea;
import com.ghy.system.service.ISysAreaService;
import com.ghy.web.pojo.vo.OrderListResponse; import com.ghy.web.pojo.vo.OrderListResponse;
import com.ghy.web.pojo.vo.OrderStandard; import com.ghy.web.pojo.vo.OrderStandard;
import com.ghy.worker.domain.Worker; import com.ghy.worker.domain.Worker;
@ -64,6 +66,8 @@ public class OrderDetailController extends BaseController {
@Autowired @Autowired
private CustomerAddressService addressService; private CustomerAddressService addressService;
@Autowired @Autowired
private ISysAreaService sysAreaService;
@Autowired
private GoodsService goodsService; private GoodsService goodsService;
@Autowired @Autowired
private GoodsStandardService goodsStandardService; private GoodsStandardService goodsStandardService;
@ -116,6 +120,8 @@ public class OrderDetailController extends BaseController {
// 地址信息 // 地址信息
CustomerAddress customerAddress = addressService.selectByCustomerAddressId(orderMaster.getAddressId()); CustomerAddress customerAddress = addressService.selectByCustomerAddressId(orderMaster.getAddressId());
SysArea sysArea = sysAreaService.selectById(customerAddress.getCountryId());
String completeAddress = sysArea.getMergerName().replaceAll(",", "") + customerAddress.getAddress();
for(OrderGoods orderGoods : orderStandardList){ for(OrderGoods orderGoods : orderStandardList){
OrderStandard orderStandard = new OrderStandard(); OrderStandard orderStandard = new OrderStandard();
@ -144,7 +150,7 @@ public class OrderDetailController extends BaseController {
orderListResponse.setPayStatus(orderMaster.getPayStatus()); orderListResponse.setPayStatus(orderMaster.getPayStatus());
orderListResponse.setPayType(orderMaster.getPayType()); orderListResponse.setPayType(orderMaster.getPayType());
orderListResponse.setStandardList(standardList); orderListResponse.setStandardList(standardList);
orderListResponse.setAddress(customerAddress.getAddress()); orderListResponse.setAddress(completeAddress);
orderListResponse.setServerTime(detail.getRevTime()); orderListResponse.setServerTime(detail.getRevTime());
orderListResponse.setExpectTimeStart(detail.getExpectTimeStart()); orderListResponse.setExpectTimeStart(detail.getExpectTimeStart());
orderListResponse.setExpectTimeEnd(detail.getExpectTimeEnd()); orderListResponse.setExpectTimeEnd(detail.getExpectTimeEnd());
@ -196,6 +202,8 @@ public class OrderDetailController extends BaseController {
// 地址信息 // 地址信息
CustomerAddress customerAddress = addressService.selectByCustomerAddressId(orderMaster.getAddressId()); CustomerAddress customerAddress = addressService.selectByCustomerAddressId(orderMaster.getAddressId());
SysArea sysArea = sysAreaService.selectById(customerAddress.getCountryId());
String completeAddress = sysArea.getMergerName().replaceAll(",", "") + customerAddress.getAddress();
for(OrderGoods orderGoods : orderStandardList){ for(OrderGoods orderGoods : orderStandardList){
OrderStandard orderStandard = new OrderStandard(); OrderStandard orderStandard = new OrderStandard();
@ -225,7 +233,7 @@ public class OrderDetailController extends BaseController {
orderListResponse.setPayStatus(orderMaster.getPayStatus()); orderListResponse.setPayStatus(orderMaster.getPayStatus());
orderListResponse.setPayType(orderMaster.getPayType()); orderListResponse.setPayType(orderMaster.getPayType());
orderListResponse.setStandardList(standardList); orderListResponse.setStandardList(standardList);
orderListResponse.setAddress(customerAddress.getAddress()); orderListResponse.setAddress(completeAddress);
orderListResponse.setServerTime(detail.getRevTime()); orderListResponse.setServerTime(detail.getRevTime());
orderListResponse.setExpectTimeStart(detail.getExpectTimeStart()); orderListResponse.setExpectTimeStart(detail.getExpectTimeStart());
orderListResponse.setExpectTimeEnd(detail.getExpectTimeEnd()); orderListResponse.setExpectTimeEnd(detail.getExpectTimeEnd());

2
ghy-admin/src/main/java/com/ghy/web/controller/order/OrderMasterController.java
View File

@ -163,7 +163,7 @@ public class OrderMasterController extends BaseController {
rspData.setTotal(orderListResponses.size()); rspData.setTotal(orderListResponses.size());
return rspData; return rspData;
} }
Integer pageSize = pageDomain.getPageNum() * 10; Integer pageSize = pageDomain.getPageNum();
if (pageSize > orderListResponses.size()) if (pageSize > orderListResponses.size())
{ {
pageSize = orderListResponses.size(); pageSize = orderListResponses.size();

6
ghy-order/src/main/resources/mapper/order/OrderDetailMapper.xml
View File

@ -98,6 +98,12 @@
<if test="countryId != null"> <if test="countryId != null">
AND ca.country_id = #{countryId} AND ca.country_id = #{countryId}
</if> </if>
<if test="expectTimeStart != null">
AND od.expect_time_start &gt;= #{expectTimeStart}
</if>
<if test="expectTimeEnd != null">
AND od.expect_time_end &lt;= #{expectTimeEnd}
</if>
</where> </where>
order by od.create_time order by od.create_time
<trim suffixOverrides=","> <trim suffixOverrides=",">