fix

Helius

2021-08-27 bb5de381eca99064840181c6a6672f38143000b0

fix

 gc-core/src/main/java/com/xzx/gc/entity/OrderInfo.java

@@ -72,6 +72,8 @@
    @ApiModelProperty("门牌号")
    private String houseNumber;

    private String houseName;


    @ApiModelProperty("回收金额")
    private transient String money;

 gc-order/src/main/java/com/xzx/gc/order/mapper/OrderMapper.java

@@ -226,5 +226,7 @@
    List<OrderInfo> selectOrderNoWaitAndCancel(@Param("userId") String userId);

    List<InviteUserOrderVo> selectInviteUserOrderList(@Param("record") InviteUserOrderDetailsDto detailsDto);

    List<OrderInfo> selectOrderWithWaitAndIng(@Param("userId") String userId);
}


 gc-order/src/main/java/com/xzx/gc/order/service/OrderService.java

@@ -12,6 +12,7 @@
import cn.hutool.core.map.MapUtil;
import cn.hutool.core.text.StrBuilder;
import cn.hutool.core.util.NumberUtil;
import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.StrUtil;
import cn.hutool.json.JSONUtil;
import com.github.pagehelper.PageHelper;
@@ -340,6 +341,23 @@
            orderInfoReq.setTownId(townId);
        }

        List<OrderInfo> orderInfos = orderMapper.selectOrderWithWaitAndIng(orderInfoReq.getCreateUserId());
        if (CollUtil.isNotEmpty(orderInfos)) {
            String address = addressInfo.getAddressArea() + addressInfo.getDetailAddress() + addressInfo.getHouseName() + addressInfo.getUnitName() + addressInfo.getHouseNumber();
            for (OrderInfo orderInfo : orderInfos) {
                orderInfoReq.setAddress(addressInfo.getDetailAddress());
                orderInfoReq.setAddressArea(addressInfo.getAddressArea());
                orderInfoReq.setUnitName(addressInfo.getUnitName());
                orderInfoReq.setHouseNumber(addressInfo.getHouseNumber());
                orderInfoReq.setHouseName(addressInfo.getHouseName());

                String hasAddress = orderInfo.getAddressArea() + orderInfo.getAddress() + orderInfo.getHouseName() + addressInfo.getUnitName() + addressInfo.getHouseNumber();
                if (ObjectUtil.equal(address, hasAddress)) {
                    throw new RestException("该地址已经存在正在进行的订单");
                }
            }
        }


        //更新用户的合伙人ID
        if (partnerId != null) {

 gc-order/src/main/resources/mapper/order/OrderMapper.xml

@@ -1553,4 +1553,9 @@
           ) a
        group by a.order_id
    </select>

    <select id="selectOrderWithWaitAndIng" resultType="com.xzx.gc.entity.OrderInfo">
        select * from xzx_order_info
        where order_status in ('1', '2') and create_user_id=#{userId}
    </select>
</mapper>