1

zhangchao

2024-11-22 7e51ecd205ea28e0191b0572557739ca2bf2edbf

 src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java

@@ -28,7 +28,9 @@

import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.concurrent.TimeUnit;

@Slf4j
@Service("orderService")
@@ -93,8 +95,8 @@
    }

    @Override
    public boolean updateSettle2(Long orderId, Long settle, Integer plt) {
        return this.baseMapper.updateSettle2(orderId, settle, plt) > 0;
    public boolean updateSettle2(Long orderId, Long settle, Integer plt, String inTime) {
        return this.baseMapper.updateSettle2(orderId, settle, plt, inTime) > 0;
    }

    @Override
@@ -126,14 +128,15 @@

        boolean manPakoutExist = Cools.isEmpty(manPakOut) || (manPakOut.getPayment() != null && manPakOut.getPayment() == 1);
        if (complete && wrkDeltExist && agvWrkDetlExist && waitPakinExist && manPakoutExist) {
            if (!this.updateSettle2(order.getId(), 4L, pltType)) {
            if (!this.updateSettle2(order.getId(), 4L, pltType, DateUtils.convert(new Date(), DateUtils.yyyyMMdd))) {
                throw new CoolException("修改订单【orderNo = " + order.getOrderNo() + "】状态为已完成失败");
            }
        } else {
            if (!Cools.isEmpty(pltType)) {
            if (pltType != null && pltType > 0) {
                order.setPltType(pltType);
                super.updateById(order);
            }
            order.setInTime(DateUtils.convert(new Date(), DateUtils.yyyyMMddHHmmss_F));
            super.updateById(order);

        }

@@ -288,6 +291,7 @@
            response = new HttpHandler.Builder()
                    .setUri(url)
                    .setPath(path)
                    .setTimeout(30, TimeUnit.SECONDS)
                    .setJson(JSONObject.toJSONString(requestParam))
                    .build()
                    .doPost();